highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 15:09:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/bitcoin/bitcoin

Browse Source 
Conflicts:
	src/main.cpp
This commit is contained in:
Wladimir J. van der Laan
2011-09-02 17:35:30 +02:00
parent f43f46c175 86fd7c5af6
commit 7a15d4ff67
39 changed files with 2310 additions and 1921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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) std::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)