]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix for using std streams when std:: conflicts with ::
authorWłodzimierz Skiba <abx@abx.art.pl>
Tue, 12 Apr 2005 21:08:04 +0000 (21:08 +0000)
committerWłodzimierz Skiba <abx@abx.art.pl>
Tue, 12 Apr 2005 21:08:04 +0000 (21:08 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/stopwatch.cpp

index 236dc5aa67b766cc46426e54cf4a06c23d4194d3..7575e5ba957bf76b92d03684111fc223fe48d517 100644 (file)
@@ -286,7 +286,7 @@ wxLongLong wxGetLocalTimeMillis()
 
     // ftime() is void and not int in some mingw32 headers, so don't
     // test the return code (well, it shouldn't fail anyhow...)
-    (void)ftime(&tp);
+    (void)::ftime(&tp);
     val *= tp.time;
     return (val + tp.millitm);
 #elif defined(__WXMAC__)