diff --git a/SConstruct b/SConstruct index 7eefd894be..abd45d0e2e 100644 --- a/SConstruct +++ b/SConstruct @@ -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' ] #------------------------------------------------------------------------------- diff --git a/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj b/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj index 2ca33570ff..04af470a2b 100644 --- a/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj +++ b/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj @@ -86,7 +86,6 @@ - @@ -295,10 +294,6 @@ true true - - true - true - true true diff --git a/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj.filters b/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj.filters index 6e878aa909..f2f88ba0bc 100644 --- a/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj.filters +++ b/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj.filters @@ -596,9 +596,6 @@ beast_basics\threads - - beast_basics\threads - beast_basics\threads @@ -937,9 +934,6 @@ beast_basics\threads - - beast_basics\threads - beast_basics\threads diff --git a/Subtrees/beast/modules/beast_basics/math/beast_MurmurHash.cpp b/Subtrees/beast/modules/beast_basics/math/beast_MurmurHash.cpp index 9b8c4311bb..8f7d7be2d1 100644 --- a/Subtrees/beast/modules/beast_basics/math/beast_MurmurHash.cpp +++ b/Subtrees/beast/modules/beast_basics/math/beast_MurmurHash.cpp @@ -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); diff --git a/Subtrees/beast/modules/beast_basics/native/beast_posix_FPUFlags.cpp b/Subtrees/beast/modules/beast_basics/native/beast_posix_FPUFlags.cpp index 99938f2a6f..09a2f75a30 100644 --- a/Subtrees/beast/modules/beast_basics/native/beast_posix_FPUFlags.cpp +++ b/Subtrees/beast/modules/beast_basics/native/beast_posix_FPUFlags.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#pragma message(BEAST_LOC_"Missing platform-specific implementation") +//#pragma message(BEAST_LOC_"Missing platform-specific implementation") FPUFlags FPUFlags::getCurrent () { diff --git a/Subtrees/beast/modules/beast_basics/threads/beast_Listeners.h b/Subtrees/beast/modules/beast_basics/threads/beast_Listeners.h index 1d522df619..9236771890 100644 --- a/Subtrees/beast/modules/beast_basics/threads/beast_Listeners.h +++ b/Subtrees/beast/modules/beast_basics/threads/beast_Listeners.h @@ -475,7 +475,7 @@ public: template inline void call (Mf mf) { - callf (vf::bind (mf, vf::_1)); + callf (bind (mf, _1)); } #endif @@ -483,7 +483,7 @@ public: template 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 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 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 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 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 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 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 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 inline void queue (Mf mf) { - queuef (vf::bind (mf, vf::_1)); + queuef (bind (mf, _1)); } #endif @@ -565,7 +565,7 @@ public: template 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 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 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 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 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 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 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 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 inline void update (Mf mf) { - updatef (mf, vf::bind (mf, vf::_1)); + updatef (mf, bind (mf, _1)); } #endif @@ -653,7 +653,7 @@ public: template 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 /** @} */ diff --git a/Subtrees/beast/modules/beast_basics/threads/beast_ParallelFor.h b/Subtrees/beast/modules/beast_basics/threads/beast_ParallelFor.h index ca7bc461d1..7cf6b45d5c 100644 --- a/Subtrees/beast/modules/beast_basics/threads/beast_ParallelFor.h +++ b/Subtrees/beast/modules/beast_basics/threads/beast_ParallelFor.h @@ -98,7 +98,7 @@ public: template 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 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 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 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 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 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 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 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 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 /** @} */ diff --git a/modules/ripple_basics/utility/ripple_UptimeTimer.cpp b/modules/ripple_basics/utility/ripple_UptimeTimer.cpp index 2412b9f20b..fd42903a55 100644 --- a/modules/ripple_basics/utility/ripple_UptimeTimer.cpp +++ b/modules/ripple_basics/utility/ripple_UptimeTimer.cpp @@ -21,7 +21,7 @@ int UptimeTimer::getElapsedSeconds () const if (m_isUpdatingManually) { - // vf::memoryBarrier(); + // memoryBarrier(); result = m_elapsedTime; } else diff --git a/modules/ripple_mess/ripple_mess.cpp b/modules/ripple_mess/ripple_mess.cpp deleted file mode 100644 index f5209899be..0000000000 --- a/modules/ripple_mess/ripple_mess.cpp +++ /dev/null @@ -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" diff --git a/modules/ripple_mess/ripple_mess.h b/modules/ripple_mess/ripple_mess.h deleted file mode 100644 index d456f65a29..0000000000 --- a/modules/ripple_mess/ripple_mess.h +++ /dev/null @@ -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 diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 47d760edd4..8efaf2dbcd 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -252,7 +252,12 @@ true true - + + true + true + true + true + true true @@ -372,7 +377,12 @@ true true - + + true + true + true + true + true true @@ -392,7 +402,12 @@ true - + + true + true + true + true + true true @@ -403,8 +418,12 @@ - - + + true + true + true + true + true true @@ -1370,6 +1389,7 @@ true + @@ -1437,7 +1457,6 @@ - diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters index e0c0dc5db1..1ac6c2c4bd 100644 --- a/newcoin.vcxproj.filters +++ b/newcoin.vcxproj.filters @@ -79,18 +79,6 @@ {095d33d8-dbf7-44d0-a675-6722b02bb3be} - - {786657f9-b1b3-483c-a8e6-863cc2e02eb8} - - - {becffa9b-61f7-42d4-815a-1ec822cad0e7} - - - {7f76ce57-c428-487e-97a0-979c0990a81d} - - - {a5190241-c5bc-4e23-8ef1-6adf757c75e3} - {86d0831e-74e5-443b-b5f9-d6b39d5b4c97} @@ -124,12 +112,6 @@ {2f3572a9-2882-4656-ab93-82b7761c9e3d} - - {b6175f9a-7d46-4b57-877f-f58b0b3bba89} - - - {97c96b68-70fd-4679-89fc-c1c8c87c265e} - {ba524810-8446-4c50-ad59-d284747ba220} @@ -151,6 +133,21 @@ {857187f0-ff25-4ebe-af30-544b7b7f503a} + + {786657f9-b1b3-483c-a8e6-863cc2e02eb8} + + + {7f76ce57-c428-487e-97a0-979c0990a81d} + + + {a5190241-c5bc-4e23-8ef1-6adf757c75e3} + + + {b6175f9a-7d46-4b57-877f-f58b0b3bba89} + + + {97c96b68-70fd-4679-89fc-c1c8c87c265e} + @@ -481,16 +478,16 @@ 1. Modules\ripple_basics - 2. Empty\ripple_ledger + 2. %28Unused%29\ripple_ledger - 1. Modules\ripple_client + 2. %28Unused%29\ripple_client 1. Modules\ripple_main\_unfactored\transactions - 2. Empty\ripple_db + 2. %28Unused%29\ripple_db 1. Modules\ripple_main\_unfactored\db @@ -505,7 +502,7 @@ 1. Modules\ripple_main - 2. Empty\ripple_net + 2. %28Unused%29\ripple_net 1. Modules\ripple_main\_unfactored\contracts @@ -516,9 +513,6 @@ 1. Modules\ripple_main\_unfactored\transactions - - 2. Empty\ripple_mess - 1. Modules\ripple_json\json @@ -888,6 +882,9 @@ 1. Modules\ripple_main\refactored\ledger + + 0. Third Party Code\beast + @@ -1212,16 +1209,16 @@ 1. Modules\ripple_basics - 2. Empty\ripple_ledger + 2. %28Unused%29\ripple_ledger - 1. Modules\ripple_client + 2. %28Unused%29\ripple_client 1. Modules\ripple_main\_unfactored\transactions - 2. Empty\ripple_db + 2. %28Unused%29\ripple_db 1. Modules\ripple_main\_unfactored\db @@ -1233,7 +1230,7 @@ 1. Modules\ripple_main - 2. Empty\ripple_net + 2. %28Unused%29\ripple_net 1. Modules\ripple_main\_unfactored\contracts @@ -1244,9 +1241,6 @@ 1. Modules\ripple_main\_unfactored\transactions - - 2. Empty\ripple_mess - 1. Modules\ripple_basics\containers