diff --git a/src/.clang-format b/src/.clang-format index 6900bd0e5..4083ca492 100644 --- a/src/.clang-format +++ b/src/.clang-format @@ -1,22 +1,23 @@ ColumnLimit: 80 IndentWidth: 4 TabWidth: 4 AccessModifierOffset: -4 UseTab: Never IndentCaseLabels: true NamespaceIndentation: Inner BreakBeforeBraces: Attach ReflowComments: true AlignEscapedNewlines: Right AllowShortBlocksOnASingleLine: false AllowShortIfStatementsOnASingleLine: true AllowShortFunctionsOnASingleLine: Inline FixNamespaceComments: true ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, BOOST_REVERSE_FOREACH ] CommentPragmas: '@DISABLE FORMATING FOR THIS COMMENT@' +KeepEmptyLinesAtTheStartOfBlocks: false --- Language: Cpp Standard: Cpp11 --- Language: ObjC ObjCBlockIndentWidth: 4 diff --git a/src/miner.cpp b/src/miner.cpp index bed673c73..c95790da9 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1,711 +1,710 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include