i/rtabmap_ros
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap_ros.git synced 2026-10-11 03:59:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed WIN32 to _WIN32 to handle some 64bits systems where WIN32 is not defined (_WIN32 should be defined both for 32bits and 64bits systems: http://msdn.microsoft.com/en-us/library/b0084kay.aspx).

Browse Source 
git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1830 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2014-10-03 01:40:17 +00:00
parent 61603cdf0f
commit d30c2baf51
14 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utilite/include/rtabmap/utilite/UMutex.h
+7 -7
View File
@@ -22,7 +22,7 @@
#include <errno.h>
#ifdef WIN32
#ifdef _WIN32
#include "rtabmap/utilite/Win32/UWin32.h"
#else
#include <pthread.h>
@@ -61,7 +61,7 @@ public:
*/
UMutex()
{
#ifdef WIN32
#ifdef _WIN32
InitializeCriticalSection(&C);
#else
pthread_mutexattr_t attr;
@@ -74,7 +74,7 @@ public:
virtual ~UMutex()
{
#ifdef WIN32
#ifdef _WIN32
DeleteCriticalSection(&C);
#else
pthread_mutex_unlock(&M); pthread_mutex_destroy(&M);
@@ -86,14 +86,14 @@ public:
*/
int lock() const
{
#ifdef WIN32
#ifdef _WIN32
EnterCriticalSection(&C); return 0;
#else
return pthread_mutex_lock(&M);
#endif
}
#ifdef WIN32
#ifdef _WIN32
#if(_WIN32_WINNT >= 0x0400)
int lockTry() const
{
@@ -112,7 +112,7 @@ public:
*/
int unlock() const
{
#ifdef WIN32
#ifdef _WIN32
LeaveCriticalSection(&C); return 0;
#else
return pthread_mutex_unlock(&M);
@@ -120,7 +120,7 @@ public:
}
private:
#ifdef WIN32
#ifdef _WIN32
mutable CRITICAL_SECTION C;
#else
mutable pthread_mutex_t M;