diff options
| author | Giel van Schijndel <me@mortis.eu> | 2011-08-11 18:12:14 +0200 |
|---|---|---|
| committer | Giel van Schijndel <me@mortis.eu> | 2011-08-19 07:24:38 +0200 |
| commit | 82dc6426b4cbf769ace7976c2a40d160b8d76f08 (patch) | |
| tree | c4ce7ba97dfdc04b169ff87d35de12064928a7b2 | |
| parent | e49b83bb1242b37717e5cfabc344b0ff7157484e (diff) | |
| download | bitcoin-82dc6426b4cbf769ace7976c2a40d160b8d76f08.tar.xz | |
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>
| -rw-r--r-- | src/serialize.h | 11 | ||||
| -rw-r--r-- | src/util.h | 8 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/serialize.h b/src/serialize.h index c55775242b..0a31ff557d 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -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); +} ///////////////////////////////////////////////////////////////// // diff --git a/src/util.h b/src/util.h index 1e4ceb2468..3d7ef108b4 100644 --- a/src/util.h +++ b/src/util.h @@ -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) |