i/rtabmap_ros
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap_ros.git synced 2026-10-03 16:27:46 +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
guilib/src/CloudViewer.cpp
+2 -2
View File
@@ -57,7 +57,7 @@ void CloudViewer::mouseEventOccurred (const pcl::visualization::MouseEvent &even
CloudViewer::CloudViewer(QWidget *parent) : CloudViewer::CloudViewer(QWidget *parent) :
QVTKWidget(parent), QVTKWidget(parent),
#if defined(WIN32) || defined(__APPLE__) #if defined(_WIN32) || defined(__APPLE__)
_visualizer(new pcl::visualization::PCLVisualizer("PCLVisualizer")), _visualizer(new pcl::visualization::PCLVisualizer("PCLVisualizer")),
#else #else
_visualizer(new pcl::visualization::PCLVisualizer("PCLVisualizer", false)), _visualizer(new pcl::visualization::PCLVisualizer("PCLVisualizer", false)),
@@ -81,7 +81,7 @@ CloudViewer::CloudViewer(QWidget *parent) :
this->SetRenderWindow(_visualizer->getRenderWindow()); this->SetRenderWindow(_visualizer->getRenderWindow());
#if !defined(WIN32) && !defined(__APPLE__) #if !defined(_WIN32) && !defined(__APPLE__)
_visualizer->setupInteractor(this->GetInteractor(), this->GetRenderWindow()); _visualizer->setupInteractor(this->GetInteractor(), this->GetRenderWindow());
#endif #endif
guilib/src/utilite/UPlot.cpp
+1 -1
View File
@@ -1127,7 +1127,7 @@ UPlotAxis::UPlotAxis(Qt::Orientation orientation, float min, float max, QWidget
{ {
_reversed = true; // default bottom->up _reversed = true; // default bottom->up
} }
#ifdef WIN32 #ifdef _WIN32
this->setMinimumSize(15, 25); this->setMinimumSize(15, 25);
#else #else
this->setMinimumSize(15, 25); this->setMinimumSize(15, 25);
utilite/include/rtabmap/utilite/UConversion.h
+1 -1
View File
@@ -236,7 +236,7 @@ std::string UTILITE_EXP uFormatv (const char *fmt, va_list ap);
*/ */
std::string UTILITE_EXP uFormat (const char *fmt, ...); std::string UTILITE_EXP uFormat (const char *fmt, ...);
#ifdef WIN32 #ifdef _WIN32
/** /**
* Convert multi-byte string to unicode (wide-char) string. * Convert multi-byte string to unicode (wide-char) string.
* Note that returned whar_t * must be deleted : delete [] wText; * Note that returned whar_t * must be deleted : delete [] wText;
utilite/include/rtabmap/utilite/UMutex.h
+7 -7
View File
@@ -22,7 +22,7 @@
#include <errno.h> #include <errno.h>
#ifdef WIN32 #ifdef _WIN32
#include "rtabmap/utilite/Win32/UWin32.h" #include "rtabmap/utilite/Win32/UWin32.h"
#else #else
#include <pthread.h> #include <pthread.h>
@@ -61,7 +61,7 @@ public:
*/ */
UMutex() UMutex()
{ {
#ifdef WIN32 #ifdef _WIN32
InitializeCriticalSection(&C); InitializeCriticalSection(&C);
#else #else
pthread_mutexattr_t attr; pthread_mutexattr_t attr;
@@ -74,7 +74,7 @@ public:
virtual ~UMutex() virtual ~UMutex()
{ {
#ifdef WIN32 #ifdef _WIN32
DeleteCriticalSection(&C); DeleteCriticalSection(&C);
#else #else
pthread_mutex_unlock(&M); pthread_mutex_destroy(&M); pthread_mutex_unlock(&M); pthread_mutex_destroy(&M);
@@ -86,14 +86,14 @@ public:
*/ */
int lock() const int lock() const
{ {
#ifdef WIN32 #ifdef _WIN32
EnterCriticalSection(&C); return 0; EnterCriticalSection(&C); return 0;
#else #else
return pthread_mutex_lock(&M); return pthread_mutex_lock(&M);
#endif #endif
} }
#ifdef WIN32 #ifdef _WIN32
#if(_WIN32_WINNT >= 0x0400) #if(_WIN32_WINNT >= 0x0400)
int lockTry() const int lockTry() const
{ {
@@ -112,7 +112,7 @@ public:
*/ */
int unlock() const int unlock() const
{ {
#ifdef WIN32 #ifdef _WIN32
LeaveCriticalSection(&C); return 0; LeaveCriticalSection(&C); return 0;
#else #else
return pthread_mutex_unlock(&M); return pthread_mutex_unlock(&M);
@@ -120,7 +120,7 @@ public:
} }
private: private:
#ifdef WIN32 #ifdef _WIN32
mutable CRITICAL_SECTION C; mutable CRITICAL_SECTION C;
#else #else
mutable pthread_mutex_t M; mutable pthread_mutex_t M;
utilite/include/rtabmap/utilite/USemaphore.h
+9 -9
View File
@@ -27,7 +27,7 @@
#include <errno.h> #include <errno.h>
#ifdef WIN32 #ifdef _WIN32
#include "rtabmap/utilite/Win32/UWin32.h" #include "rtabmap/utilite/Win32/UWin32.h"
#define SEM_VALUE_MAX ((int) ((~0u) >> 1)) #define SEM_VALUE_MAX ((int) ((~0u) >> 1))
#else #else
@@ -59,7 +59,7 @@ public:
*/ */
USemaphore( int initValue = 0 ) USemaphore( int initValue = 0 )
{ {
#ifdef WIN32 #ifdef _WIN32
S = CreateSemaphore(0,initValue,SEM_VALUE_MAX,0); S = CreateSemaphore(0,initValue,SEM_VALUE_MAX,0);
#else #else
_available = initValue; _available = initValue;
@@ -70,7 +70,7 @@ public:
virtual ~USemaphore() virtual ~USemaphore()
{ {
#ifdef WIN32 #ifdef _WIN32
CloseHandle(S); CloseHandle(S);
#else #else
pthread_cond_destroy(&_cond); pthread_cond_destroy(&_cond);
@@ -84,7 +84,7 @@ public:
* @see release() * @see release()
* @param n number to acquire * @param n number to acquire
*/ */
#ifdef WIN32 #ifdef _WIN32
void acquire(int n = 1) const void acquire(int n = 1) const
{ {
while(n-- > 0) while(n-- > 0)
@@ -112,7 +112,7 @@ public:
* Try to acquire the semaphore, not a blocking call. * Try to acquire the semaphore, not a blocking call.
* @return false if the semaphore can't be taken without waiting (value <= 0), true otherwise * @return false if the semaphore can't be taken without waiting (value <= 0), true otherwise
*/ */
#ifdef WIN32 #ifdef _WIN32
int acquireTry() const int acquireTry() const
{ {
return ((WaitForSingleObject((HANDLE)S,INFINITE)==WAIT_OBJECT_0)?0:EAGAIN); return ((WaitForSingleObject((HANDLE)S,INFINITE)==WAIT_OBJECT_0)?0:EAGAIN);
@@ -135,7 +135,7 @@ public:
* Release the semaphore, increasing its value by 1 and * Release the semaphore, increasing its value by 1 and
* signaling waiting threads (which called acquire()). * signaling waiting threads (which called acquire()).
*/ */
#ifdef WIN32 #ifdef _WIN32
int release(int n = 1) const int release(int n = 1) const
{ {
return (ReleaseSemaphore((HANDLE)S,n,0)?0:ERANGE); return (ReleaseSemaphore((HANDLE)S,n,0)?0:ERANGE);
@@ -153,7 +153,7 @@ public:
* Get the USempahore's value. * Get the USempahore's value.
* @return the semaphore's value * @return the semaphore's value
*/ */
#ifdef WIN32 #ifdef _WIN32
int value() const int value() const
{ {
LONG V = -1; ReleaseSemaphore((HANDLE)S,0,&V); return V; LONG V = -1; ReleaseSemaphore((HANDLE)S,0,&V); return V;
@@ -168,7 +168,7 @@ public:
#endif #endif
} }
#ifdef WIN32 #ifdef _WIN32
/* /*
* Reset the semaphore count. * Reset the semaphore count.
* @param init the initial value * @param init the initial value
@@ -182,7 +182,7 @@ public:
#endif #endif
private: private:
#ifdef WIN32 #ifdef _WIN32
HANDLE S; HANDLE S;
#else #else
pthread_mutex_t _waitMutex; pthread_mutex_t _waitMutex;
utilite/include/rtabmap/utilite/UThread.h
+1 -1
View File
@@ -255,7 +255,7 @@ private:
State state_; /* The thread state. */ State state_; /* The thread state. */
Priority priority_; /* The thread priority. */ Priority priority_; /* The thread priority. */
Handle handle_; /* The thread handle. */ Handle handle_; /* The thread handle. */
#ifdef WIN32 #ifdef _WIN32
int threadId_; /* The thread id. */ int threadId_; /* The thread id. */
#else #else
unsigned long threadId_; /* The thread id. */ unsigned long threadId_; /* The thread id. */
utilite/include/rtabmap/utilite/UThreadC.h
+1 -1
View File
@@ -27,7 +27,7 @@
* base form is not supported. * base form is not supported.
* @see StateThread * @see StateThread
*/ */
#ifdef WIN32 #ifdef _WIN32
#include "rtabmap/utilite/Win32/UThreadC.h" #include "rtabmap/utilite/Win32/UThreadC.h"
#else #else
#include "rtabmap/utilite/Posix/UThreadC.h" #include "rtabmap/utilite/Posix/UThreadC.h"
utilite/include/rtabmap/utilite/UTimer.h
+2 -2
View File
@@ -22,7 +22,7 @@
#include "rtabmap/utilite/UtiLiteExp.h" // DLL export/import defines #include "rtabmap/utilite/UtiLiteExp.h" // DLL export/import defines
#ifdef WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#else #else
#include <sys/time.h> #include <sys/time.h>
@@ -95,7 +95,7 @@ public:
double ticks(); double ticks();
private: private:
#ifdef WIN32 #ifdef _WIN32
LARGE_INTEGER startTimeRecorded_; /* When we start the timer, timeRecorded is copied over lastTimeRecorded.*/ LARGE_INTEGER startTimeRecorded_; /* When we start the timer, timeRecorded is copied over lastTimeRecorded.*/
LARGE_INTEGER stopTimeRecorded_; /* When we stop the timer. */ LARGE_INTEGER stopTimeRecorded_; /* When we stop the timer. */
utilite/src/UConversion.cpp
+3 -3
View File
@@ -23,7 +23,7 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#ifdef WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#endif #endif
@@ -262,7 +262,7 @@ std::string uFormatv (const char *fmt, va_list args)
va_list argsTmp; va_list argsTmp;
while (1) { while (1) {
#if defined(WIN32) && !defined(__MINGW32__) #if defined(_WIN32) && !defined(__MINGW32__)
argsTmp = args; argsTmp = args;
#else #else
va_copy(argsTmp, args); va_copy(argsTmp, args);
@@ -299,7 +299,7 @@ std::string uFormat (const char *fmt, ...)
return buf; return buf;
} }
#ifdef WIN32 #ifdef _WIN32
// returned whar_t * must be deleted : delete [] wText; // returned whar_t * must be deleted : delete [] wText;
wchar_t * createWCharFromChar(const char * text) wchar_t * createWCharFromChar(const char * text)
{ {
utilite/src/UDirectory.cpp
+5 -5
View File
@@ -19,7 +19,7 @@
#include "rtabmap/utilite/UDirectory.h" #include "rtabmap/utilite/UDirectory.h"
#ifdef WIN32 #ifdef _WIN32
#include <Windows.h> #include <Windows.h>
#include <direct.h> #include <direct.h>
#include <algorithm> #include <algorithm>
@@ -42,7 +42,7 @@
#include "rtabmap/utilite/ULogger.h" #include "rtabmap/utilite/ULogger.h"
#ifdef WIN32 #ifdef _WIN32
bool sortCallback(const std::string & a, const std::string & b) bool sortCallback(const std::string & a, const std::string & b)
{ {
@@ -118,7 +118,7 @@ void UDirectory::update()
endOfDir = true; endOfDir = true;
} }
fileNames_.clear(); fileNames_.clear();
#ifdef WIN32 #ifdef _WIN32
WIN32_FIND_DATA fileInformation; WIN32_FIND_DATA fileInformation;
#ifdef UNICODE #ifdef UNICODE
wchar_t * pathAll = createWCharFromChar((path_+"\\*").c_str()); wchar_t * pathAll = createWCharFromChar((path_+"\\*").c_str());
@@ -300,7 +300,7 @@ std::string UDirectory::currentDir(bool trailingSeparator)
std::string dir; std::string dir;
char * buffer; char * buffer;
#ifdef WIN32 #ifdef _WIN32
buffer = _getcwd(NULL, 0); buffer = _getcwd(NULL, 0);
#else #else
buffer = getcwd(NULL, MAXPATHLEN); buffer = getcwd(NULL, MAXPATHLEN);
@@ -364,7 +364,7 @@ std::string UDirectory::homeDir()
std::string UDirectory::separator() std::string UDirectory::separator()
{ {
#ifdef WIN32 #ifdef _WIN32
return "\\"; return "\\";
#else #else
return "/"; return "/";
utilite/src/ULogger.cpp
+6 -6
View File
@@ -26,11 +26,11 @@
#include <string> #include <string>
#include <string.h> #include <string.h>
#ifndef WIN32 #ifndef _WIN32
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#ifdef WIN32 #ifdef _WIN32
#include <Windows.h> #include <Windows.h>
#define COLOR_NORMAL FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED #define COLOR_NORMAL FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED
#define COLOR_RED FOREGROUND_RED | FOREGROUND_INTENSITY #define COLOR_RED FOREGROUND_RED | FOREGROUND_INTENSITY
@@ -331,7 +331,7 @@ void ULogger::write(ULogger::Level level,
if(level >= level_) if(level >= level_)
{ {
#ifdef WIN32 #ifdef _WIN32
int color = 0; int color = 0;
#else #else
const char* color = NULL; const char* color = NULL;
@@ -427,12 +427,12 @@ void ULogger::write(ULogger::Level level,
if(type_ != kTypeNoLog) if(type_ != kTypeNoLog)
{ {
va_start(args, msg); va_start(args, msg);
#ifdef WIN32 #ifdef _WIN32
HANDLE H = GetStdHandle(STD_OUTPUT_HANDLE); HANDLE H = GetStdHandle(STD_OUTPUT_HANDLE);
#endif #endif
if(type_ == ULogger::kTypeConsole && printColored_) if(type_ == ULogger::kTypeConsole && printColored_)
{ {
#ifdef WIN32 #ifdef _WIN32
SetConsoleTextAttribute(H,color); SetConsoleTextAttribute(H,color);
#else #else
if(buffered_) if(buffered_)
@@ -462,7 +462,7 @@ void ULogger::write(ULogger::Level level,
} }
if(type_ == ULogger::kTypeConsole && printColored_) if(type_ == ULogger::kTypeConsole && printColored_)
{ {
#ifdef WIN32 #ifdef _WIN32
SetConsoleTextAttribute(H,COLOR_NORMAL); SetConsoleTextAttribute(H,COLOR_NORMAL);
#else #else
if(buffered_) if(buffered_)
utilite/src/UProcessInfo.cpp
+2 -2
View File
@@ -19,7 +19,7 @@
#include "rtabmap/utilite/UProcessInfo.h" #include "rtabmap/utilite/UProcessInfo.h"
#ifdef WIN32 #ifdef _WIN32
#include "Windows.h" #include "Windows.h"
#include "Psapi.h" #include "Psapi.h"
#elif __APPLE__ #elif __APPLE__
@@ -39,7 +39,7 @@ long int UProcessInfo::getMemoryUsage()
{ {
long int memoryUsage = -1; long int memoryUsage = -1;
#ifdef WIN32 #ifdef _WIN32
HANDLE hProc = GetCurrentProcess(); HANDLE hProc = GetCurrentProcess();
PROCESS_MEMORY_COUNTERS info; PROCESS_MEMORY_COUNTERS info;
BOOL okay = GetProcessMemoryInfo(hProc, &info, sizeof(info)); BOOL okay = GetProcessMemoryInfo(hProc, &info, sizeof(info));
utilite/src/UThread.cpp
+2 -2
View File
@@ -163,7 +163,7 @@ void UThread::applyPriority()
{ {
if(handle_) if(handle_)
{ {
#ifdef WIN32 #ifdef _WIN32
int p = THREAD_PRIORITY_NORMAL; int p = THREAD_PRIORITY_NORMAL;
switch(priority_) switch(priority_)
{ {
@@ -209,7 +209,7 @@ void UThread::applyAffinity()
{ {
if(cpuAffinity_>0) if(cpuAffinity_>0)
{ {
#ifdef WIN32 #ifdef _WIN32
#elif __APPLE__ #elif __APPLE__
thread_affinity_policy_data_t affPolicy; thread_affinity_policy_data_t affPolicy;
affPolicy.affinity_tag = cpuAffinity_; affPolicy.affinity_tag = cpuAffinity_;
utilite/src/UTimer.cpp
+2 -2
View File
@@ -25,7 +25,7 @@
/////////////////////// ///////////////////////
UTimer::UTimer() UTimer::UTimer()
{ {
#ifdef WIN32 #ifdef _WIN32
QueryPerformanceFrequency(&frequency_); QueryPerformanceFrequency(&frequency_);
#endif #endif
start(); // This will initialize the private counters start(); // This will initialize the private counters
@@ -33,7 +33,7 @@ UTimer::UTimer()
UTimer::~UTimer() {} UTimer::~UTimer() {}
#ifdef WIN32 #ifdef _WIN32
double UTimer::now() double UTimer::now()
{ {
LARGE_INTEGER count, freq; LARGE_INTEGER count, freq;