Преглед изворни кода

Merge pull request #57 from zmeyc/pr_osx_warnings

Fix warnings on OS X
Denis Muratshin пре 9 година
родитељ
комит
6626e2ed94

+ 1 - 1
examples/Demo/src/Counter.cpp

@@ -22,7 +22,7 @@ public:
     void setActor(int n, spActor a)
     {
         _sprites[n] = a;
-        a->setUserData((void*)n);
+        a->setUserData((void*)(intptr_t)n);
     }
 
     int getCurrent() const

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

@@ -78,7 +78,7 @@ public:
 
     void onError(Event* event)
     {
-        HttpRequestTask* task = safeCast<HttpRequestTask*>(event->currentTarget.get());
+        //HttpRequestTask* task = safeCast<HttpRequestTask*>(event->currentTarget.get());
         //OX_ASSERT(task->_ref_counter == 2);
     }
 

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

@@ -86,7 +86,7 @@ public:
     void slideBegin(Event* event)
     {
         notify("slideBegin");
-        SlidingActor::SlidingEvent* sd = safeCast<SlidingActor::SlidingEvent*>(event);
+        //SlidingActor::SlidingEvent* sd = safeCast<SlidingActor::SlidingEvent*>(event);
     }
 
     void snap()

+ 2 - 2
examples/Demo/src/TestUserShader2.h

@@ -82,9 +82,9 @@ public:
         driver->setTexture(0, _base);
 
         if (indices <= STDRenderer::indices8.size())
-            driver->draw(IVideoDriver::PT_TRIANGLES, _vdecl, &_vertices.front(), count, &STDRenderer::indices8.front(), indices, false);
+            driver->draw(IVideoDriver::PT_TRIANGLES, _vdecl, &_vertices.front(), (unsigned int)count, &STDRenderer::indices8.front(), (unsigned int)indices, false);
         else
-            driver->draw(IVideoDriver::PT_TRIANGLES, _vdecl, &_vertices.front(), count, &STDRenderer::indices16.front(), indices, true);
+            driver->draw(IVideoDriver::PT_TRIANGLES, _vdecl, &_vertices.front(), (unsigned int)count, &STDRenderer::indices16.front(), (unsigned int)indices, true);
 
         _vertices.clear();
     }

+ 3 - 2
oxygine/src/core/ThreadDispatcher.cpp

@@ -5,16 +5,17 @@
 
 namespace oxygine
 {
+#if 0
     static size_t threadID()
     {
         pthread_t pt = pthread_self();
         return ((size_t*)(&pt))[0];
     }
-
-#if 0
 #define  LOGDN(format, ...)  log::messageln("ThreadMessages(%lu)::" format, threadID(), __VA_ARGS__)
+
 #else
 #define  LOGDN(...)  ((void)0)
+
 #endif