]> git.saurik.com Git - wxWidgets.git/commitdiff
fixed compile errors (code was using unnamed objects, resulting in compiler ambiguity)
authorDimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Tue, 20 Dec 2005 16:52:36 +0000 (16:52 +0000)
committerDimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Tue, 20 Dec 2005 16:52:36 +0000 (16:52 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/datetime.cpp

index 12732e144b010de690fd276371e9cb5917e2c8c9..009149c105ba5ac60c6dd88dbb88e4d4dcf1b83f 100644 (file)
@@ -179,7 +179,7 @@ struct tm *wxLocaltime_r(const time_t* ticks, struct tm* temp)
 #if wxUSE_THREADS && !defined(__WINDOWS__)
   // No need to waste time with a mutex on windows since it's using
   // thread local storage for localtime anyway.
-  wxMutexLocker(timeLock);
+  wxMutexLocker locker(timeLock);
 #endif
   memcpy(temp, localtime(ticks), sizeof(struct tm));
   return temp;
@@ -192,7 +192,7 @@ struct tm *wxGmtime_r(const time_t* ticks, struct tm* temp)
 #if wxUSE_THREADS && !defined(__WINDOWS__)
   // No need to waste time with a mutex on windows since it's
   // using thread local storage for gmtime anyway.
-  wxMutexLocker(timeLock);
+  wxMutexLocker locker(timeLock);
 #endif
   memcpy(temp, gmtime(ticks), sizeof(struct tm));
   return temp;