fix a bug of build in visual studio.

wlgq2 · Dec 11, 2020 · b936402 · b936402
1 parent dfff205
commit b936402
Show file tree

Hide file tree

Showing 77 changed files with 210 additions and 222 deletions.
diff --git a/examples/all_example/Clinet.h → examples/all_example/Clinet.hpp b/examples/all_example/Clinet.h → examples/all_example/Clinet.hpp
@@ -8,12 +8,12 @@
     Description: https://github.com/wlgq2/uv-cpp
 */
 
-#ifndef CLIENT_H
-#define CLIENT_H
+#ifndef CLIENT_HPP
+#define CLIENT_HPP
 
 
 #include <string>
-#include "uv/include/uv11.h"
+#include "uv/include/uv11.hpp"
 
 
 class Client : public uv::TcpClient

diff --git a/examples/all_example/EchoServer.cpp b/examples/all_example/EchoServer.cpp
@@ -11,8 +11,8 @@
 #include    <cstring>
 #include    <iostream>
 
-#include    "EchoServer.h"
-#include    "uv/include/uv11.h"
+#include    "EchoServer.hpp"
+#include    "uv/include/uv11.hpp"
 
 using namespace uv;
 using namespace std;

diff --git a/examples/all_example/EchoServer.h → examples/all_example/EchoServer.hpp b/examples/all_example/EchoServer.h → examples/all_example/EchoServer.hpp
@@ -8,10 +8,10 @@ Last modified: 2018-4-18
 Description: https://github.com/wlgq2/uv-cpp
 */
 
-#ifndef ECHOSERVER_H
-#define ECHOSERVER_H
+#ifndef ECHOSERVER_HPP
+#define ECHOSERVER_HPP
 
-#include "uv/include/uv11.h"
+#include "uv/include/uv11.hpp"
 
 
 class EchoServer :public uv::TcpServer
@@ -22,4 +22,4 @@ private :
     void newMessage(uv::TcpConnectionPtr connection,const char* buf,ssize_t size);
 };
 
-#endif // ECHOSERVER_H
+#endif
diff --git a/examples/all_example/main.cpp b/examples/all_example/main.cpp
@@ -12,8 +12,8 @@
 #include <iostream>
 
 
-#include "EchoServer.h"
-#include "Clinet.h"
+#include "EchoServer.hpp"
+#include "Clinet.hpp"
 #include <chrono>
 
 using namespace uv;

diff --git a/examples/clients_cross_thread/Client.h → examples/clients_cross_thread/Client.hpp b/examples/clients_cross_thread/Client.h → examples/clients_cross_thread/Client.hpp
@@ -8,8 +8,8 @@
     Description: https://github.com/wlgq2/uv-cpp
 */
 
-#ifndef CLIENT_H
-#define CLIENT_H
+#ifndef CLIENT_HPP
+#define CLIENT_HPP
 
 
 #include <string>

diff --git a/examples/dns/main.cpp b/examples/dns/main.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include <uv/include/uv11.h>
+#include <uv/include/uv11.hpp>
 
 
 void onGetIp(int status, std::string& ip)

diff --git a/examples/echo_client/main.cpp b/examples/echo_client/main.cpp
@@ -9,7 +9,7 @@
 */
 
 #include <iostream>
