From: Włodzimierz Skiba Date: Tue, 12 Apr 2005 21:08:04 +0000 (+0000) Subject: Fix for using std streams when std:: conflicts with :: X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/29468083f4aa7e7006809ebcc2b7cda0773f76fa Fix for using std streams when std:: conflicts with :: git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp index 236dc5aa67..7575e5ba95 100644 --- a/src/common/stopwatch.cpp +++ b/src/common/stopwatch.cpp @@ -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__)