Revision: 7822
http://playerstage.svn.sourceforge.net/playerstage/?rev=7822&view=rev
Author: gbiggs
Date: 2009-06-08 22:18:09 +0000 (Mon, 08 Jun 2009)
Log Message:
-----------
Make things compile on windows again.
Modified Paths:
--------------
code/player/trunk/libplayerwkb/CMakeLists.txt
code/player/trunk/libplayerwkb/playerwkb.h
code/player/trunk/server/drivers/laser/sickLDMRS.cc
code/player/trunk/server/drivers/position/snd/gap_nd_nav.cc
code/player/trunk/server/drivers/position/snd/snd.cc
code/player/trunk/server/drivers/vectormap/vec2map.cc
Modified: code/player/trunk/libplayerwkb/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayerwkb/CMakeLists.txt 2009-06-08 19:18:00 UTC
(rev 7821)
+++ code/player/trunk/libplayerwkb/CMakeLists.txt 2009-06-08 22:18:09 UTC
(rev 7822)
@@ -1,3 +1,8 @@
+# Possibly use our own copy of XDR
+IF (NOT HAVE_XDR)
+ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/replace)
+ENDIF (NOT HAVE_XDR)
+
SET (playerwkbSrcs playerwkb.c)
PLAYER_ADD_LIBRARY (playerwkb ${playerwkbSrcs})
Modified: code/player/trunk/libplayerwkb/playerwkb.h
===================================================================
--- code/player/trunk/libplayerwkb/playerwkb.h 2009-06-08 19:18:00 UTC (rev
7821)
+++ code/player/trunk/libplayerwkb/playerwkb.h 2009-06-08 22:18:09 UTC (rev
7822)
@@ -1,6 +1,18 @@
#ifndef __PLAYER_WKB_H
#define __PLAYER_WKB_H
+#if defined (WIN32)
+ #if defined (PLAYER_STATIC)
+ #define PLAYERWKB_EXPORT
+ #elif defined (playerwkb_EXPORTS)
+ #define PLAYERWKB_EXPORT __declspec (dllexport)
+ #else
+ #define PLAYERWKB_EXPORT __declspec (dllimport)
+ #endif
+#else
+ #define PLAYERWKB_EXPORT
+#endif
+
#include <stddef.h> /* size_t typedef and some versions of GEOS CAPI need this
*/
#include <playerconfig.h> /* this also includes <stdint.h> if needed for types
like uint8_t */
@@ -26,9 +38,9 @@
#else
-typedef void * playerwkbprocessor_t;
+PLAYERWKB_EXPORT typedef void * playerwkbprocessor_t;
-enum player_wkb_endians { player_wkb_big = 0, player_wkb_little = 1 };
+PLAYERWKB_EXPORT enum player_wkb_endians { player_wkb_big = 0,
player_wkb_little = 1 };
struct PlayerWKBEndians
{
@@ -37,11 +49,11 @@
#endif
-typedef void (* playerwkbcallback_t)(void *, double, double, double, double);
+PLAYERWKB_EXPORT typedef void (* playerwkbcallback_t)(void *, double, double,
double, double);
-playerwkbprocessor_t player_wkb_create_processor();
-void player_wkb_destroy_processor(playerwkbprocessor_t wkbprocessor);
-const uint8_t * player_wkb_process_wkb(playerwkbprocessor_t wkbprocessor,
const uint8_t * wkb, size_t wkb_count, playerwkbcallback_t callback, void *
ptr);
+PLAYERWKB_EXPORT playerwkbprocessor_t player_wkb_create_processor();
+PLAYERWKB_EXPORT void player_wkb_destroy_processor(playerwkbprocessor_t
wkbprocessor);
+PLAYERWKB_EXPORT const uint8_t * player_wkb_process_wkb(playerwkbprocessor_t
wkbprocessor, const uint8_t * wkb, size_t wkb_count, playerwkbcallback_t
callback, void * ptr);
#ifdef __cplusplus
}
Modified: code/player/trunk/server/drivers/laser/sickLDMRS.cc
===================================================================
--- code/player/trunk/server/drivers/laser/sickLDMRS.cc 2009-06-08 19:18:00 UTC
(rev 7821)
+++ code/player/trunk/server/drivers/laser/sickLDMRS.cc 2009-06-08 22:18:09 UTC
(rev 7822)
@@ -93,8 +93,6 @@
#define MESSAGE_LEN 38U
-using namespace std;
-
//extern PlayerTime *GlobalTime;
///////////////////////////////////////////////////////////////////////////////
Modified: code/player/trunk/server/drivers/position/snd/gap_nd_nav.cc
===================================================================
--- code/player/trunk/server/drivers/position/snd/gap_nd_nav.cc 2009-06-08
19:18:00 UTC (rev 7821)
+++ code/player/trunk/server/drivers/position/snd/gap_nd_nav.cc 2009-06-08
22:18:09 UTC (rev 7822)
@@ -24,8 +24,17 @@
#include <assert.h>
#include <time.h>
#include <math.h>
-#include <sys/times.h>
#include <vector>
+#if defined (WIN32)
+ #if defined (min)
+ #undef min
+ #endif
+ #if defined (max)
+ #undef max
+ #endif
+#else
+ #include <sys/times.h>
+#endif
#include "dllist.h"
@@ -33,7 +42,6 @@
#include "gap_and_valley.h"
#include "snd.h"
-using namespace std;
//using namespace PlayerCc;
// Use gDebug to set verbosity of output, -1 for silent, 0 for hardly any
output, 5 for normal debug
@@ -116,7 +124,7 @@
//double fScanRes = lp.GetScanRes();
//double fMaxRange = lp.GetMaxRange();
- int iNumSectors = fullLP.size();
+ int iNumSectors = static_cast<int> (fullLP.size());
int iRisingGap = pRisingGap->m_iSector;
double gapDistance = pRisingGap->m_dist;
@@ -155,7 +163,7 @@
bool isFilterClear( int iCenterSector, double width, double forwardLength,
bool bDoRearCheck, std::vector<double> fullLP, double angRes, bool bPrint )
{
- int iCount = fullLP.size();
+ int iCount = static_cast<int> (fullLP.size());
//double angRes = lp.GetScanRes();
for( int i = 0; i < iCount; i++ )
{
@@ -231,7 +239,7 @@
if( iNumSectors <= 0 || iNumSectors > 100000 || iNumSectors <
iNumLPs )
{
- cerr<< "ERROR: Invalid number of sectors " << endl;
+ std::cerr<< "ERROR: Invalid number of sectors " <<
std::endl;
return NULL;
}
@@ -684,9 +692,9 @@
if( gDebug > 5 )
{
- cout<< " Pass
" << iPass << ": considering valley ";
- cout<<
pBestValley->m_pRisingDisc->m_iSector << ", " <<
pBestValley->m_pOtherDisc->m_iSector;
- cout<< endl;
+ std::cout<< "
Pass " << iPass << ": considering valley ";
+ std::cout<<
pBestValley->m_pRisingDisc->m_iSector << ", " <<
pBestValley->m_pOtherDisc->m_iSector;
+ std::cout<<
std::endl;
}
}
}
@@ -719,9 +727,9 @@
if( gDebug > 5 )
{
- cout<< " Pass
" << iPass << ": considering valley ";
- cout<<
pBestValley->m_pRisingDisc->m_iSector << ", " <<
pBestValley->m_pOtherDisc->m_iSector;
- cout<< endl;
+ std::cout<< "
Pass " << iPass << ": considering valley ";
+ std::cout<<
pBestValley->m_pRisingDisc->m_iSector << ", " <<
pBestValley->m_pOtherDisc->m_iSector;
+ std::cout<<
std::endl;
}
}
}
@@ -743,7 +751,7 @@
{
if (gDebug > 0) std::cout<< "!!! Obstacle
inside robot radius !!!";
if (gDebug > 0) std::cout<< " Stopping.";
- iSTheta = fullLP.size()/2;
+ iSTheta = static_cast<int> (fullLP.size()/2);
}
else if( pBestValley == NULL )
{
Modified: code/player/trunk/server/drivers/position/snd/snd.cc
===================================================================
--- code/player/trunk/server/drivers/position/snd/snd.cc 2009-06-08
19:18:00 UTC (rev 7821)
+++ code/player/trunk/server/drivers/position/snd/snd.cc 2009-06-08
22:18:09 UTC (rev 7822)
@@ -135,35 +135,15 @@
*/
/** @} */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#include <unistd.h>
+#if !defined (WIN32)
+ #include <unistd.h>
+ #include <netinet/in.h>
+#endif
#include <string.h>
#include <stdio.h>
#include <pthread.h>
#include <semaphore.h>
#include <vector>
-#include <netinet/in.h>
#include <libplayercore/playercore.h>
#include "snd.h"
Modified: code/player/trunk/server/drivers/vectormap/vec2map.cc
===================================================================
--- code/player/trunk/server/drivers/vectormap/vec2map.cc 2009-06-08
19:18:00 UTC (rev 7821)
+++ code/player/trunk/server/drivers/vectormap/vec2map.cc 2009-06-08
22:18:09 UTC (rev 7822)
@@ -86,8 +86,6 @@
#define EPS 0.0000001
#define MAXFABS(a, b) ((fabs(a) > fabs(b)) ? fabs(a) : fabs(b))
-using namespace std;
-
class Vec2Map : public ThreadedDriver
{
public:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
