You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by hc...@apache.org on 2014/11/18 10:03:05 UTC
[37/37] thrift git commit: THRIFT-2729: C++ - .clang-format created
and applied
THRIFT-2729: C++ - .clang-format created and applied
Client: C++
Patch: Konrad Grochowski
make style command added
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/74260aa9
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/74260aa9
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/74260aa9
Branch: refs/heads/master
Commit: 74260aa9099c3bb209bc8e524b0e8ba603f62c41
Parents: ca7e97e
Author: Konrad Grochowski <hc...@apache.org>
Authored: Thu Nov 13 15:33:38 2014 +0100
Committer: Konrad Grochowski <hc...@apache.org>
Committed: Tue Nov 18 10:02:08 2014 +0100
----------------------------------------------------------------------
.clang-format | 56 +
compiler/cpp/Makefile.am | 3 +
compiler/cpp/src/generate/t_as3_generator.cc | 1328 ++---
compiler/cpp/src/generate/t_c_glib_generator.cc | 4568 ++++++---------
compiler/cpp/src/generate/t_cocoa_generator.cc | 1138 ++--
compiler/cpp/src/generate/t_cpp_generator.cc | 3182 ++++------
compiler/cpp/src/generate/t_csharp_generator.cc | 2049 ++++---
compiler/cpp/src/generate/t_d_generator.cc | 329 +-
compiler/cpp/src/generate/t_delphi_generator.cc | 2491 ++++----
compiler/cpp/src/generate/t_erl_generator.cc | 344 +-
compiler/cpp/src/generate/t_generator.cc | 38 +-
compiler/cpp/src/generate/t_generator.h | 59 +-
.../cpp/src/generate/t_generator_registry.h | 43 +-
compiler/cpp/src/generate/t_go_generator.cc | 5429 ++++++++----------
compiler/cpp/src/generate/t_gv_generator.cc | 228 +-
compiler/cpp/src/generate/t_haxe_generator.cc | 1517 +++--
compiler/cpp/src/generate/t_hs_generator.cc | 548 +-
compiler/cpp/src/generate/t_html_generator.cc | 449 +-
compiler/cpp/src/generate/t_html_generator.h | 416 +-
compiler/cpp/src/generate/t_java_generator.cc | 2583 +++++----
compiler/cpp/src/generate/t_javame_generator.cc | 1578 +++--
compiler/cpp/src/generate/t_js_generator.cc | 1367 ++---
compiler/cpp/src/generate/t_json_generator.cc | 189 +-
compiler/cpp/src/generate/t_lua_generator.cc | 701 +--
compiler/cpp/src/generate/t_ocaml_generator.cc | 931 ++-
compiler/cpp/src/generate/t_oop_generator.h | 45 +-
compiler/cpp/src/generate/t_perl_generator.cc | 809 +--
compiler/cpp/src/generate/t_php_generator.cc | 1523 ++---
compiler/cpp/src/generate/t_py_generator.cc | 1465 ++---
compiler/cpp/src/generate/t_rb_generator.cc | 399 +-
compiler/cpp/src/generate/t_st_generator.cc | 368 +-
compiler/cpp/src/generate/t_xsd_generator.cc | 128 +-
compiler/cpp/src/globals.h | 18 +-
compiler/cpp/src/logging.h | 1 -
compiler/cpp/src/main.cc | 153 +-
compiler/cpp/src/main.h | 8 +-
compiler/cpp/src/md5.h | 31 +-
compiler/cpp/src/parse/parse.cc | 2 +-
compiler/cpp/src/parse/t_base_type.h | 100 +-
compiler/cpp/src/parse/t_const.h | 23 +-
compiler/cpp/src/parse/t_const_value.h | 83 +-
compiler/cpp/src/parse/t_container.h | 21 +-
compiler/cpp/src/parse/t_doc.h | 18 +-
compiler/cpp/src/parse/t_enum.h | 34 +-
compiler/cpp/src/parse/t_enum_value.h | 16 +-
compiler/cpp/src/parse/t_field.h | 117 +-
compiler/cpp/src/parse/t_function.h | 51 +-
compiler/cpp/src/parse/t_list.h | 16 +-
compiler/cpp/src/parse/t_map.h | 24 +-
compiler/cpp/src/parse/t_program.h | 173 +-
compiler/cpp/src/parse/t_scope.h | 66 +-
compiler/cpp/src/parse/t_service.h | 24 +-
compiler/cpp/src/parse/t_set.h | 15 +-
compiler/cpp/src/parse/t_struct.h | 107 +-
compiler/cpp/src/parse/t_type.h | 70 +-
compiler/cpp/src/parse/t_typedef.h | 36 +-
compiler/cpp/src/windows/config.h | 5 +-
configure.ac | 3 +
lib/cpp/Makefile.am | 3 +
lib/cpp/src/thrift/TApplicationException.cpp | 7 +-
lib/cpp/src/thrift/TApplicationException.h | 74 +-
lib/cpp/src/thrift/TDispatchProcessor.h | 45 +-
lib/cpp/src/thrift/TLogging.h | 158 +-
lib/cpp/src/thrift/TProcessor.h | 115 +-
lib/cpp/src/thrift/TReflectionLocal.h | 34 +-
lib/cpp/src/thrift/TToString.h | 10 +-
lib/cpp/src/thrift/Thrift.cpp | 29 +-
lib/cpp/src/thrift/Thrift.h | 99 +-
lib/cpp/src/thrift/VirtualProfiling.cpp | 126 +-
.../src/thrift/async/TAsyncBufferProcessor.h | 18 +-
lib/cpp/src/thrift/async/TAsyncChannel.cpp | 13 +-
lib/cpp/src/thrift/async/TAsyncChannel.h | 27 +-
.../src/thrift/async/TAsyncDispatchProcessor.h | 40 +-
lib/cpp/src/thrift/async/TAsyncProcessor.h | 42 +-
.../thrift/async/TAsyncProtocolProcessor.cpp | 32 +-
.../src/thrift/async/TAsyncProtocolProcessor.h | 38 +-
.../src/thrift/async/TEvhttpClientChannel.cpp | 117 +-
lib/cpp/src/thrift/async/TEvhttpClientChannel.h | 41 +-
lib/cpp/src/thrift/async/TEvhttpServer.cpp | 66 +-
lib/cpp/src/thrift/async/TEvhttpServer.h | 13 +-
lib/cpp/src/thrift/concurrency/BoostMonitor.cpp | 143 +-
lib/cpp/src/thrift/concurrency/BoostMutex.cpp | 37 +-
.../thrift/concurrency/BoostThreadFactory.cpp | 84 +-
.../src/thrift/concurrency/BoostThreadFactory.h | 17 +-
lib/cpp/src/thrift/concurrency/Exception.h | 24 +-
lib/cpp/src/thrift/concurrency/FunctionRunner.h | 39 +-
lib/cpp/src/thrift/concurrency/Monitor.cpp | 87 +-
lib/cpp/src/thrift/concurrency/Monitor.h | 25 +-
lib/cpp/src/thrift/concurrency/Mutex.cpp | 133 +-
lib/cpp/src/thrift/concurrency/Mutex.h | 69 +-
.../thrift/concurrency/PlatformThreadFactory.h | 12 +-
.../thrift/concurrency/PosixThreadFactory.cpp | 135 +-
.../src/thrift/concurrency/PosixThreadFactory.h | 25 +-
lib/cpp/src/thrift/concurrency/StdMonitor.cpp | 112 +-
lib/cpp/src/thrift/concurrency/StdMutex.cpp | 36 +-
.../src/thrift/concurrency/StdThreadFactory.cpp | 80 +-
.../src/thrift/concurrency/StdThreadFactory.h | 14 +-
lib/cpp/src/thrift/concurrency/Thread.h | 40 +-
.../src/thrift/concurrency/ThreadManager.cpp | 224 +-
lib/cpp/src/thrift/concurrency/ThreadManager.h | 37 +-
lib/cpp/src/thrift/concurrency/TimerManager.cpp | 81 +-
lib/cpp/src/thrift/concurrency/TimerManager.h | 24 +-
lib/cpp/src/thrift/concurrency/Util.cpp | 11 +-
lib/cpp/src/thrift/concurrency/Util.h | 37 +-
lib/cpp/src/thrift/cxxfunctional.h | 2 +
lib/cpp/src/thrift/processor/PeekProcessor.cpp | 33 +-
lib/cpp/src/thrift/processor/PeekProcessor.h | 23 +-
lib/cpp/src/thrift/processor/StatsProcessor.h | 298 +-
.../thrift/processor/TMultiplexedProcessor.h | 357 +-
lib/cpp/src/thrift/protocol/TBase64Utils.cpp | 304 +-
lib/cpp/src/thrift/protocol/TBase64Utils.h | 13 +-
lib/cpp/src/thrift/protocol/TBinaryProtocol.h | 143 +-
lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc | 52 +-
lib/cpp/src/thrift/protocol/TCompactProtocol.h | 133 +-
lib/cpp/src/thrift/protocol/TDebugProtocol.cpp | 218 +-
lib/cpp/src/thrift/protocol/TDebugProtocol.h | 77 +-
lib/cpp/src/thrift/protocol/TDenseProtocol.cpp | 126 +-
lib/cpp/src/thrift/protocol/TDenseProtocol.h | 84 +-
lib/cpp/src/thrift/protocol/TJSONProtocol.cpp | 337 +-
lib/cpp/src/thrift/protocol/TJSONProtocol.h | 99 +-
.../thrift/protocol/TMultiplexedProtocol.cpp | 39 +-
.../src/thrift/protocol/TMultiplexedProtocol.h | 138 +-
lib/cpp/src/thrift/protocol/TProtocol.h | 254 +-
.../src/thrift/protocol/TProtocolDecorator.h | 228 +-
.../src/thrift/protocol/TProtocolException.h | 74 +-
lib/cpp/src/thrift/protocol/TProtocolTap.h | 39 +-
lib/cpp/src/thrift/protocol/TVirtualProtocol.h | 223 +-
lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp | 66 +-
lib/cpp/src/thrift/qt/TQIODeviceTransport.h | 24 +-
lib/cpp/src/thrift/qt/TQTcpServer.cpp | 61 +-
lib/cpp/src/thrift/qt/TQTcpServer.h | 25 +-
.../src/thrift/server/TNonblockingServer.cpp | 415 +-
lib/cpp/src/thrift/server/TNonblockingServer.h | 284 +-
lib/cpp/src/thrift/server/TServer.cpp | 17 +-
lib/cpp/src/thrift/server/TServer.h | 188 +-
lib/cpp/src/thrift/server/TSimpleServer.cpp | 71 +-
lib/cpp/src/thrift/server/TSimpleServer.h | 103 +-
lib/cpp/src/thrift/server/TThreadPoolServer.cpp | 92 +-
lib/cpp/src/thrift/server/TThreadPoolServer.h | 144 +-
lib/cpp/src/thrift/server/TThreadedServer.cpp | 100 +-
lib/cpp/src/thrift/server/TThreadedServer.h | 92 +-
lib/cpp/src/thrift/thrift-config.h | 4 +-
lib/cpp/src/thrift/transport/PlatformSocket.h | 2 +
.../src/thrift/transport/TBufferTransports.cpp | 44 +-
.../src/thrift/transport/TBufferTransports.h | 239 +-
lib/cpp/src/thrift/transport/TFDTransport.cpp | 34 +-
lib/cpp/src/thrift/transport/TFDTransport.h | 27 +-
lib/cpp/src/thrift/transport/TFileTransport.cpp | 293 +-
lib/cpp/src/thrift/transport/TFileTransport.h | 162 +-
lib/cpp/src/thrift/transport/THttpClient.cpp | 43 +-
lib/cpp/src/thrift/transport/THttpClient.h | 19 +-
lib/cpp/src/thrift/transport/THttpServer.cpp | 65 +-
lib/cpp/src/thrift/transport/THttpServer.h | 18 +-
lib/cpp/src/thrift/transport/THttpTransport.cpp | 52 +-
lib/cpp/src/thrift/transport/THttpTransport.h | 30 +-
lib/cpp/src/thrift/transport/TPipe.cpp | 224 +-
lib/cpp/src/thrift/transport/TPipe.h | 36 +-
lib/cpp/src/thrift/transport/TPipeServer.cpp | 280 +-
lib/cpp/src/thrift/transport/TPipeServer.h | 42 +-
.../src/thrift/transport/TSSLServerSocket.cpp | 23 +-
lib/cpp/src/thrift/transport/TSSLServerSocket.h | 20 +-
lib/cpp/src/thrift/transport/TSSLSocket.cpp | 124 +-
lib/cpp/src/thrift/transport/TSSLSocket.h | 202 +-
lib/cpp/src/thrift/transport/TServerSocket.cpp | 275 +-
lib/cpp/src/thrift/transport/TServerSocket.h | 21 +-
lib/cpp/src/thrift/transport/TServerTransport.h | 14 +-
.../src/thrift/transport/TShortReadTransport.h | 59 +-
.../thrift/transport/TSimpleFileTransport.cpp | 20 +-
.../src/thrift/transport/TSimpleFileTransport.h | 15 +-
lib/cpp/src/thrift/transport/TSocket.cpp | 274 +-
lib/cpp/src/thrift/transport/TSocket.h | 22 +-
lib/cpp/src/thrift/transport/TSocketPool.cpp | 114 +-
lib/cpp/src/thrift/transport/TSocketPool.h | 251 +-
lib/cpp/src/thrift/transport/TTransport.h | 49 +-
.../thrift/transport/TTransportException.cpp | 49 +-
.../src/thrift/transport/TTransportException.h | 61 +-
.../src/thrift/transport/TTransportUtils.cpp | 47 +-
lib/cpp/src/thrift/transport/TTransportUtils.h | 142 +-
.../src/thrift/transport/TVirtualTransport.h | 46 +-
lib/cpp/src/thrift/transport/TZlibTransport.cpp | 74 +-
lib/cpp/src/thrift/transport/TZlibTransport.h | 91 +-
lib/cpp/src/thrift/windows/GetTimeOfDay.cpp | 116 +-
lib/cpp/src/thrift/windows/GetTimeOfDay.h | 4 +-
lib/cpp/src/thrift/windows/Operators.h | 16 +-
.../windows/OverlappedSubmissionThread.cpp | 99 +-
.../thrift/windows/OverlappedSubmissionThread.h | 38 +-
lib/cpp/src/thrift/windows/SocketPair.cpp | 108 +-
lib/cpp/src/thrift/windows/Sync.h | 36 +-
.../src/thrift/windows/TWinsockSingleton.cpp | 48 +-
lib/cpp/src/thrift/windows/TWinsockSingleton.h | 34 +-
lib/cpp/src/thrift/windows/WinFcntl.cpp | 80 +-
lib/cpp/src/thrift/windows/WinFcntl.h | 10 +-
lib/cpp/src/thrift/windows/config.h | 48 +-
lib/cpp/test/AllProtocolTests.cpp | 4 +-
lib/cpp/test/AllProtocolTests.tcc | 28 +-
lib/cpp/test/Base64Test.cpp | 5 +-
lib/cpp/test/Benchmark.cpp | 30 +-
lib/cpp/test/DebugProtoTest.cpp | 32 +-
lib/cpp/test/DebugProtoTest_extras.cpp | 12 +-
lib/cpp/test/DenseProtoTest.cpp | 58 +-
lib/cpp/test/EnumTest.cpp | 6 +-
lib/cpp/test/GenericHelpers.h | 60 +-
lib/cpp/test/JSONProtoTest.cpp | 36 +-
lib/cpp/test/OpenSSLManualInitTest.cpp | 3 +-
lib/cpp/test/OptionalRequiredTest.cpp | 29 +-
lib/cpp/test/RWMutexStarveTest.cpp | 35 +-
lib/cpp/test/RecursiveTest.cpp | 3 +-
lib/cpp/test/SpecializationTest.cpp | 31 +-
lib/cpp/test/TFDTransportTest.cpp | 8 +-
lib/cpp/test/TFileTransportTest.cpp | 83 +-
lib/cpp/test/TMemoryBufferTest.cpp | 152 +-
lib/cpp/test/TPipedTransportTest.cpp | 11 +-
lib/cpp/test/ThriftTest_extras.cpp | 8 +-
lib/cpp/test/ToStringTest.cpp | 34 +-
lib/cpp/test/TransportTest.cpp | 450 +-
lib/cpp/test/ZlibTest.cpp | 115 +-
lib/cpp/test/concurrency/Tests.cpp | 21 +-
lib/cpp/test/concurrency/ThreadFactoryTests.h | 145 +-
lib/cpp/test/concurrency/ThreadManagerTests.h | 128 +-
lib/cpp/test/concurrency/TimerManagerTests.h | 55 +-
lib/cpp/test/processor/EventLog.cpp | 17 +-
lib/cpp/test/processor/EventLog.h | 31 +-
lib/cpp/test/processor/Handlers.h | 127 +-
lib/cpp/test/processor/ProcessorTest.cpp | 218 +-
lib/cpp/test/processor/ServerThread.cpp | 18 +-
lib/cpp/test/processor/ServerThread.h | 49 +-
test/cpp/Makefile.am | 3 +
test/cpp/src/StressTest.cpp | 252 +-
test/cpp/src/StressTestNonBlocking.cpp | 223 +-
test/cpp/src/TestClient.cpp | 197 +-
test/cpp/src/TestServer.cpp | 260 +-
test/cpp/src/ThriftTest_extras.cpp | 8 +-
tutorial/cpp/CppClient.cpp | 1 -
tutorial/cpp/CppServer.cpp | 19 +-
tutorial/cpp/Makefile.am | 3 +
235 files changed, 24382 insertions(+), 28035 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/74260aa9/.clang-format
----------------------------------------------------------------------
diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..a62eef8
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,56 @@
+---
+Language: Cpp
+# BasedOnStyle: LLVM
+AccessModifierOffset: -2
+ConstructorInitializerIndentWidth: 2
+AlignEscapedNewlinesLeft: false
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AlwaysBreakTemplateDeclarations: true
+AlwaysBreakBeforeMultilineStrings: true
+BreakBeforeBinaryOperators: true
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BinPackParameters: false
+ColumnLimit: 100
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+DerivePointerAlignment: false
+IndentCaseLabels: false
+IndentWrappedFunctionNames: false
+IndentFunctionDeclarationAfterType: false
+MaxEmptyLinesToKeep: 1
+KeepEmptyLinesAtTheStartOfBlocks: true
+NamespaceIndentation: None
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 190
+PenaltyBreakComment: 300
+PenaltyBreakString: 10000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 1200
+PointerAlignment: Left
+SpacesBeforeTrailingComments: 1
+Cpp11BracedListStyle: true
+Standard: Auto
+IndentWidth: 2
+TabWidth: 4
+UseTab: Never
+BreakBeforeBraces: Attach
+SpacesInParentheses: false
+SpacesInAngles: false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: true
+SpaceBeforeAssignmentOperators: true
+ContinuationIndentWidth: 4
+CommentPragmas: '^ IWYU pragma:'
+ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
+SpaceBeforeParens: ControlStatements
+DisableFormat: false
+...
+
http://git-wip-us.apache.org/repos/asf/thrift/blob/74260aa9/compiler/cpp/Makefile.am
----------------------------------------------------------------------
diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index d3dadab..559a839 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -117,3 +117,6 @@ clean-local:
$(RM) thriftl.cc thrifty.cc thrifty.h thrifty.hh version.h windows/version.h
src/main.cc: version.h
+
+style-local:
+ $(CPPSTYLE_CMD)