Add beast_basics and remove unused modules from build

This commit is contained in:
Vinnie Falco
2013-06-17 09:31:21 -07:00
parent db9e7ed5f5
commit 87b7592391
12 changed files with 113 additions and 181 deletions

View File

@@ -104,18 +104,14 @@ COMPILED_FILES = [
'src/cpp/leveldb_core.cpp',
'src/cpp/websocket_core.cpp',
'modules/ripple_basics/ripple_basics.cpp',
'modules/ripple_client/ripple_client.cpp',
'modules/ripple_data/ripple_data.cpp',
'modules/ripple_db/ripple_db.cpp',
'modules/ripple_json/ripple_json.cpp',
'modules/ripple_ledger/ripple_ledger.cpp',
'modules/ripple_main/ripple_main_pt1.cpp',
'modules/ripple_main/ripple_main_pt2.cpp',
'modules/ripple_main/ripple_main_pt3.cpp',
'modules/ripple_main/ripple_main_pt4.cpp',
'modules/ripple_mess/ripple_mess.cpp',
'modules/ripple_net/ripple_net.cpp',
'Subtrees/beast/modules/beast_core/beast_core.cpp'
'Subtrees/beast/modules/beast_core/beast_core.cpp',
'Subtrees/beast/modules/beast_basics/beast_basics.cpp'
]
#-------------------------------------------------------------------------------

View File

@@ -86,7 +86,6 @@
<ClInclude Include="..\..\modules\beast_basics\threads\beast_GlobalThreadGroup.h" />
<ClInclude Include="..\..\modules\beast_basics\threads\beast_InterruptibleThread.h" />
<ClInclude Include="..\..\modules\beast_basics\threads\beast_Listeners.h" />
<ClInclude Include="..\..\modules\beast_basics\threads\beast_MessageThread.h" />
<ClInclude Include="..\..\modules\beast_basics\threads\beast_ParallelFor.h" />
<ClInclude Include="..\..\modules\beast_basics\threads\beast_ReadWriteMutex.h" />
<ClInclude Include="..\..\modules\beast_basics\threads\beast_Semaphore.h" />
@@ -295,10 +294,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\beast_basics\threads\beast_MessageThread.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\beast_basics\threads\beast_ParallelFor.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

View File

@@ -596,9 +596,6 @@
<ClInclude Include="..\..\modules\beast_basics\threads\beast_Listeners.h">
<Filter>beast_basics\threads</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_basics\threads\beast_MessageThread.h">
<Filter>beast_basics\threads</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_basics\threads\beast_ParallelFor.h">
<Filter>beast_basics\threads</Filter>
</ClInclude>
@@ -937,9 +934,6 @@
<ClCompile Include="..\..\modules\beast_basics\threads\beast_Listeners.cpp">
<Filter>beast_basics\threads</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_basics\threads\beast_MessageThread.cpp">
<Filter>beast_basics\threads</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_basics\threads\beast_ParallelFor.cpp">
<Filter>beast_basics\threads</Filter>
</ClCompile>

View File

