Fix log setup inline function warning

modules/ripple_basics/containers/ripple_TaggedCache.cpp

@@ -0,0 +1 @@
+SETUP_LOG (TaggedCacheLog)

modules/ripple_basics/containers/ripple_TaggedCache.h

@@ -12,9 +12,7 @@
 // CAUTION: Callers must not modify data objects that are stored in the cache
 // unless they hold their own lock over all cache operations.
 
-struct TaggedCacheLog { };
+struct TaggedCacheLog;
-
-SETUP_LOG (TaggedCacheLog)
 
 /** Combination cache/map container.
 

modules/ripple_basics/ripple_basics.cpp

@@ -64,6 +64,7 @@
 #endif
 
 #include "containers/ripple_RangeSet.cpp"
+#include "containers/ripple_TaggedCache.cpp"
 
 #include "utility/ripple_Log.cpp"
 

modules/ripple_basics/utility/ripple_Log.h

@@ -38,7 +38,7 @@ private:
 	/** Retrieve file name from a log partition.
 	*/
 	template <class Key>
-	inline static char const* getFileName ();
+	static char const* getFileName ();
 	/*
 	{
 		static_vfassert (false);
@@ -55,7 +55,7 @@ public:
 };
 
 #define SETUP_LOG(k) \
-	template <> inline char const* LogPartition::getFileName <k> () { return __FILE__; } \
+	template <> char const* LogPartition::getFileName <k> () { return __FILE__; } \
 	struct k##Instantiator { k##Instantiator () { LogPartition::get <k> (); } }; \
 	static k##Instantiator k##Instantiator_instance;
 

modules/ripple_main/ripple_main.cpp

@@ -336,7 +336,9 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
 #include "src/cpp/ripple/TransactionQueue.cpp" // no log
 #include "src/cpp/ripple/Transactor.cpp"
 #include "src/cpp/ripple/TrustSetTransactor.cpp"
+#include "src/cpp/ripple/WSConnection.cpp"
 #include "src/cpp/ripple/WSDoor.cpp" // uses logging in WSConnection.h 
+#include "src/cpp/ripple/WSHandler.cpp"
 
 #endif
 

newcoin.vcxproj

@@ -179,6 +179,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="modules\ripple_basics\containers\ripple_TaggedCache.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_basics\ripple_basics.cpp" />
     <ClCompile Include="modules\ripple_basics\types\ripple_Uint256.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -1297,12 +1303,24 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="src\cpp\ripple\WSConnection.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\ripple\WSDoor.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\ripple\WSHandler.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\websocketpp\src\base64\base64.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

newcoin.vcxproj.filters

@@ -861,6 +861,15 @@
     <ClCompile Include="src\cpp\ripple\ripple_SHAMap.cpp">
       <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
     </ClCompile>
+    <ClCompile Include="modules\ripple_basics\containers\ripple_TaggedCache.cpp">
+      <Filter>1. Modules\ripple_basics\containers</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\WSConnection.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\WSHandler.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="database\sqlite3ext.h">

src/cpp/ripple/WSConnection.cpp

@@ -0,0 +1,2 @@
+
+SETUP_LOG (WSConnectionLog)

src/cpp/ripple/WSConnection.h

@@ -5,22 +5,10 @@
 #include "../websocketpp/src/sockets/autotls.hpp"
 #include "../websocketpp/src/websocketpp.hpp"
 
-#include <boost/weak_ptr.hpp>
-#include <boost/asio.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/pointer_cast.hpp>
-
-#include "WSDoor.h"
-#include "CallRPC.h"
-#include "LoadManager.h"
-#include "RPCErr.h"
-
 DEFINE_INSTANCE(WebSocketConnection);
 
 // This is for logging
-struct WSConnectionLog { };
+struct WSConnectionLog;
-
-SETUP_LOG (WSConnectionLog)
 
 template <typename endpoint_type>
 class WSServerHandler;

src/cpp/ripple/WSHandler.cpp

@@ -0,0 +1,2 @@
+
+SETUP_LOG (WSServerHandlerLog)

src/cpp/ripple/WSHandler.h

@@ -11,11 +11,7 @@ class WSConnection;
 
 // CAUTION: on_* functions are called by the websocket code while holding a lock
 
-struct WSServerHandlerLog // for logging
+struct WSServerHandlerLog;
-{
-};
-
-SETUP_LOG (WSServerHandlerLog)
 
 // A single instance of this object is made.
 // This instance dispatches all events.  There is no per connection persistence.