fix compiler error

JMHOO · Nov 20, 2016 · feb5d9c · feb5d9c
1 parent f4b03f5
commit feb5d9c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/CPPWorkspace.xcworkspace/xcuserdata/Jimmy.xcuserdatad/UserInterfaceState.xcuserstate b/CPPWorkspace.xcworkspace/xcuserdata/Jimmy.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ServerCPP/src/jsonkvPackage.cpp b/ServerCPP/src/jsonkvPackage.cpp
@@ -24,11 +24,11 @@ jsonkvPacket::jsonkvPacket(const char* pData, unsigned int nDataLen, int clientS
     catch(...)
     { }
 }
-jsonkvPacket(std::string pData)
+jsonkvPacket::jsonkvPacket(std::string pData)
 {
 	try
     {
-        m_json_request = json::parse(pData);
+        m_json_request = json::parse(pData.c_str());
     }
     catch(std::invalid_argument arg)
     {
@@ -170,4 +170,4 @@ bool jsonkvPacket::GetResult(char*& pStreamData, unsigned long& ulDataLen)
     memcpy(pStreamData, strResult.c_str(), ulDataLen);
 
     return true;
-}
+}
diff --git a/ServerCPP/src/jsonkvPackage.h b/ServerCPP/src/jsonkvPackage.h
@@ -4,9 +4,8 @@
 
 #include "PackageInterface.h"
 #include "json.hpp"
-#include<iostream>
-#include<string>
-using namespace std;
+#include <string>
+
 class jsonkvPacket : public IPacket
 {
 public:
@@ -26,4 +25,4 @@ class jsonkvPacket : public IPacket
     nlohmann::json __process_one_operation__(nlohmann::json jrequest);
 };
 
-#endif
+#endif
diff --git a/ServerCPP/src/paxosProposal.cpp b/ServerCPP/src/paxosProposal.cpp
@@ -51,6 +51,7 @@ namespace Paxos
 
     void Proposal::ProcessMessage(IPacket* p)
     {
+        jsonPaxos* pm = dynamic_cast<jsonPaxos*>(p);
 
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,7 @@ namespace Paxos @@
         void Proposal::ProcessMessage(IPacket* p)
         {
+            jsonPaxos* pm = dynamic_cast<jsonPaxos*>(p);
         }
@@ Expand Down @@