Browse Source

fixed vs2010

dmuratshin 8 years ago
parent
commit
05016f668c
2 changed files with 3 additions and 1 deletions
  1. 1 1
      examples/Demo/src/TestCamera.h
  2. 2 0
      oxygine/src/core/curl/HttpRequestCurlTask.cpp

+ 1 - 1
examples/Demo/src/TestCamera.h

@@ -80,7 +80,7 @@ public:
             else
             else
             {
             {
                 touch* p1, *p2;
                 touch* p1, *p2;
-				for (std::map<int, touch>::iterator i = _touches.begin(); i != _touches.end(); ++i)
+                for (std::map<int, touch>::iterator i = _touches.begin(); i != _touches.end(); ++i)
                 {
                 {
                     if (i->first == te->index)
                     if (i->first == te->index)
                         p1 = &i->second;
                         p1 = &i->second;

+ 2 - 0
oxygine/src/core/curl/HttpRequestCurlTask.cpp

@@ -131,8 +131,10 @@ namespace oxygine
                     {
                     {
                         if (msg->msg == CURLMSG_DONE)
                         if (msg->msg == CURLMSG_DONE)
                         {
                         {
+#ifdef OX_HAS_CPP11 //msg broken in VS2010
                             curl_multi_remove_handle(multi_handle, msg->easy_handle);
                             curl_multi_remove_handle(multi_handle, msg->easy_handle);
                             core::getMainThreadDispatcher().postCallback(ID_DONE, msg->easy_handle, (void*)msg->data.result, mainThreadFunc, 0);
                             core::getMainThreadDispatcher().postCallback(ID_DONE, msg->easy_handle, (void*)msg->data.result, mainThreadFunc, 0);
+#endif
                         }
                         }
                     }
                     }
                 }
                 }