Bladeren bron

todo updates

Andrey Filipenkov 4 jaren geleden
bovenliggende
commit
dde9a5d5d2
3 gewijzigde bestanden met toevoegingen van 6 en 9 verwijderingen
  1. 3 5
      client/CServerHandler.cpp
  2. 2 1
      lib/serializer/Connection.cpp
  3. 1 3
      server/CVCMIServer.cpp

+ 3 - 5
client/CServerHandler.cpp

@@ -23,9 +23,7 @@
 
 
 #ifdef VCMI_ANDROID
 #ifdef VCMI_ANDROID
 #include "../lib/CAndroidVMHelper.h"
 #include "../lib/CAndroidVMHelper.h"
-#elif defined(VCMI_IOS)
-//TODO
-#else
+#elif !defined(VCMI_IOS)
 #include "../lib/Interprocess.h"
 #include "../lib/Interprocess.h"
 #endif
 #endif
 #include "../lib/CConfigHandler.h"
 #include "../lib/CConfigHandler.h"
@@ -184,7 +182,7 @@ void CServerHandler::startLocalServerAndConnect()
 		envHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "startServer", true);
 		envHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "startServer", true);
 	}
 	}
 #elif defined(VCMI_IOS)
 #elif defined(VCMI_IOS)
-	// TODO
+	// todo ios
 #else
 #else
 	threadRunLocalServer = std::make_shared<boost::thread>(&CServerHandler::threadRunServer, this); //runs server executable;
 	threadRunLocalServer = std::make_shared<boost::thread>(&CServerHandler::threadRunServer, this); //runs server executable;
 #endif
 #endif
@@ -202,7 +200,7 @@ void CServerHandler::startLocalServerAndConnect()
 	logNetwork->info("waiting for server finished...");
 	logNetwork->info("waiting for server finished...");
 	androidTestServerReadyFlag = false;
 	androidTestServerReadyFlag = false;
 #elif defined(VCMI_IOS)
 #elif defined(VCMI_IOS)
-	//TODO
+    // todo ios
 #else
 #else
 	if(shm)
 	if(shm)
 		shm->sr->waitTillReady();
 		shm->sr->waitTillReady();

+ 2 - 1
lib/serializer/Connection.cpp

@@ -71,7 +71,8 @@ CConnection::CConnection(std::string host, ui16 port, std::string Name, std::str
 	boost::system::error_code error = asio::error::host_not_found;
 	boost::system::error_code error = asio::error::host_not_found;
 	socket = std::make_shared<tcp::socket>(*io_service);
 	socket = std::make_shared<tcp::socket>(*io_service);
 	tcp::resolver resolver(*io_service);
 	tcp::resolver resolver(*io_service);
-	tcp::resolver::iterator end, pom, endpoint_iterator = resolver.resolve(tcp::resolver::query(host, std::to_string(port)),error);
+    // todo ios: is new param really needed?
+	tcp::resolver::iterator end, pom, endpoint_iterator = resolver.resolve(tcp::resolver::query(host, std::to_string(port), resolver_query_base::numeric_service), error);
 	if(error)
 	if(error)
 	{
 	{
 		logNetwork->error("Problem with resolving: \n%s", error.message());
 		logNetwork->error("Problem with resolving: \n%s", error.message());

+ 1 - 3
server/CVCMIServer.cpp

@@ -29,9 +29,7 @@
 #include "../lib/rmg/CMapGenOptions.h"
 #include "../lib/rmg/CMapGenOptions.h"
 #ifdef VCMI_ANDROID
 #ifdef VCMI_ANDROID
 #include "lib/CAndroidVMHelper.h"
 #include "lib/CAndroidVMHelper.h"
-#elif defined(VCMI_IOS)
-// todo ios
-#else
+#elif !defined(VCMI_IOS)
 #include "../lib/Interprocess.h"
 #include "../lib/Interprocess.h"
 #endif
 #endif
 #include "../lib/VCMI_Lib.h"
 #include "../lib/VCMI_Lib.h"