2
0
Эх сурвалжийг харах

Merge branch 'dev' of github.com:oxygine/oxygine-framework into dev

dmuratshin 9 жил өмнө
parent
commit
59e413e46b

+ 2 - 1
oxygine/src/core/Object.h

@@ -107,8 +107,9 @@ namespace oxygine
         dest cast = dynamic_cast<dest>(ptr);
         OX_ASSERT(cast && "can't cast pointer");
         return cast;
-#endif
+#else
         return static_cast<dest>(ptr);
+#endif
     }
 
     template<class T, class U>