Merge branch 'feature_win' of git.tigerbrokers.net:server/openapi/openapi-cpp-sdk into feature_win

Author: tigersk

include/tigerapi/client_config.h

@@ -8,7 +8,7 @@
 #include <string>
 #include <utility>
 #include "constants.h"
-#include "../common/easylogging++.h"
+#include "easylogging++.h"
 
 #include "win32.h"
 

include/common/easylogging++.h include/tigerapi/easylogging++.hinclude/common/easylogging++.h renamed to include/tigerapi/easylogging++.h

@@ -6,6 +6,6 @@
 #define TIGERAPI_VERSION_H
 
 #define PROJECT_VERSION "0.1.0"
-#include "../common/easylogging++.h"
+#include "easylogging++.h"
 INITIALIZE_EASYLOGGINGPP
 #endif //TIGERAPI_VERSION_H

src/common/sign_util.h include/tigerapi/sign_util.hsrc/common/sign_util.h renamed to include/tigerapi/sign_util.h

@@ -160,21 +160,22 @@
     <ClInclude Include="include\tigerapi\client_config.h" />
     <ClInclude Include="include\tigerapi\constants.h" />
     <ClInclude Include="include\tigerapi\contract_util.h" />
+    <ClInclude Include="include\tigerapi\easylogging++.h" />
     <ClInclude Include="include\tigerapi\enums.h" />
     <ClInclude Include="include\tigerapi\model.h" />
     <ClInclude Include="include\tigerapi\order_util.h" />
     <ClInclude Include="include\tigerapi\quote_client.h" />
     <ClInclude Include="include\tigerapi\service_types.h" />
+    <ClInclude Include="include\tigerapi\sign_util.h" />
     <ClInclude Include="include\tigerapi\tiger_client.h" />
     <ClInclude Include="include\tigerapi\trade_client.h" />
     <ClInclude Include="include\tigerapi\utils.h" />
     <ClInclude Include="include\tigerapi\version.h" />
     <ClInclude Include="include\tigerapi\win32.h" />
-    <ClInclude Include="src\common\sign_util.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\common\easylogging++.cc" />
     <ClCompile Include="src\contract_util.cpp" />
+    <ClCompile Include="src\easylogging++.cc" />
     <ClCompile Include="src\order_util.cpp" />
     <ClCompile Include="src\quote_client.cpp" />
     <ClCompile Include="src\tiger_client.cpp" />

include/tigerapi/version.h

@@ -51,12 +51,15 @@
     <ClInclude Include="include\tigerapi\version.h">
       <Filter>include\tigerapi</Filter>
     </ClInclude>
-    <ClInclude Include="src\common\sign_util.h">
-      <Filter>src\common</Filter>
-    </ClInclude>
     <ClInclude Include="include\tigerapi\win32.h">
       <Filter>include\tigerapi</Filter>
     </ClInclude>
+    <ClInclude Include="include\tigerapi\easylogging++.h">
+      <Filter>include\tigerapi</Filter>
+    </ClInclude>
+    <ClInclude Include="include\tigerapi\sign_util.h">
+      <Filter>include\tigerapi</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\contract_util.cpp">
@@ -77,8 +80,8 @@
     <ClCompile Include="src\utils.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\easylogging++.cc">
-      <Filter>src\common</Filter>
+    <ClCompile Include="src\easylogging++.cc">
+      <Filter>src</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>

openapi-cpp-sdk.vcxproj

@@ -14,7 +14,7 @@
 //  http://muflihun.com
 //
 
-#include "../../include/common/easylogging++.h"
+#include "../../include/tigerapi/easylogging++.h"
 
 #if defined(AUTO_INITIALIZE_EASYLOGGINGPP)
 INITIALIZE_EASYLOGGINGPP

openapi-cpp-sdk.vcxproj.filters

@@ -1,7 +1,7 @@
 #include "../include/tigerapi/tiger_client.h"
 #include "../include/tigerapi/version.h"
 #include "../include/tigerapi/contract_util.h"
-#include "../include/common/easylogging++.h"
+#include "../include/tigerapi/easylogging++.h"
 
 namespace TIGER_API {
 

src/common/easylogging++.cc src/easylogging++.ccsrc/common/easylogging++.cc renamed to src/easylogging++.cc

@@ -5,7 +5,7 @@
 #include <random>
 #include <algorithm>
 #include <regex>
-#include "common/sign_util.h"
+#include "../include/tigerapi/sign_util.h"
 
 using namespace std;
 using namespace web;