Revision: 6610
http://playerstage.svn.sourceforge.net/playerstage/?rev=6610&view=rev
Author: gbiggs
Date: 2008-06-16 19:12:12 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
Updated gearbox sick driver to match changed library
Modified Paths:
--------------
code/player/trunk/server/drivers/ranger/gbxsickacfr.cc
Modified: code/player/trunk/server/drivers/ranger/gbxsickacfr.cc
===================================================================
--- code/player/trunk/server/drivers/ranger/gbxsickacfr.cc 2008-06-17
01:29:18 UTC (rev 6609)
+++ code/player/trunk/server/drivers/ranger/gbxsickacfr.cc 2008-06-17
02:12:12 UTC (rev 6610)
@@ -105,9 +105,9 @@
using namespace std;
#include <gbxsickacfr/driver.h>
-#include <gbxsickacfr/gbxutilacfr/trivialtracer.h>
-#include <gbxsickacfr/gbxutilacfr/trivialstatus.h>
-#include <gbxsickacfr/gbxutilacfr/mathdefs.h>
+#include <gbxutilacfr/trivialtracer.h>
+#include <gbxutilacfr/trivialstatus.h>
+#include <gbxutilacfr/mathdefs.h>
#include <libplayercore/playercore.h>
@@ -141,8 +141,8 @@
gbxsickacfr::Driver *device;
// Objects to handle messages from the driver
bool debug;
- gbxsickacfr::gbxutilacfr::TrivialTracer *tracer;
- gbxsickacfr::gbxutilacfr::TrivialStatus *status;
+ gbxutilacfr::TrivialTracer *tracer;
+ gbxutilacfr::TrivialStatus *status;
};
Driver*
@@ -215,8 +215,8 @@
}
// Create status trackers
- tracer = new gbxsickacfr::gbxutilacfr::TrivialTracer (debug);
- status = new gbxsickacfr::gbxutilacfr::TrivialStatus (*tracer);
+ tracer = new gbxutilacfr::TrivialTracer (debug);
+ status = new gbxutilacfr::TrivialStatus (*tracer);
// Create the driver object
try
@@ -352,7 +352,7 @@
if (data.haveWarnings)
PLAYER_WARN1 ("GbxSickAcfr: Got warnings with scan: %s\n",
data.warnings.c_str ());
}
- catch (gbxsickacfr::gbxutilacfr::Exception &e)
+ catch (gbxutilacfr::Exception &e)
{
// No data received by the timeout; warn but go on anyway
PLAYER_WARN ("GbxSickAcfr: Timed out while reading laser scan.\n");
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
