From d90a1276a83a674cc7ca93ab84e3330a6d8dc2b2 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Wed, 12 Jun 2013 10:15:23 -0700
Subject: [PATCH] Fix log setup inline function warning

---
 .../containers/ripple_TaggedCache.cpp          |  1 +
 .../containers/ripple_TaggedCache.h            |  4 +---
 modules/ripple_basics/ripple_basics.cpp        |  1 +
 modules/ripple_basics/utility/ripple_Log.h     |  4 ++--
 modules/ripple_main/ripple_main.cpp            |  2 ++
 newcoin.vcxproj                                | 18 ++++++++++++++++++
 newcoin.vcxproj.filters                        |  9 +++++++++
 src/cpp/ripple/WSConnection.cpp                |  2 ++
 src/cpp/ripple/WSConnection.h                  | 14 +-------------
 src/cpp/ripple/WSHandler.cpp                   |  2 ++
 src/cpp/ripple/WSHandler.h                     |  6 +-----
 11 files changed, 40 insertions(+), 23 deletions(-)
 create mode 100644 modules/ripple_basics/containers/ripple_TaggedCache.cpp
 create mode 100644 src/cpp/ripple/WSConnection.cpp
 create mode 100644 src/cpp/ripple/WSHandler.cpp

diff --git a/modules/ripple_basics/containers/ripple_TaggedCache.cpp b/modules/ripple_basics/containers/ripple_TaggedCache.cpp
new file mode 100644
index 0000000000..a37a161c88
--- /dev/null
+++ b/modules/ripple_basics/containers/ripple_TaggedCache.cpp
@@ -0,0 +1 @@
+SETUP_LOG (TaggedCacheLog)
diff --git a/modules/ripple_basics/containers/ripple_TaggedCache.h b/modules/ripple_basics/containers/ripple_TaggedCache.h
index 9f9c5db285..66a7ed739f 100644
--- a/modules/ripple_basics/containers/ripple_TaggedCache.h
+++ b/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 { };
-
-SETUP_LOG (TaggedCacheLog)
+struct TaggedCacheLog;
 
 /** Combination cache/map container.
 
diff --git a/modules/ripple_basics/ripple_basics.cpp b/modules/ripple_basics/ripple_basics.cpp
index 6ec626409c..119943b24e 100644
--- a/modules/ripple_basics/ripple_basics.cpp
+++ b/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"
 
diff --git a/modules/ripple_basics/utility/ripple_Log.h b/modules/ripple_basics/utility/ripple_Log.h
index c7487ea34b..5aa12d4c19 100644
--- a/modules/ripple_basics/utility/ripple_Log.h
+++ b/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;
 
diff --git a/modules/ripple_main/ripple_main.cpp b/modules/ripple_main/ripple_main.cpp
index c7c461984e..bfd8d103d5 100644
--- a/modules/ripple_main/ripple_main.cpp
+++ b/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
 
diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index 261fd2a6c4..c71656b388 100644
--- a/newcoin.vcxproj
+++ b/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>
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index fb83a07661..c11f49a0d1 100644
--- a/newcoin.vcxproj.filters
+++ b/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">
diff --git a/src/cpp/ripple/WSConnection.cpp b/src/cpp/ripple/WSConnection.cpp
new file mode 100644
index 0000000000..332e40ddb5
--- /dev/null
+++ b/src/cpp/ripple/WSConnection.cpp
@@ -0,0 +1,2 @@
+
+SETUP_LOG (WSConnectionLog)
diff --git a/src/cpp/ripple/WSConnection.h b/src/cpp/ripple/WSConnection.h
index 45251bfc8b..c22f8b598a 100644
--- a/src/cpp/ripple/WSConnection.h
+++ b/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 { };
-
-SETUP_LOG (WSConnectionLog)
+struct WSConnectionLog;
 
 template <typename endpoint_type>
 class WSServerHandler;
diff --git a/src/cpp/ripple/WSHandler.cpp b/src/cpp/ripple/WSHandler.cpp
new file mode 100644
index 0000000000..823f3ac020
--- /dev/null
+++ b/src/cpp/ripple/WSHandler.cpp
@@ -0,0 +1,2 @@
+
+SETUP_LOG (WSServerHandlerLog)
diff --git a/src/cpp/ripple/WSHandler.h b/src/cpp/ripple/WSHandler.h
index 4a15da9a4e..69deec4e62 100644
--- a/src/cpp/ripple/WSHandler.h
+++ b/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
-{
-};
-
-SETUP_LOG (WSServerHandlerLog)
+struct WSServerHandlerLog;
 
 // A single instance of this object is made.
 // This instance dispatches all events.  There is no per connection persistence.