Manual formatting fixes before clang-format

Author: Michael Penick

cpp-driver/src/.clang-format

@@ -1,55 +1,27 @@
 ---
+BasedOnStyle: LLVM
 Language: Cpp
 AccessModifierOffset: -2
-AlignEscapedNewlinesLeft: true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortIfStatementsOnASingleLine: true
-AllowShortLoopsOnASingleLine: true
-AllowShortFunctionsOnASingleLine: Inline
-AlwaysBreakTemplateDeclarations: true
-AlwaysBreakBeforeMultilineStrings: true
-BreakBeforeBinaryOperators: false
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: true
-BinPackParameters: true
-ColumnLimit: 80
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-DerivePointerBinding: true
-ExperimentalAutoDetectBinPacking: false
-IndentCaseLabels: true
-MaxEmptyLinesToKeep: 1
-KeepEmptyLinesAtTheStartOfBlocks: true
-NamespaceIndentation: None
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: false
-PenaltyBreakBeforeFirstCallParameter: 1
-PenaltyBreakComment: 300
-PenaltyBreakString: 1000
-PenaltyBreakFirstLessLess: 120
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 200
-PointerBindsToType: true
-SpacesBeforeTrailingComments: 1
-Cpp11BracedListStyle: true
-Standard: Auto
 IndentWidth: 2
 TabWidth: 8
+ColumnLimit: 100
 UseTab: Never
-BreakBeforeBraces: Attach
-IndentFunctionDeclarationAfterType: true
-SpacesInParentheses: false
-SpacesInAngles: false
-SpaceInEmptyParentheses: false
-SpacesInCStyleCastParentheses: false
+IndentCaseLabels: true
+AlignAfterOpenBracket: true
+AlignEscapedNewlines: Left
+BreakConstructorInitializers: BeforeComma
+AllowShortBlocksOnASingleLine: false
+DerivePointerAlignment: false
+PointerAlignment: Left
+BinPackParameters: true
+BinPackArguments: true
+AllowShortIfStatementsOnASingleLine: true
+CompactNamespaces: true
+AlignOperands: true
 SpacesInContainerLiterals: true
-SpaceBeforeAssignmentOperators: true
-ContinuationIndentWidth: 4
-CommentPragmas: '^ IWYU pragma:'
-ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
-SpaceBeforeParens: ControlStatements
-DisableFormat:   false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+Cpp11BracedListStyle: false
+AlwaysBreakTemplateDeclarations: true
+BreakBeforeInheritanceComma: true
 ...
 

cpp-driver/src/json.hpp

@@ -71,11 +71,14 @@ class Allocator {
     }
 };
 
-typedef datastax::rapidjson::GenericDocument<datastax::rapidjson::UTF8<>, datastax::rapidjson::MemoryPoolAllocator<json::Allocator>, json::Allocator> Document;
-typedef datastax::rapidjson::GenericValue<datastax::rapidjson::UTF8<>, datastax::rapidjson::MemoryPoolAllocator<json::Allocator> > Value;
-typedef datastax::rapidjson::GenericStringBuffer<datastax::rapidjson::UTF8<>, json::Allocator> StringBuffer;
+typedef datastax::rapidjson::UTF8<> UTF8;
+typedef datastax::rapidjson::MemoryPoolAllocator<json::Allocator> MemoryPoolAllocator;
 
-template<typename OutputStream, typename SourceEncoding = datastax::rapidjson::UTF8<>, typename TargetEncoding = datastax::rapidjson::UTF8<>, typename StackAllocator = json::Allocator, unsigned writeFlags = datastax::rapidjson::kWriteDefaultFlags>
+typedef datastax::rapidjson::GenericDocument<UTF8, MemoryPoolAllocator, json::Allocator> Document;
+typedef datastax::rapidjson::GenericValue<UTF8, MemoryPoolAllocator > Value;
+typedef datastax::rapidjson::GenericStringBuffer<UTF8, json::Allocator> StringBuffer;
+
+template<typename OutputStream, typename SourceEncoding = UTF8, typename TargetEncoding = UTF8, typename StackAllocator = json::Allocator, unsigned writeFlags = datastax::rapidjson::kWriteDefaultFlags>
 class Writer : public datastax::rapidjson::JSON_WRITE_TYPE<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> {
 public:
     typedef datastax::rapidjson::JSON_WRITE_TYPE<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> Type;

cpp-driver/src/utils.cpp

@@ -197,8 +197,8 @@ void thread_yield() {
 #endif
 }
 
-// Code was taken from MSDN documentation
-// see https://docs.microsoft.com/en-us/visualstudio/debugger/how-to-set-a-thread-name-in-native-code
+// Code was taken from MSDN documentation see:
+// https://docs.microsoft.com/en-us/visualstudio/debugger/how-to-set-a-thread-name-in-native-code
 #if defined(_MSC_VER) && defined(_DEBUG)
 const DWORD MS_VC_EXCEPTION = 0x406D1388;
 #pragma pack(push,8)

cpp-driver/src/uuids.cpp

@@ -124,6 +124,7 @@ CassError cass_uuid_from_string_n(const char* str,
   const char* pos = str;
   char buf[16];
 
+// clang-format off
   static const signed char hex_to_half_byte[256] = {
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
@@ -142,6 +143,7 @@ CassError cass_uuid_from_string_n(const char* str,
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
   };
+// clang-format on
 
   if (str == NULL || str_length != 36) {
     return CASS_ERROR_LIB_BAD_PARAMS;