@@ -29,8 +29,6 @@ namespace Murmur
#if BEAST_MSVC
#define FORCE_INLINE __forceinline
#define ROTL32(x,y) _rotl(x,y)
#define ROTL64(x,y) _rotl64(x,y)
@@ -40,8 +38,6 @@ namespace Murmur
#else
#define FORCE_INLINE __attribute__((always_inline))
static inline uint32_t rotl32 ( uint32_t x, int8_t r )
{
return (x << r) | (x >> (32 - r));
@@ -63,12 +59,12 @@ static inline uint64_t rotl64 ( uint64_t x, int8_t r )
// Block read - if your platform needs to do endian-swapping or can only
// handle aligned reads, do the conversion here
static FORCE_INLINE uint32_t getblock ( const uint32_t* p, int i )
static forcedinline uint32_t getblock ( const uint32_t* p, int i )
{
return p[i];
}
static FORCE_INLINE uint64_t getblock ( const uint64_t* p, int i )
static forcedinline uint64_t getblock ( const uint64_t* p, int i )
{
return p[i];
}
@@ -76,7 +72,7 @@ static FORCE_INLINE uint64_t getblock ( const uint64_t* p, int i )
//-----------------------------------------------------------------------------
// Finalization mix - force all bits of a hash block to avalanche
static FORCE_INLINE uint32_t fmix ( uint32_t h )
static forcedinline uint32_t fmix ( uint32_t h )
{
h ^= h >> 16;
h *= 0x85ebca6b;
@@ -89,7 +85,7 @@ static FORCE_INLINE uint32_t fmix ( uint32_t h )
//----------
static FORCE_INLINE uint64_t fmix ( uint64_t k )
static forcedinline uint64_t fmix ( uint64_t k )
{
k ^= k >> 33;
k *= BIG_CONSTANT (0xff51afd7ed558ccd);

View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#pragma message(BEAST_LOC_"Missing platform-specific implementation")
//#pragma message(BEAST_LOC_"Missing platform-specific implementation")
FPUFlags FPUFlags::getCurrent ()
{

View File

@@ -475,7 +475,7 @@ public:
template <class Mf>
inline void call (Mf mf)
{
callf (vf::bind (mf, vf::_1));
callf (bind (mf, _1));
}
#endif
@@ -483,7 +483,7 @@ public:
template <class Mf, class T1>
void call (Mf mf, T1 t1)
{
callf (vf::bind (mf, vf::_1, t1));
callf (bind (mf, _1, t1));
}
#endif
@@ -491,7 +491,7 @@ public:
template <class Mf, class T1, class T2>
void call (Mf mf, T1 t1, T2 t2)
{
callf (vf::bind (mf, vf::_1, t1, t2));
callf (bind (mf, _1, t1, t2));
}
#endif
@@ -499,7 +499,7 @@ public:
template <class Mf, class T1, class T2, class T3>
void call (Mf mf, T1 t1, T2 t2, T3 t3)
{
callf (vf::bind (mf, vf::_1, t1, t2, t3));
callf (bind (mf, _1, t1, t2, t3));
}
#endif
@@ -507,7 +507,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4>
void call (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4)
{
callf (vf::bind (mf, vf::_1, t1, t2, t3, t4));
callf (bind (mf, _1, t1, t2, t3, t4));
}
#endif
@@ -515,7 +515,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5>
void call (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
{
callf (vf::bind (mf, vf::_1, t1, t2, t3, t4, t5));
callf (bind (mf, _1, t1, t2, t3, t4, t5));
}
#endif
@@ -523,7 +523,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6>
void call (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
{
callf (vf::bind (mf, vf::_1, t1, t2, t3, t4, t5, t6));
callf (bind (mf, _1, t1, t2, t3, t4, t5, t6));
}
#endif
@@ -531,7 +531,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
void call (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
{
callf (vf::bind (mf, vf::_1, t1, t2, t3, t4, t5, t6, t7));
callf (bind (mf, _1, t1, t2, t3, t4, t5, t6, t7));
}
#endif
@@ -539,7 +539,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
void call (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
{
callf (vf::bind (mf, vf::_1, t1, t2, t3, t4, t5, t6, t7, t8));
callf (bind (mf, _1, t1, t2, t3, t4, t5, t6, t7, t8));
}
#endif
/** @} */
@@ -557,7 +557,7 @@ public:
template <class Mf>
inline void queue (Mf mf)
{
queuef (vf::bind (mf, vf::_1));
queuef (bind (mf, _1));
}
#endif
@@ -565,7 +565,7 @@ public:
template <class Mf, class T1>
void queue (Mf mf, T1 t1)
{
queuef (vf::bind (mf, vf::_1, t1));
queuef (bind (mf, _1, t1));
}
#endif
@@ -573,7 +573,7 @@ public:
template <class Mf, class T1, class T2>
void queue (Mf mf, T1 t1, T2 t2)
{
queuef (vf::bind (mf, vf::_1, t1, t2));
queuef (bind (mf, _1, t1, t2));
}
#endif
@@ -581,7 +581,7 @@ public:
template <class Mf, class T1, class T2, class T3>
void queue (Mf mf, T1 t1, T2 t2, T3 t3)
{
queuef (vf::bind (mf, vf::_1, t1, t2, t3));
queuef (bind (mf, _1, t1, t2, t3));
}
#endif
@@ -589,7 +589,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4>
void queue (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4)
{
queuef (vf::bind (mf, vf::_1, t1, t2, t3, t4));
queuef (bind (mf, _1, t1, t2, t3, t4));
}
#endif
@@ -597,7 +597,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5>
void queue (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
{
queuef (vf::bind (mf, vf::_1, t1, t2, t3, t4, t5));
queuef (bind (mf, _1, t1, t2, t3, t4, t5));
}
#endif
@@ -605,7 +605,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6>
void queue (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
{
queuef (vf::bind (mf, vf::_1, t1, t2, t3, t4, t5, t6));
queuef (bind (mf, _1, t1, t2, t3, t4, t5, t6));
}
#endif
@@ -613,7 +613,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
void queue (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
{
queuef (vf::bind (mf, vf::_1, t1, t2, t3, t4, t5, t6, t7));
queuef (bind (mf, _1, t1, t2, t3, t4, t5, t6, t7));
}
#endif
@@ -621,7 +621,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
void queue (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
{
queuef (vf::bind (mf, vf::_1, t1, t2, t3, t4, t5, t6, t7, t8));
queuef (bind (mf, _1, t1, t2, t3, t4, t5, t6, t7, t8));
}
#endif
/** @} */
@@ -645,7 +645,7 @@ public:
template <class Mf>
inline void update (Mf mf)
{
updatef (mf, vf::bind (mf, vf::_1));
updatef (mf, bind (mf, _1));
}
#endif
@@ -653,7 +653,7 @@ public:
template <class Mf, class T1>
void update (Mf mf, T1 t1)
{
updatef (mf, vf::bind (mf, vf::_1, t1));
updatef (mf, bind (mf, _1, t1));
}
#endif
@@ -661,7 +661,7 @@ public:
template <class Mf, class T1, class T2>
void update (Mf mf, T1 t1, T2 t2)
{
updatef (mf, vf::bind (mf, vf::_1, t1, t2));
updatef (mf, bind (mf, _1, t1, t2));
}
#endif
@@ -669,7 +669,7 @@ public:
template <class Mf, class T1, class T2, class T3>
void update (Mf mf, T1 t1, T2 t2, T3 t3)
{
updatef (mf, vf::bind (mf, vf::_1, t1, t2, t3));
updatef (mf, bind (mf, _1, t1, t2, t3));
}
#endif
@@ -677,7 +677,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4>
void update (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4)
{
updatef (mf, vf::bind (mf, vf::_1, t1, t2, t3, t4));
updatef (mf, bind (mf, _1, t1, t2, t3, t4));
}
#endif
@@ -685,7 +685,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5>
void update (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
{
updatef (mf, vf::bind (mf, vf::_1, t1, t2, t3, t4, t5));
updatef (mf, bind (mf, _1, t1, t2, t3, t4, t5));
}
#endif
@@ -693,7 +693,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6>
void update (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
{
updatef (mf, vf::bind (mf, vf::_1, t1, t2, t3, t4, t5, t6));
updatef (mf, bind (mf, _1, t1, t2, t3, t4, t5, t6));
}
#endif
@@ -701,7 +701,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
void update (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
{
updatef (mf, vf::bind (mf, vf::_1, t1, t2, t3, t4, t5, t6, t7));
updatef (mf, bind (mf, _1, t1, t2, t3, t4, t5, t6, t7));
}
#endif
@@ -709,7 +709,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
void update (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
{
updatef (mf, vf::bind (mf, vf::_1, t1, t2, t3, t4, t5, t6, t7, t8));
updatef (mf, bind (mf, _1, t1, t2, t3, t4, t5, t6, t7, t8));
}
#endif
/** @} */
@@ -730,7 +730,7 @@ public:
template <class Mf>
inline void call1 (ListenerClass* const listener, Mf mf)
{
call1f (listener, vf::bind (mf, vf::_1));
call1f (listener, bind (mf, _1));
}
#endif
@@ -738,7 +738,7 @@ public:
template <class Mf, class T1>
void call1 (ListenerClass* const listener, Mf mf, T1 t1)
{
call1f (listener, vf::bind (mf, vf::_1, t1));
call1f (listener, bind (mf, _1, t1));
}
#endif
@@ -746,7 +746,7 @@ public:
template <class Mf, class T1, class T2>
void call1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2)
{
call1f (listener, vf::bind (mf, vf::_1, t1, t2));
call1f (listener, bind (mf, _1, t1, t2));
}
#endif
@@ -754,7 +754,7 @@ public:
template <class Mf, class T1, class T2, class T3>
void call1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3)
{
call1f (listener, vf::bind (mf, vf::_1, t1, t2, t3));
call1f (listener, bind (mf, _1, t1, t2, t3));
}
#endif
@@ -762,7 +762,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4>
void call1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4)
{
call1f (listener, vf::bind (mf, vf::_1, t1, t2, t3, t4));
call1f (listener, bind (mf, _1, t1, t2, t3, t4));
}
#endif
@@ -770,7 +770,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5>
void call1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
{
call1f (listener, vf::bind (mf, vf::_1, t1, t2, t3, t4, t5));
call1f (listener, bind (mf, _1, t1, t2, t3, t4, t5));
}
#endif
@@ -778,7 +778,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6>
void call1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
{
call1f (listener, vf::bind (mf, vf::_1, t1, t2, t3, t4, t5, t6));
call1f (listener, bind (mf, _1, t1, t2, t3, t4, t5, t6));
}
#endif
@@ -786,7 +786,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
void call1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
{
call1f (listener, vf::bind (mf, vf::_1, t1, t2, t3, t4, t5, t6, t7));
call1f (listener, bind (mf, _1, t1, t2, t3, t4, t5, t6, t7));
}
#endif
@@ -794,7 +794,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
void call1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
{
call1f (listener, vf::bind (mf, vf::_1, t1, t2, t3, t4, t5, t6, t7, t8));
call1f (listener, bind (mf, _1, t1, t2, t3, t4, t5, t6, t7, t8));
}
#endif
/** @} */
@@ -813,7 +813,7 @@ public:
template <class Mf>
inline void queue1 (ListenerClass* const listener, Mf mf)
{
queue1f (listener, vf::bind (mf, vf::_1));
queue1f (listener, bind (mf, _1));
}
#endif
@@ -821,7 +821,7 @@ public:
template <class Mf, class T1>
void queue1 (ListenerClass* const listener, Mf mf, T1 t1)
{
queue1f (listener, vf::bind (mf, vf::_1, t1));
queue1f (listener, bind (mf, _1, t1));
}
#endif
@@ -829,7 +829,7 @@ public:
template <class Mf, class T1, class T2>
void queue1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2)
{
queue1f (listener, vf::bind (mf, vf::_1, t1, t2));
queue1f (listener, bind (mf, _1, t1, t2));
}
#endif
@@ -837,7 +837,7 @@ public:
template <class Mf, class T1, class T2, class T3>
void queue1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3)
{
queue1f (listener, vf::bind (mf, vf::_1, t1, t2, t3));
queue1f (listener, bind (mf, _1, t1, t2, t3));
}
#endif
@@ -845,7 +845,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4>
void queue1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4)
{
queue1f (listener, vf::bind (mf, vf::_1, t1, t2, t3, t4));
queue1f (listener, bind (mf, _1, t1, t2, t3, t4));
}
#endif
@@ -853,7 +853,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5>
void queue1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
{
queue1f (listener, vf::bind (mf, vf::_1, t1, t2, t3, t4, t5));
queue1f (listener, bind (mf, _1, t1, t2, t3, t4, t5));
}
#endif
@@ -861,7 +861,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6>
void queue1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
{
queue1f (listener, vf::bind (mf, vf::_1, t1, t2, t3, t4, t5, t6));
queue1f (listener, bind (mf, _1, t1, t2, t3, t4, t5, t6));
}
#endif
@@ -869,7 +869,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
void queue1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
{
queue1f (listener, vf::bind (mf, vf::_1, t1, t2, t3, t4, t5, t6, t7));
queue1f (listener, bind (mf, _1, t1, t2, t3, t4, t5, t6, t7));
}
#endif
@@ -877,7 +877,7 @@ public:
template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
void queue1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
{
queue1f (listener, vf::bind (mf, vf::_1, t1, t2, t3, t4, t5, t6, t7, t8));
queue1f (listener, bind (mf, _1, t1, t2, t3, t4, t5, t6, t7, t8));
}
#endif
/** @} */

View File

@@ -98,7 +98,7 @@ public:
template <class Fn>
void loop (int n, Fn f)
{
loopf (n, vf::bind (f, vf::_1));
loopf (n, bind (f, _1));
}
#endif
@@ -106,7 +106,7 @@ public:
template <class Fn, class T1>
void loop (int n, Fn f, T1 t1)
{
loopf (n, vf::bind (f, t1, vf::_1));
loopf (n, bind (f, t1, _1));
}
#endif
@@ -114,7 +114,7 @@ public:
template <class Fn, class T1, class T2>
void loop (int n, Fn f, T1 t1, T2 t2)
{
loopf (n, vf::bind (f, t1, t2, vf::_1));
loopf (n, bind (f, t1, t2, _1));
}
#endif
@@ -122,7 +122,7 @@ public:
template <class Fn, class T1, class T2, class T3>
void loop (int n, Fn f, T1 t1, T2 t2, T3 t3)
{
loopf (n, vf::bind (f, t1, t2, t3, vf::_1));
loopf (n, bind (f, t1, t2, t3, _1));
}
#endif
@@ -130,7 +130,7 @@ public:
template <class Fn, class T1, class T2, class T3, class T4>
void loop (int n, Fn f, T1 t1, T2 t2, T3 t3, T4 t4)
{
loopf (n, vf::bind (f, t1, t2, t3, t4, vf::_1));
loopf (n, bind (f, t1, t2, t3, t4, _1));
}
#endif
@@ -138,7 +138,7 @@ public:
template <class Fn, class T1, class T2, class T3, class T4, class T5>
void loop (int n, Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
{
loopf (n, vf::bind (f, t1, t2, t3, t4, t5, vf::_1));
loopf (n, bind (f, t1, t2, t3, t4, t5, _1));
}
#endif
@@ -146,7 +146,7 @@ public:
template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6>
void loop (int n, Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
{
loopf (n, vf::bind (f, t1, t2, t3, t4, t5, t6, vf::_1));
loopf (n, bind (f, t1, t2, t3, t4, t5, t6, _1));
}
#endif
@@ -154,7 +154,7 @@ public:
template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
void loop (int n, Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
{
loopf (n, vf::bind (f, t1, t2, t3, t4, t5, t6, t7, vf::_1));
loopf (n, bind (f, t1, t2, t3, t4, t5, t6, t7, _1));
}
#endif
@@ -162,7 +162,7 @@ public:
template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
void loop (int n, Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
{
loopf (n, vf::bind (f, t1, t2, t3, t4, t5, t6, t7, t8, vf::_1));
loopf (n, bind (f, t1, t2, t3, t4, t5, t6, t7, t8, _1));
}
#endif
/** @} */

View File

@@ -21,7 +21,7 @@ int UptimeTimer::getElapsedSeconds () const
if (m_isUpdatingManually)
{
// vf::memoryBarrier();
// memoryBarrier();
result = m_elapsedTime;
}
else

View File

@@ -1,25 +0,0 @@
//------------------------------------------------------------------------------
/*
Copyright (c) 2011-2013, OpenCoin, Inc.
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
//==============================================================================
/** Add this to get the @ref ripple_mess module.
@file ripple_mess.cpp
@ingroup ripple_mess
*/
#include "ripple_mess.h"

View File

@@ -1,37 +0,0 @@
//------------------------------------------------------------------------------
/*
Copyright (c) 2011-2013, OpenCoin, Inc.
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
//==============================================================================
/** Include this to get the @ref ripple_mess module.
@file ripple_mess.h
@ingroup ripple_mess
*/
/** Messy classes.
Stuff I haven't gotten to cleaning up yet.
@defgroup ripple_mess
*/
#ifndef RIPPLE_MESS_H
#define RIPPLE_MESS_H
#include "../ripple_basics/ripple_basics.h"
#endif

View File

@@ -252,7 +252,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="modules\ripple_client\ripple_client.cpp" />
<ClCompile Include="modules\ripple_client\ripple_client.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="modules\ripple_data\crypto\ripple_Base58.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -372,7 +377,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="modules\ripple_db\ripple_db.cpp" />
<ClCompile Include="modules\ripple_db\ripple_db.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="modules\ripple_json\json\json_reader.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -392,7 +402,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="modules\ripple_json\ripple_json.cpp" />
<ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp" />
<ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="modules\ripple_main\ripple_main.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -403,8 +418,12 @@
<ClCompile Include="modules\ripple_main\ripple_main_pt2.cpp" />
<ClCompile Include="modules\ripple_main\ripple_main_pt3.cpp" />
<ClCompile Include="modules\ripple_main\ripple_main_pt4.cpp" />
<ClCompile Include="modules\ripple_mess\ripple_mess.cpp" />
<ClCompile Include="modules\ripple_net\ripple_net.cpp" />
<ClCompile Include="modules\ripple_net\ripple_net.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\database\database.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1370,6 +1389,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\websocket_core.cpp" />
<ClCompile Include="Subtrees\beast\modules\beast_basics\beast_basics.cpp" />
<ClCompile Include="Subtrees\beast\modules\beast_core\beast_core.cpp" />
</ItemGroup>
<ItemGroup>
@@ -1437,7 +1457,6 @@
<ClInclude Include="modules\ripple_json\ripple_json.h" />
<ClInclude Include="modules\ripple_ledger\ripple_ledger.h" />
<ClInclude Include="modules\ripple_main\ripple_main.h" />
<ClInclude Include="modules\ripple_mess\ripple_mess.h" />
<ClInclude Include="modules\ripple_net\ripple_net.h" />
<ClInclude Include="src\cpp\database\database.h" />
<ClInclude Include="src\cpp\database\SqliteDatabase.h" />

View File

@@ -79,18 +79,6 @@
<Filter Include="1. Modules\ripple_data\crypto">
<UniqueIdentifier>{095d33d8-dbf7-44d0-a675-6722b02bb3be}</UniqueIdentifier>
</Filter>
<Filter Include="2. Empty">
<UniqueIdentifier>{786657f9-b1b3-483c-a8e6-863cc2e02eb8}</UniqueIdentifier>
</Filter>
<Filter Include="2. Empty\ripple_mess">
<UniqueIdentifier>{becffa9b-61f7-42d4-815a-1ec822cad0e7}</UniqueIdentifier>
</Filter>
<Filter Include="2. Empty\ripple_net">
<UniqueIdentifier>{7f76ce57-c428-487e-97a0-979c0990a81d}</UniqueIdentifier>
</Filter>
<Filter Include="2. Empty\ripple_db">
<UniqueIdentifier>{a5190241-c5bc-4e23-8ef1-6adf757c75e3}</UniqueIdentifier>
</Filter>
<Filter Include="1. Modules\ripple_main\_unfactored">
<UniqueIdentifier>{86d0831e-74e5-443b-b5f9-d6b39d5b4c97}</UniqueIdentifier>
</Filter>
@@ -124,12 +112,6 @@
<Filter Include="1. Modules\ripple_data\protocol">
<UniqueIdentifier>{2f3572a9-2882-4656-ab93-82b7761c9e3d}</UniqueIdentifier>
</Filter>
<Filter Include="2. Empty\ripple_ledger">
<UniqueIdentifier>{b6175f9a-7d46-4b57-877f-f58b0b3bba89}</UniqueIdentifier>
</Filter>
<Filter Include="1. Modules\ripple_client">
<UniqueIdentifier>{97c96b68-70fd-4679-89fc-c1c8c87c265e}</UniqueIdentifier>
</Filter>
<Filter Include="1. Modules\ripple_data\utility">
<UniqueIdentifier>{ba524810-8446-4c50-ad59-d284747ba220}</UniqueIdentifier>
</Filter>
@@ -151,6 +133,21 @@
<Filter Include="1. Modules\ripple_main\refactored\ledger">
<UniqueIdentifier>{857187f0-ff25-4ebe-af30-544b7b7f503a}</UniqueIdentifier>
</Filter>
<Filter Include="2. %28Unused%29">
<UniqueIdentifier>{786657f9-b1b3-483c-a8e6-863cc2e02eb8}</UniqueIdentifier>
</Filter>
<Filter Include="2. %28Unused%29\ripple_net">
<UniqueIdentifier>{7f76ce57-c428-487e-97a0-979c0990a81d}</UniqueIdentifier>
</Filter>
<Filter Include="2. %28Unused%29\ripple_db">
<UniqueIdentifier>{a5190241-c5bc-4e23-8ef1-6adf757c75e3}</UniqueIdentifier>
</Filter>
<Filter Include="2. %28Unused%29\ripple_ledger">
<UniqueIdentifier>{b6175f9a-7d46-4b57-877f-f58b0b3bba89}</UniqueIdentifier>
</Filter>
<Filter Include="2. %28Unused%29\ripple_client">
<UniqueIdentifier>{97c96b68-70fd-4679-89fc-c1c8c87c265e}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\cpp\database\sqlite3.c">
@@ -481,16 +478,16 @@
<Filter>1. Modules\ripple_basics</Filter>
</ClCompile>
<ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp">
<Filter>2. Empty\ripple_ledger</Filter>
<Filter>2. %28Unused%29\ripple_ledger</Filter>
</ClCompile>
<ClCompile Include="modules\ripple_client\ripple_client.cpp">
<Filter>1. Modules\ripple_client</Filter>
<Filter>2. %28Unused%29\ripple_client</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\ChangeTransactor.cpp">
<Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
</ClCompile>
<ClCompile Include="modules\ripple_db\ripple_db.cpp">
<Filter>2. Empty\ripple_db</Filter>
<Filter>2. %28Unused%29\ripple_db</Filter>
</ClCompile>
<ClCompile Include="src\cpp\database\database.cpp">
<Filter>1. Modules\ripple_main\_unfactored\db</Filter>
@@ -505,7 +502,7 @@
<Filter>1. Modules\ripple_main</Filter>
</ClCompile>
<ClCompile Include="modules\ripple_net\ripple_net.cpp">
<Filter>2. Empty\ripple_net</Filter>
<Filter>2. %28Unused%29\ripple_net</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Interpreter.cpp">
<Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
@@ -516,9 +513,6 @@
<ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp">
<Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
</ClCompile>
<ClCompile Include="modules\ripple_mess\ripple_mess.cpp">
<Filter>2. Empty\ripple_mess</Filter>
</ClCompile>
<ClCompile Include="modules\ripple_json\json\json_reader.cpp">
<Filter>1. Modules\ripple_json\json</Filter>
</ClCompile>
@@ -888,6 +882,9 @@
<ClCompile Include="src\cpp\ripple\ripple_InboundLedgers.cpp">
<Filter>1. Modules\ripple_main\refactored\ledger</Filter>
</ClCompile>
<ClCompile Include="Subtrees\beast\modules\beast_basics\beast_basics.cpp">
<Filter>0. Third Party Code\beast</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="database\sqlite3ext.h">
@@ -1212,16 +1209,16 @@
<Filter>1. Modules\ripple_basics</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_ledger\ripple_ledger.h">
<Filter>2. Empty\ripple_ledger</Filter>
<Filter>2. %28Unused%29\ripple_ledger</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_client\ripple_client.h">
<Filter>1. Modules\ripple_client</Filter>
<Filter>2. %28Unused%29\ripple_client</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\ChangeTransactor.h">
<Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_db\ripple_db.h">
<Filter>2. Empty\ripple_db</Filter>
<Filter>2. %28Unused%29\ripple_db</Filter>
</ClInclude>
<ClInclude Include="src\cpp\database\database.h">
<Filter>1. Modules\ripple_main\_unfactored\db</Filter>
@@ -1233,7 +1230,7 @@
<Filter>1. Modules\ripple_main</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_net\ripple_net.h">
<Filter>2. Empty\ripple_net</Filter>
<Filter>2. %28Unused%29\ripple_net</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\Interpreter.h">
<Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
@@ -1244,9 +1241,6 @@
<ClInclude Include="src\cpp\ripple\WalletAddTransactor.h">
<Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_mess\ripple_mess.h">
<Filter>2. Empty\ripple_mess</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_basics\containers\ripple_KeyCache.h">
<Filter>1. Modules\ripple_basics\containers</Filter>
</ClInclude>