Repository: arrow Updated Branches: refs/heads/master 2aed7845f -> 5d6c6ad6a
ARROW-770: [C++] Move .clang* files back into cpp source tree After ARROW-341, we don't need these files at the top level anymore to get clang-format to work on all of our C++ code Author: Wes McKinney <wes.mckin...@twosigma.com> Closes #491 from wesm/ARROW-770 and squashes the following commits: 1588a4f [Wes McKinney] Move .clang* files back into cpp source tree Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/5d6c6ad6 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/5d6c6ad6 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/5d6c6ad6 Branch: refs/heads/master Commit: 5d6c6ad6a81be6194a4f8349a369a94ef927e18b Parents: 2aed784 Author: Wes McKinney <wes.mckin...@twosigma.com> Authored: Tue Apr 4 21:57:13 2017 +0200 Committer: Uwe L. Korn <uw...@xhochy.com> Committed: Tue Apr 4 21:57:13 2017 +0200 ---------------------------------------------------------------------- .clang-format | 65 --------------------------------------------- .clang-tidy | 14 ---------- .clang-tidy-ignore | 2 -- cpp/.clang-format | 65 +++++++++++++++++++++++++++++++++++++++++++++ cpp/.clang-tidy | 14 ++++++++++ cpp/.clang-tidy-ignore | 2 ++ 6 files changed, 81 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/5d6c6ad6/.clang-format ---------------------------------------------------------------------- diff --git a/.clang-format b/.clang-format deleted file mode 100644 index 7d5b3cf..0000000 --- a/.clang-format +++ /dev/null @@ -1,65 +0,0 @@ ---- -Language: Cpp -# BasedOnStyle: Google -AccessModifierOffset: -1 -AlignAfterOpenBracket: false -AlignConsecutiveAssignments: false -AlignEscapedNewlinesLeft: true -AlignOperands: true -AlignTrailingComments: true -AllowAllParametersOfDeclarationOnNextLine: true -AllowShortBlocksOnASingleLine: true -AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: Inline -AllowShortIfStatementsOnASingleLine: true -AllowShortLoopsOnASingleLine: false -AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakBeforeMultilineStrings: true -AlwaysBreakTemplateDeclarations: true -BinPackArguments: true -BinPackParameters: true -BreakBeforeBinaryOperators: None -BreakBeforeBraces: Attach -BreakBeforeTernaryOperators: true -BreakConstructorInitializersBeforeComma: false -ColumnLimit: 90 -CommentPragmas: '^ IWYU pragma:' -ConstructorInitializerAllOnOneLineOrOnePerLine: true -ConstructorInitializerIndentWidth: 4 -ContinuationIndentWidth: 4 -Cpp11BracedListStyle: true -DerivePointerAlignment: false -DisableFormat: false -ExperimentalAutoDetectBinPacking: false -ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] -IndentCaseLabels: true -IndentWidth: 2 -IndentWrappedFunctionNames: false -KeepEmptyLinesAtTheStartOfBlocks: false -MacroBlockBegin: '' -MacroBlockEnd: '' -MaxEmptyLinesToKeep: 1 -NamespaceIndentation: None -ObjCBlockIndentWidth: 2 -ObjCSpaceAfterProperty: false -ObjCSpaceBeforeProtocolList: false -PenaltyBreakBeforeFirstCallParameter: 1000 -PenaltyBreakComment: 300 -PenaltyBreakFirstLessLess: 120 -PenaltyBreakString: 1000 -PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 200 -PointerAlignment: Left -SpaceAfterCStyleCast: false -SpaceBeforeAssignmentOperators: true -SpaceBeforeParens: ControlStatements -SpaceInEmptyParentheses: false -SpacesBeforeTrailingComments: 2 -SpacesInAngles: false -SpacesInContainerLiterals: true -SpacesInCStyleCastParentheses: false -SpacesInParentheses: false -SpacesInSquareBrackets: false -Standard: Cpp11 -TabWidth: 8 -UseTab: Never http://git-wip-us.apache.org/repos/asf/arrow/blob/5d6c6ad6/.clang-tidy ---------------------------------------------------------------------- diff --git a/.clang-tidy b/.clang-tidy deleted file mode 100644 index deaa9bd..0000000 --- a/.clang-tidy +++ /dev/null @@ -1,14 +0,0 @@ ---- -Checks: 'clang-diagnostic-*,clang-analyzer-*,-clang-analyzer-alpha*,google-.*,modernize-.*,readablity-.*' -HeaderFilterRegex: 'arrow/.*' -AnalyzeTemporaryDtors: true -CheckOptions: - - key: google-readability-braces-around-statements.ShortStatementLines - value: '1' - - key: google-readability-function-size.StatementThreshold - value: '800' - - key: google-readability-namespace-comments.ShortNamespaceLines - value: '10' - - key: google-readability-namespace-comments.SpacesBeforeComments - value: '2' - http://git-wip-us.apache.org/repos/asf/arrow/blob/5d6c6ad6/.clang-tidy-ignore ---------------------------------------------------------------------- diff --git a/.clang-tidy-ignore b/.clang-tidy-ignore deleted file mode 100644 index 5ab4d20..0000000 --- a/.clang-tidy-ignore +++ /dev/null @@ -1,2 +0,0 @@ -ipc-adapter-test.cc -memory-pool-test.cc http://git-wip-us.apache.org/repos/asf/arrow/blob/5d6c6ad6/cpp/.clang-format ---------------------------------------------------------------------- diff --git a/cpp/.clang-format b/cpp/.clang-format new file mode 100644 index 0000000..7d5b3cf --- /dev/null +++ b/cpp/.clang-format @@ -0,0 +1,65 @@ +--- +Language: Cpp +# BasedOnStyle: Google +AccessModifierOffset: -1 +AlignAfterOpenBracket: false +AlignConsecutiveAssignments: false +AlignEscapedNewlinesLeft: true +AlignOperands: true +AlignTrailingComments: true +AllowAllParametersOfDeclarationOnNextLine: true +AllowShortBlocksOnASingleLine: true +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: Inline +AllowShortIfStatementsOnASingleLine: true +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakBeforeMultilineStrings: true +AlwaysBreakTemplateDeclarations: true +BinPackArguments: true +BinPackParameters: true +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Attach +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: false +ColumnLimit: 90 +CommentPragmas: '^ IWYU pragma:' +ConstructorInitializerAllOnOneLineOrOnePerLine: true +ConstructorInitializerIndentWidth: 4 +ContinuationIndentWidth: 4 +Cpp11BracedListStyle: true +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] +IndentCaseLabels: true +IndentWidth: 2 +IndentWrappedFunctionNames: false +KeepEmptyLinesAtTheStartOfBlocks: false +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: None +ObjCBlockIndentWidth: 2 +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: false +PenaltyBreakBeforeFirstCallParameter: 1000 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 200 +PointerAlignment: Left +SpaceAfterCStyleCast: false +SpaceBeforeAssignmentOperators: true +SpaceBeforeParens: ControlStatements +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 2 +SpacesInAngles: false +SpacesInContainerLiterals: true +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp11 +TabWidth: 8 +UseTab: Never http://git-wip-us.apache.org/repos/asf/arrow/blob/5d6c6ad6/cpp/.clang-tidy ---------------------------------------------------------------------- diff --git a/cpp/.clang-tidy b/cpp/.clang-tidy new file mode 100644 index 0000000..deaa9bd --- /dev/null +++ b/cpp/.clang-tidy @@ -0,0 +1,14 @@ +--- +Checks: 'clang-diagnostic-*,clang-analyzer-*,-clang-analyzer-alpha*,google-.*,modernize-.*,readablity-.*' +HeaderFilterRegex: 'arrow/.*' +AnalyzeTemporaryDtors: true +CheckOptions: + - key: google-readability-braces-around-statements.ShortStatementLines + value: '1' + - key: google-readability-function-size.StatementThreshold + value: '800' + - key: google-readability-namespace-comments.ShortNamespaceLines + value: '10' + - key: google-readability-namespace-comments.SpacesBeforeComments + value: '2' + http://git-wip-us.apache.org/repos/asf/arrow/blob/5d6c6ad6/cpp/.clang-tidy-ignore ---------------------------------------------------------------------- diff --git a/cpp/.clang-tidy-ignore b/cpp/.clang-tidy-ignore new file mode 100644 index 0000000..5ab4d20 --- /dev/null +++ b/cpp/.clang-tidy-ignore @@ -0,0 +1,2 @@ +ipc-adapter-test.cc +memory-pool-test.cc