Browse Source

Merge #9544: [trivial] Add end of namespace comments. Improve consistency.

5a9b508 [trivial] Add end of namespace comments (practicalswift)

Tree-SHA512: 92b0fcae4d1d3f4da9e97569ae84ef2d6e09625a5815cd0e5f0eb6dd2ecba9852fa85c184c5ae9de5117050330ce995e9867b451fa8cd5512169025990541a2b
tags/v0.15.1
Wladimir J. van der Laan 4 years ago
parent
commit
f3f1e2e7d3
No account linked to committer's email address

+ 16
- 1
doc/developer-notes.md View File

@@ -68,7 +68,7 @@ public:
return true;
}
}
}
} // namespace foo
```

Doxygen comments
@@ -438,6 +438,21 @@ Source code organization

- *Rationale*: Avoids symbol conflicts

- Terminate namespaces with a comment (`// namespace mynamespace`). The comment
should be placed on the same line as the brace closing the namespace, e.g.

```c++
namespace mynamespace {
...
} // namespace mynamespace

namespace {
...
} // namespace
```

- *Rationale*: Avoids confusion about the namespace context

GUI
-----


+ 1
- 1
src/base58.cpp View File

@@ -225,7 +225,7 @@ public:
bool operator()(const CNoDestination& no) const { return false; }
};

} // anon namespace
} // namespace

bool CBitcoinAddress::Set(const CKeyID& id)
{

+ 1
- 1
src/bench/checkblock.cpp View File

@@ -11,7 +11,7 @@

namespace block_bench {
#include "bench/data/block413567.raw.h"
}
} // namespace block_bench

// These are the two major time-sinks which happen after we have fully received
// a block off the wire, but before we can relay the block on to peers using

+ 1
- 1
src/compat/glibc_sanity.cpp View File

@@ -56,7 +56,7 @@ bool sanity_test_fdelt()
}
#endif

} // anon namespace
} // namespace

bool glibc_sanity_test()
{

+ 1
- 1
src/compat/glibcxx_sanity.cpp View File

@@ -38,7 +38,7 @@ bool sanity_test_list(unsigned int size)
return true;
}

} // anon namespace
} // namespace

// trigger: string::at(x) on an empty string to trigger __throw_out_of_range_fmt.
// test: force std::string to throw an out_of_range exception. Verify that

+ 1
- 1
src/dbwrapper.cpp View File

@@ -209,4 +209,4 @@ const std::vector<unsigned char>& GetObfuscateKey(const CDBWrapper &w)
return w.obfuscate_key;
}

};
} // namespace dbwrapper_private

+ 1
- 1
src/init.cpp View File

@@ -822,7 +822,7 @@ int nUserMaxConnections;
int nFD;
ServiceFlags nLocalServices = NODE_NETWORK;

}
} // namespace

[[noreturn]] static void new_handler_terminate()
{

+ 2
- 2
src/net_processing.cpp View File

@@ -120,7 +120,7 @@ namespace {
MapRelay mapRelay;
/** Expiration-time ordered list of (expire time, relay map entry) pairs, protected by cs_main). */
std::deque<std::pair<int64_t, MapRelay::iterator>> vRelayExpiration;
} // anon namespace
} // namespace

//////////////////////////////////////////////////////////////////////////////
//
@@ -559,7 +559,7 @@ void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<con
}
}

} // anon namespace
} // namespace

bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats) {
LOCK(cs_main);

+ 1
- 1
src/protocol.cpp View File

@@ -39,7 +39,7 @@ const char *SENDCMPCT="sendcmpct";
const char *CMPCTBLOCK="cmpctblock";
const char *GETBLOCKTXN="getblocktxn";
const char *BLOCKTXN="blocktxn";
};
} // namespace NetMsgType

/** All known message types. Keep this in the same order as the list of
* messages above and in protocol.h.

+ 1
- 1
src/pubkey.cpp View File

@@ -11,7 +11,7 @@ namespace
{
/* Global secp256k1_context object used for verification. */
secp256k1_context* secp256k1_context_verify = NULL;
}
} // namespace

/** This function is taken from the libsecp256k1 distribution and implements
* DER parsing for ECDSA signatures, while supporting an arbitrary subset of

+ 1
- 1
src/script/bitcoinconsensus.cpp View File

@@ -68,7 +68,7 @@ struct ECCryptoClosure
};

ECCryptoClosure instance_of_eccryptoclosure;
}
} // namespace

/** Check that all specified flags are part of the libconsensus interface. */
static bool verify_flags(unsigned int flags)

+ 2
- 2
src/script/interpreter.cpp View File

@@ -31,7 +31,7 @@ inline bool set_error(ScriptError* ret, const ScriptError serror)
return false;
}

} // anon namespace
} // namespace

bool CastToBool(const valtype& vch)
{
@@ -1164,7 +1164,7 @@ uint256 GetOutputsHash(const CTransaction& txTo) {
return ss.GetHash();
}

} // anon namespace
} // namespace

PrecomputedTransactionData::PrecomputedTransactionData(const CTransaction& txTo)
{

+ 1
- 1
src/script/sigcache.cpp View File

@@ -66,7 +66,7 @@ public:
* signatureCache could be made local to VerifySignature.
*/
static CSignatureCache signatureCache;
}
} // namespace

// To be called once in AppInitMain/BasicTestingSetup to initialize the
// signatureCache.

+ 1
- 1
src/script/sign.cpp View File

@@ -399,7 +399,7 @@ public:
}
};
const DummySignatureChecker dummyChecker;
}
} // namespace

const BaseSignatureChecker& DummySignatureCreator::Checker() const
{

+ 1
- 1
src/script/standard.cpp View File

@@ -273,7 +273,7 @@ public:
return true;
}
};
}
} // namespace

CScript GetScriptForDestination(const CTxDestination& dest)
{

+ 1
- 1
src/test/coins_tests.cpp View File

@@ -99,7 +99,7 @@ public:
size_t& usage() { return cachedCoinsUsage; }
};

}
} // namespace

BOOST_FIXTURE_TEST_SUITE(coins_tests, BasicTestingSetup)


+ 1
- 1
src/test/script_tests.cpp View File

@@ -468,7 +468,7 @@ std::string JSONPrettyPrint(const UniValue& univalue)
}
return ret;
}
}
} // namespace

BOOST_AUTO_TEST_CASE(script_build)
{

+ 1
- 1
src/txmempool.cpp View File

@@ -769,7 +769,7 @@ public:
return counta < countb;
}
};
}
} // namespace

std::vector<CTxMemPool::indexed_transaction_set::const_iterator> CTxMemPool::GetSortedDepthAndScore() const
{

+ 1
- 1
src/validation.cpp View File

@@ -1297,7 +1297,7 @@ bool AbortNode(CValidationState& state, const std::string& strMessage, const std
return state.Error(strMessage);
}

} // anon namespace
} // namespace

enum DisconnectResult
{

+ 1
- 1
src/versionbits.cpp View File

@@ -189,7 +189,7 @@ public:
uint32_t Mask(const Consensus::Params& params) const { return ((uint32_t)1) << params.vDeployments[id].bit; }
};

}
} // namespace

ThresholdState VersionBitsState(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos pos, VersionBitsCache& cache)
{

Loading…
Cancel
Save