Move Ripple protobuf declarations to ripple_data

modules/ripple_data/ripple_data.cpp

@@ -80,6 +80,11 @@
 #include "types/ripple_RippleAddress.cpp"
 #include "types/ripple_Serializer.cpp"
 
+// VFALCO: TODO Fix this for SConstruct
+#ifdef _MSC_VER
+#include "ripple.pb.cc" // BROKEN because of SConstruct
+#endif
+
 #ifdef _MSC_VER
 //#pragma warning (pop)
 #endif

modules/ripple_data/ripple_data.h

@@ -68,4 +68,7 @@
 #include "types/ripple_RippleAddress.h"
 #include "types/ripple_Serializer.h" // needs CKey
 
+// VFALCO: TODO, resolve the location of this file
+#include "ripple.pb.h"
+
 #endif

modules/ripple_ledger/ripple_ledger.cpp

@@ -47,7 +47,6 @@
 #include <string>
 #include <vector>
 
-
 #include <boost/algorithm/string.hpp>
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
@@ -65,10 +64,6 @@
 
 #include "src/cpp/database/SqliteDatabase.h"
 
-// VFALCO: TODO, resolve the location of this file
-//#include "src/cpp/ripple/ripple.pb.h"
-#include "ripple.pb.h"
-
 #include "src/cpp/ripple/AcceptedLedger.h"
 #include "src/cpp/ripple/AccountItems.h"
 #include "src/cpp/ripple/AccountSetTransactor.h"

modules/ripple_mess/ripple_mess.cpp

@@ -50,11 +50,6 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 #include "src/cpp/ripple/SHAMapNodes.cpp" // no log
 #include "src/cpp/ripple/SHAMapSync.cpp"
 
-// VFALCO: TODO Fix this for SConstruct
-#ifdef _MSC_VER
-#include "ripple.pb.cc" // BROKEN because of SConstruct
-#endif
-
 #ifdef _MSC_VER
 //#pragma warning (pop)
 #endif

newcoin.vcxproj.filters

@@ -136,6 +136,9 @@
     <Filter Include="1. Modules\ripple_data\types">
       <UniqueIdentifier>{2f3572a9-2882-4656-ab93-82b7761c9e3d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="1. Modules\ripple_data\protobuf">
+      <UniqueIdentifier>{9f8ed40a-9f16-42fe-82fd-caf72d3d6a2b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\cpp\database\sqlite3.c">
@@ -672,9 +675,6 @@
     <ClCompile Include="src\cpp\ripple\Pathfinder.cpp">
       <Filter>1. Modules\ripple_ledger\processing</Filter>
     </ClCompile>
-    <ClCompile Include="build\proto\ripple.pb.cc">
-      <Filter>1. Modules\ripple_mess\protobuf</Filter>
-    </ClCompile>
     <ClCompile Include="modules\ripple_mess\ripple_mess.cpp">
       <Filter>1. Modules\ripple_mess</Filter>
     </ClCompile>
@@ -786,6 +786,9 @@
     <ClCompile Include="modules\ripple_basics\utility\ripple_InstanceCounter.cpp">
       <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClCompile>
+    <ClCompile Include="build\proto\ripple.pb.cc">
+      <Filter>1. Modules\ripple_data\protobuf</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="database\sqlite3ext.h">
@@ -1304,9 +1307,6 @@
     <ClInclude Include="src\cpp\ripple\NetworkStatus.h">
       <Filter>1. Modules\ripple_main\_old</Filter>
     </ClInclude>
-    <ClInclude Include="build\proto\ripple.pb.h">
-      <Filter>1. Modules\ripple_mess\protobuf</Filter>
-    </ClInclude>
     <ClInclude Include="modules\ripple_mess\ripple_mess.h">
       <Filter>1. Modules\ripple_mess</Filter>
     </ClInclude>
@@ -1460,6 +1460,9 @@
     <ClInclude Include="modules\ripple_basics\utility\ripple_InstanceCounter.h">
       <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClInclude>
+    <ClInclude Include="build\proto\ripple.pb.h">
+      <Filter>1. Modules\ripple_data\protobuf</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="SConstruct" />

src/cpp/ripple/LedgerAcquire.h

@@ -15,7 +15,6 @@
 
 #include "Ledger.h"
 #include "Peer.h"
-#include "ripple.pb.h"
 
 // How long before we try again to acquire the same ledger
 #ifndef LEDGER_REACQUIRE_INTERVAL

src/cpp/ripple/PackedMessage.h

@@ -14,8 +14,6 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/cstdint.hpp>
 
-#include "ripple.pb.h"
-
 // The header size for packed messages
 // len(4)+type(2)
 const unsigned HEADER_SIZE = 6;

src/cpp/ripple/Peer.h

@@ -8,7 +8,6 @@
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "ripple.pb.h"
 #include "PackedMessage.h"
 #include "Ledger.h"
 #include "Transaction.h"

src/cpp/ripple/Transaction.h

@@ -11,7 +11,6 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/cstdint.hpp>
 
-#include "ripple.pb.h"
 #include "SHAMap.h"
 #include "SerializedTransaction.h"
 #include "TransactionErr.h"