Bläddra i källkod

Fixed warnings

Denis Muratshin 8 år sedan
förälder
incheckning
56f64f84bf

+ 2 - 2
oxygine/src/oxygine/Font.h

@@ -39,7 +39,7 @@ namespace oxygine
     {
         std::size_t operator()(const glyph& k) const
         {
-            return std::hash<int>()(k.ch + k.opt);
+            return std::hash<size_t>()(k.ch + k.opt);
         }
     };
 
@@ -82,4 +82,4 @@ namespace oxygine
         int _size;
         int _baselineDistance;
     };
-}
+}

+ 1 - 1
oxygine/src/oxygine/STDRenderer.cpp

@@ -68,7 +68,7 @@ namespace oxygine
             oxglActiveTexture(GL_TEXTURE0 + sampler);
             glGetIntegerv(GL_TEXTURE_BINDING_2D, &whichID);
 
-            OX_ASSERT(_textures[sampler]->getHandle() == (nativeTextureHandle)whichID);
+            OX_ASSERT(_textures[sampler]->getHandle() == (nativeTextureHandle)(size_t)whichID);
         }
 #endif
 

+ 2 - 2
oxygine/src/oxygine/actor/DebugActor.cpp

@@ -342,7 +342,7 @@ namespace oxygine
         s << "update=" << aligned(getStage()->_statUpdate, 2) << "ms ";
         s << "render=" << aligned(vstats.duration, 2) << "ms ";
         s << "textures=" << aligned(NativeTexture::created, 2) << " ";
-        s << "mats=" << aligned(mc().getTotalMaterials(), 2) << " ";
+        s << "mats=" << aligned((int)mc().getTotalMaterials(), 2) << " ";
 
 #ifdef __APPLE__
         size_t mem;
@@ -511,4 +511,4 @@ namespace oxygine
             actor = actor->getParent();
         }
     }
-}
+}