diff --git a/examples/common/entry/entry_android.cpp b/examples/common/entry/entry_android.cpp index 78ed2f7a5..da209cb91 100644 --- a/examples/common/entry/entry_android.cpp +++ b/examples/common/entry/entry_android.cpp @@ -86,7 +86,7 @@ namespace entry struct MainThreadEntry { int m_argc; - char** m_argv; + const char* const* m_argv; static int32_t threadFunc(void* _userData); }; @@ -119,9 +119,9 @@ namespace entry , 0 ); - const char* argv[1] = { "android.so" }; + const char* const argv[1] = { "android.so" }; m_mte.m_argc = 1; - m_mte.m_argv = const_cast(argv); + m_mte.m_argv = argv; while (0 == m_app->destroyRequested) { diff --git a/examples/common/entry/entry_asmjs.cpp b/examples/common/entry/entry_asmjs.cpp index 9cabff5e8..87857612e 100644 --- a/examples/common/entry/entry_asmjs.cpp +++ b/examples/common/entry/entry_asmjs.cpp @@ -86,7 +86,7 @@ namespace entry } } - int32_t run(int _argc, char** _argv) + int32_t run(int _argc, const char* const* _argv) { emscripten_set_mousedown_callback("#canvas", this, true, mouseCb); emscripten_set_mouseup_callback("#canvas", this, true, mouseCb); @@ -397,7 +397,7 @@ namespace entry } } -int main(int _argc, char** _argv) +int main(int _argc, const char* const* _argv) { using namespace entry; return s_ctx.run(_argc, _argv); diff --git a/examples/common/entry/entry_ios.mm b/examples/common/entry/entry_ios.mm index 59dff1065..c37e420fd 100644 --- a/examples/common/entry/entry_ios.mm +++ b/examples/common/entry/entry_ios.mm @@ -27,7 +27,7 @@ namespace entry struct MainThreadEntry { int m_argc; - char** m_argv; + const char* const* m_argv; static int32_t threadFunc(void* _userData); }; @@ -38,9 +38,9 @@ namespace entry { Context(uint32_t _width, uint32_t _height) { - static const char* argv[1] = { "ios" }; + const char* const argv[1] = { "ios" }; m_mte.m_argc = 1; - m_mte.m_argv = const_cast(argv); + m_mte.m_argv = argv; m_eventQueue.postSizeEvent(s_defaultWindow, _width, _height); @@ -261,7 +261,7 @@ static void* m_device = NULL; CGPoint touchLocation = [touch locationInView:self]; touchLocation.x *= self.contentScaleFactor; touchLocation.y *= self.contentScaleFactor; - + s_ctx->m_eventQueue.postMouseEvent(s_defaultWindow, touchLocation.x, touchLocation.y, 0, MouseButton::Left, false); } @@ -283,7 +283,7 @@ static void* m_device = NULL; CGPoint touchLocation = [touch locationInView:self]; touchLocation.x *= self.contentScaleFactor; touchLocation.y *= self.contentScaleFactor; - + s_ctx->m_eventQueue.postMouseEvent(s_defaultWindow, touchLocation.x, touchLocation.y, 0, MouseButton::Left, false); } @@ -371,7 +371,7 @@ static void* m_device = NULL; @end -int main(int _argc, char* _argv[]) +int main(int _argc, const char* const* _argv) { NSAutoreleasePool* pool = [ [NSAutoreleasePool alloc] init]; int exitCode = UIApplicationMain(_argc, _argv, @"UIApplication", NSStringFromClass([AppDelegate class]) ); diff --git a/examples/common/entry/entry_noop.cpp b/examples/common/entry/entry_noop.cpp index 1e85e2df2..20eae9535 100644 --- a/examples/common/entry/entry_noop.cpp +++ b/examples/common/entry/entry_noop.cpp @@ -71,7 +71,7 @@ namespace entry } // namespace entry -int main(int _argc, char** _argv) +int main(int _argc, const char* const* _argv) { entry::main(_argc, _argv); } diff --git a/examples/common/entry/entry_osx.mm b/examples/common/entry/entry_osx.mm index 73a3ff478..065a86905 100644 --- a/examples/common/entry/entry_osx.mm +++ b/examples/common/entry/entry_osx.mm @@ -64,7 +64,7 @@ namespace entry struct MainThreadEntry { int m_argc; - char** m_argv; + const char* const* m_argv; static int32_t threadFunc(void* _userData) { @@ -409,7 +409,7 @@ namespace entry m_eventQueue.postSuspendEvent(s_defaultWindow, Suspend::DidSuspend); } - int32_t run(int _argc, char** _argv) + int32_t run(int _argc, const char* const* _argv) { [NSApplication sharedApplication]; @@ -767,7 +767,7 @@ namespace entry @end -int main(int _argc, char** _argv) +int main(int _argc, const char* const* _argv) { using namespace entry; return s_ctx.run(_argc, _argv); diff --git a/examples/common/entry/entry_windows.cpp b/examples/common/entry/entry_windows.cpp index 6f595e57f..e61132381 100644 --- a/examples/common/entry/entry_windows.cpp +++ b/examples/common/entry/entry_windows.cpp @@ -311,7 +311,7 @@ namespace entry struct MainThreadEntry { int m_argc; - char** m_argv; + const char* const* m_argv; static int32_t threadFunc(void* _userData); }; @@ -445,7 +445,7 @@ namespace entry s_translateKey[uint8_t('Z')] = Key::KeyZ; } - int32_t run(int _argc, char** _argv) + int32_t run(int _argc, const char* const* _argv) { SetDllDirectoryA("."); @@ -1095,7 +1095,7 @@ namespace entry } // namespace entry -int main(int _argc, char** _argv) +int main(int _argc, const char* const* _argv) { using namespace entry; return s_ctx.run(_argc, _argv); diff --git a/examples/common/entry/entry_winrt.cx b/examples/common/entry/entry_winrt.cx index 39e3d1d24..c59aab100 100644 --- a/examples/common/entry/entry_winrt.cx +++ b/examples/common/entry/entry_winrt.cx @@ -24,7 +24,7 @@ using namespace Windows::Graphics::Display; #endif // BX_PLATFORM_WINRT using namespace Platform; -static char* g_emptyArgs[] = { "" }; +static const char* const g_emptyArgs[] = { "" }; static entry::WindowHandle g_defaultWindow = { 0 }; static entry::EventQueue g_eventQueue;