Browse Source

Move func 'REF' from util.h to serialize.h

util.h doesn't use REF, serialize.h does, creating a dependency of
serialize.h on util.h, but util.h already depends on serialize.h.  To
resolve this circular dependency the function 'REF' has now been moved
closer to one of its two points of use.

Signed-off-by: Giel van Schijndel <me@mortis.eu>
tags/v0.15.1
Giel van Schijndel 10 years ago
parent
commit
82dc6426b4
2 changed files with 7 additions and 12 deletions
  1. 7
    4
      src/serialize.h
  2. 0
    8
      src/util.h

+ 7
- 4
src/serialize.h View File

@@ -63,10 +63,13 @@ static const int VERSION = 32500;
static const char* pszSubVer = "";
static const bool VERSION_IS_BETA = true;





// Used to bypass the rule against non-const reference to temporary
// where it makes sense with wrappers such as CFlatData or CTxDB
template<typename T>
inline T& REF(const T& val)
{
return const_cast<T&>(val);
}

/////////////////////////////////////////////////////////////////
//

+ 0
- 8
src/util.h View File

@@ -67,14 +67,6 @@ typedef unsigned long long uint64;
// This is needed because the foreach macro can't get over the comma in pair<t1, t2>
#define PAIRTYPE(t1, t2) pair<t1, t2>

// Used to bypass the rule against non-const reference to temporary
// where it makes sense with wrappers such as CFlatData or CTxDB
template<typename T>
inline T& REF(const T& val)
{
return (T&)val;
}

// Align by increasing pointer, must have extra space at end of buffer
template <size_t nBytes, typename T>
T* alignup(T* p)

Loading…
Cancel
Save