-#include <uv/include/uv11.h>
+#include <uv/include/uv11.hpp>
 
 void startClients(uv::EventLoop* loop,uv::SocketAddr& addr,std::vector<uv::TcpClientPtr>& clients,uint64_t cnt)
 {

diff --git a/examples/echo_server/main.cpp b/examples/echo_server/main.cpp
@@ -10,7 +10,7 @@
 
 #include <iostream>
 #include <atomic>
-#include <uv/include/uv11.h>
+#include <uv/include/uv11.hpp>
 
 using namespace uv;
 

diff --git a/examples/helloworld/main.cpp b/examples/helloworld/main.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include <uv/include/uv11.h>
+#include <uv/include/uv11.hpp>
 
 
 int main(int argc, char** args)

diff --git a/examples/http_client/main.cpp b/examples/http_client/main.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <fstream>
-#include <uv/include/uv11.h>
+#include <uv/include/uv11.hpp>
 
 void onHttpResp(uv::http::HttpClient* client,int error, uv::http::Response* resp)
 {

diff --git a/examples/http_server/main.cpp b/examples/http_server/main.cpp
@@ -9,7 +9,7 @@
 */
 
 #include <iostream>
-#include <uv/include/uv11.h>
+#include <uv/include/uv11.hpp>
 
 void func1(uv::http::Request& req, uv::http::Response* resp)
 {

diff --git a/examples/loop_exit/main.cpp b/examples/loop_exit/main.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include <uv/include/uv11.h>
+#include <uv/include/uv11.hpp>
 
 void func(uv::EventLoop* loop)
 {

diff --git a/examples/pingpang/Clinet.h → examples/pingpang/Clinet.hpp b/examples/pingpang/Clinet.h → examples/pingpang/Clinet.hpp
@@ -1,9 +1,9 @@
-#ifndef CLIENT_H
-#define CLIENT_H
+#ifndef CLIENT_HPP
+#define CLIENT_HPP
 
 
 #include <string>
-#include "uv/include/uv11.h"
+#include <uv/include/uv11.hpp>
 
 class Client : public uv::TcpClient
 {

diff --git a/examples/pingpang/EchoServer.cpp b/examples/pingpang/EchoServer.cpp
@@ -1,7 +1,7 @@
 #include    <cstring>
 #include    <iostream>
 
-#include    "EchoServer.h"
+#include    "EchoServer.hpp"
 
 
 using namespace uv;

diff --git a/examples/pingpang/EchoServer.h → examples/pingpang/EchoServer.hpp b/examples/pingpang/EchoServer.h → examples/pingpang/EchoServer.hpp
@@ -1,7 +1,7 @@
-#ifndef ECHOSERVER_H
-#define ECHOSERVER_H
+#ifndef ECHOSERVER_HPP
+#define ECHOSERVER_HPP
 
-#include "uv/include/uv11.h"
+#include <uv/include/uv11.hpp>
 #include <atomic>
 
 class EchoServer :public uv::TcpServer
@@ -16,4 +16,4 @@ private :
     void newMessage(uv::TcpConnectionPtr connection,const char* buf,ssize_t size);
 };
 
-#endif // ECHOSERVER_H
+#endif 
diff --git a/examples/pingpang/main.cpp b/examples/pingpang/main.cpp
@@ -1,8 +1,8 @@
 #include <iostream>
 
 
-#include "EchoServer.h"
-#include "Clinet.h"
+#include "EchoServer.hpp"
+#include "Clinet.hpp"
 
 
 using namespace uv;

diff --git a/examples/radix_tree/main.cpp b/examples/radix_tree/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <random>
 #include <map>
-#include <uv/include/http/RadixTree.h>
+#include <uv/include/http/RadixTree.hpp>
 
 
 using namespace uv;
@@ -31,7 +31,7 @@ bool TestRand(RadixTree<Type>& tree,uint64_t cnt)
     //随机顺序取出元素插入radix tree.
     std::map<std::string, Type> kvMap;
     std::default_random_engine random;
-    std::uniform_int_distribution<int> dis(0, cnt);
+    std::uniform_int_distribution<int> dis(0, (int)cnt);
     while (!kvs.empty())
     {
         int index = dis(random) % kvs.size();

diff --git a/examples/rpc/RpcClient.cpp b/examples/rpc/RpcClient.cpp
@@ -7,7 +7,7 @@
 
    Description: https://github.com/wlgq2/uv-cpp
 */
-#include "RpcClient.h"
+#include "RpcClient.hpp"
 
 using namespace uv;
 using namespace std;

diff --git a/examples/rpc/RpcCtrl.cpp b/examples/rpc/RpcCtrl.cpp
@@ -8,9 +8,9 @@
    Description: https://github.com/wlgq2/uv-cpp
 */
 
-#include "RpcCtrl.h"
+#include "RpcCtrl.hpp"
 #include <thread>
-#include "RpcClient.h"
+#include "RpcClient.hpp"
 
 
 using namespace uv;

diff --git a/examples/rpc/RpcServer.cpp b/examples/rpc/RpcServer.cpp
@@ -8,7 +8,7 @@
    Description: https://github.com/wlgq2/uv-cpp
 */
 
-#include "RpcServer.h"
+#include "RpcServer.hpp"
 
 using namespace uv;
 using namespace std;

diff --git a/examples/rpc/RpcServer.h → examples/rpc/RpcServer.hpp b/examples/rpc/RpcServer.h → examples/rpc/RpcServer.hpp
@@ -8,12 +8,12 @@
    Description: https://github.com/wlgq2/uv-cpp
 */
 
-#ifndef RPC_SERVER_H
-#define RPC_SERVER_H
+#ifndef RPC_SERVER_HPP
+#define RPC_SERVER_HPP
 
 
-#include <uv/include/uv11.h>
-#include "protocol.h"
+#include <uv/include/uv11.hpp>
+#include "protocol.hpp"
 
 class RpcServer  : public uv::TcpServer
 {

diff --git a/examples/rpc/main.cpp b/examples/rpc/main.cpp
@@ -12,8 +12,8 @@
 #include <iostream>
 #include <chrono>
 
-#include "RpcServer.h"
-#include "RpcCtrl.h"
+#include "RpcServer.hpp"
+#include "RpcCtrl.hpp"
 
 using namespace std;
 

diff --git a/examples/rpc/protocol.h → examples/rpc/protocol.hpp b/examples/rpc/protocol.h → examples/rpc/protocol.hpp
@@ -9,8 +9,8 @@
 */
 
 
-#ifndef PROTOCOL_H
-#define PROTOCOL_H
+#ifndef PROTOCOL_HPP
+#define PROTOCOL_HPP
 
 #include <vector>
 

diff --git a/examples/rpc/RpcClient.h → examples/rpc/rpcclient.hpp b/examples/rpc/RpcClient.h → examples/rpc/rpcclient.hpp
@@ -9,11 +9,11 @@
 */
 
 
-#ifndef RPC_CLIENT_H
-#define RPC_CLIENT_H
+#ifndef RPC_CLIENT_HPP
+#define RPC_CLIENT_HPP
 
-#include <uv/include/uv11.h>
-#include "protocol.h"
+#include <uv/include/uv11.hpp>
+#include "protocol.hpp"
 
 using OnRespCallback = std::function<void(Resp&)>;
 

diff --git a/examples/rpc/RpcCtrl.h → examples/rpc/rpcctrl.hpp b/examples/rpc/RpcCtrl.h → examples/rpc/rpcctrl.hpp
@@ -9,15 +9,15 @@
 */
 
 
-#ifndef RPC_CTRL_H
-#define RPC_CTRL_H
+#ifndef RPC_CTRL_HPP
+#define RPC_CTRL_HPP
 
 
 #include <string>
 #include <mutex>
 #include <condition_variable>
 
-#include "RpcClient.h"
+#include "RpcClient.hpp"
 
 
 

diff --git a/examples/server_quit/main.cpp b/examples/server_quit/main.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include <uv/include/uv11.h>
+#include <uv/include/uv11.hpp>
 
 using namespace uv;
 using namespace std;

diff --git a/project/vs2017/all_example/all_example.vcxproj b/project/vs2017/all_example/all_example.vcxproj
@@ -102,10 +102,6 @@
     <ClCompile Include="..\..\..\uv\Timer.cpp" />
     <ClCompile Include="..\..\..\uv\Udp.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\examples\all_example\Clinet.h" />
-    <ClInclude Include="..\..\..\examples\all_example\EchoServer.h" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/project/vs2017/all_example/all_example.vcxproj.filters b/project/vs2017/all_example/all_example.vcxproj.filters
@@ -85,12 +85,4 @@
       <Filter>uv</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\examples\all_example\Clinet.h">
-      <Filter>example</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\examples\all_example\EchoServer.h">
-      <Filter>example</Filter>
-    </ClInclude>
-  </ItemGroup>
 </Project>
diff --git a/uv/Async.cpp b/uv/Async.cpp
@@ -7,7 +7,7 @@ Last modified: 2020-10-6
 
 Description: https://github.com/wlgq2/uv-cpp
 */
-#include "include/Async.h"
+#include "include/Async.hpp"
 
 using namespace uv;
 

diff --git a/uv/CycleBuffer.cpp b/uv/CycleBuffer.cpp
@@ -7,8 +7,8 @@ Last modified: 2019-10-24
 
 Description: https://github.com/wlgq2/uv-cpp
 */
-#include "include/CycleBuffer.h"
-#include "include/GlobalConfig.h"
+#include "include/CycleBuffer.hpp"
+#include "include/GlobalConfig.hpp"
 
 using namespace uv;
 

diff --git a/uv/DnsGet.cpp b/uv/DnsGet.cpp
@@ -7,8 +7,8 @@ Last modified: 2020-3-29
 
 Description: https://github.com/wlgq2/uv-cpp
 */
-#include "include/DnsGet.h"
-#include "include/LogWriter.h"
+#include "include/DnsGet.hpp"
+#include "include/LogWriter.hpp"
 
 using namespace uv;
 

diff --git a/uv/EventLoop.cpp b/uv/EventLoop.cpp
@@ -8,9 +8,9 @@
    Description: https://github.com/wlgq2/uv-cpp
 */
 
-#include "include/EventLoop.h"
-#include "include/TcpConnection.h"
-#include "include/Async.h"
+#include "include/EventLoop.hpp"
+#include "include/TcpConnection.hpp"
+#include "include/Async.hpp"
 
 using namespace uv;
 

diff --git a/uv/GlobalConfig.cpp b/uv/GlobalConfig.cpp
@@ -10,8 +10,8 @@
 
 #include <functional>
 
-#include "include/GlobalConfig.h"
-#include "include/Packet.h"
+#include "include/GlobalConfig.hpp"
+#include "include/Packet.hpp"
 
 using namespace uv;
 using namespace std;

diff --git a/uv/Idle.cpp b/uv/Idle.cpp
@@ -8,7 +8,7 @@
    Description: uv-cpp
 */
 
-#include "include/Idle.h"
+#include "include/Idle.hpp"
 
 using namespace uv;