Small C++11 refactorings.

domob1812 · domob1812 · commit b93851ef7f2a · 2019-06-27T10:10:38.000+02:00
Modernise the code a bit for c++11:  Use constexpr instead of
"static const" and an anonymous namespace instead of a function with
static linkage.
diff --git a/src/names/main.cpp b/src/names/main.cpp
@@ -18,6 +18,9 @@
 #include <util/strencodings.h>
 #include <validation.h>
 
+namespace
+{
+
 /**
  * Check whether a name at nPrevHeight is expired at nHeight.  Also
  * heights of MEMPOOL_HEIGHT are supported.  For nHeight == MEMPOOL_HEIGHT,
@@ -26,7 +29,7 @@
  * @param nHeight The height at which it should be updated.
  * @return True iff the name is expired.
  */
-static bool
+bool
 isExpired (unsigned nPrevHeight, unsigned nHeight)
 {
   assert (nHeight != MEMPOOL_HEIGHT);
@@ -37,6 +40,8 @@ isExpired (unsigned nPrevHeight, unsigned nHeight)
   return nPrevHeight + params.rules->NameExpirationDepth (nHeight) <= nHeight;
 }
 
+} // anonymous namespace
+
 /* ************************************************************************** */
 /* CNameData.  */
 
diff --git a/src/names/main.h b/src/names/main.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 Daniel Kraft
+// Copyright (c) 2014-2019 Daniel Kraft
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -25,13 +25,13 @@ class CTxMemPoolEntry;
 class CValidationState;
 
 /* Some constants defining name limits.  */
-static const unsigned MAX_VALUE_LENGTH = 1023;
-static const unsigned MAX_NAME_LENGTH = 255;
-static const unsigned MIN_FIRSTUPDATE_DEPTH = 12;
-static const unsigned MAX_VALUE_LENGTH_UI = 520;
+constexpr unsigned MAX_VALUE_LENGTH = 1023;
+constexpr unsigned MAX_NAME_LENGTH = 255;
+constexpr unsigned MIN_FIRSTUPDATE_DEPTH = 12;
+constexpr unsigned MAX_VALUE_LENGTH_UI = 520;
 
 /** The amount of coins to lock in created transactions.  */
-static const CAmount NAME_LOCKED_AMOUNT = COIN / 100;
+constexpr CAmount NAME_LOCKED_AMOUNT = COIN / 100;
 
 /* ************************************************************************** */
 /* CNameTxUndo.  */
