From: Vadim Zeitlin Date: Fri, 22 Jun 2001 01:28:42 +0000 (+0000) Subject: compilation fixes X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2d3112adc94f2ecdbcfcacf32576f47345e762ae?ds=inline compilation fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/console/console.cpp b/samples/console/console.cpp index 13e7d73dea..fe75234c25 100644 --- a/samples/console/console.cpp +++ b/samples/console/console.cpp @@ -323,8 +323,8 @@ static void TestDirTraverse() printf("There are %u files under '%s'\n", n, TESTDIR); if ( n > 1 ) { - printf("First one is '%s'\n", files[0u]); - printf(" last one is '%s'\n", files[n - 1]); + printf("First one is '%s'\n", files[0u].c_str()); + printf(" last one is '%s'\n", files[n - 1].c_str()); } // enum again with custom traverser @@ -422,7 +422,7 @@ static void TestEnvironment() printf("After 2nd wxSetEnv: getenv(%s) = %s\n", var, MyGetEnv(var).c_str()); wxUnsetEnv(var); printf("After wxUnsetEnv: getenv(%s) = %s\n", var, MyGetEnv(var).c_str()); - printf("PATH = %s\n", MyGetEnv(_T("PATH"))); + printf("PATH = %s\n", MyGetEnv(_T("PATH")).c_str()); } #endif // TEST_ENVIRON @@ -1625,6 +1625,7 @@ static void TestBitOperations() static void TestLongLongComparison() { +#if wxUSE_LONGLONG_WX puts("*** Testing wxLongLong comparison ***\n"); static const long testLongs[] = @@ -1670,6 +1671,7 @@ static void TestLongLongComparison() res == (ls[m] == testLongs[n]) ? "ok" : "ERROR"); } } +#endif // wxUSE_LONGLONG_WX } #undef MAKE_LL