Revision: 8243
http://playerstage.svn.sourceforge.net/playerstage/?rev=8243&view=rev
Author: gbiggs
Date: 2009-09-07 02:04:21 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
Fixed erroneous namespace usage on windows
Modified Paths:
--------------
code/player/trunk/server/drivers/ranger/hokuyo_aist.cc
Modified: code/player/trunk/server/drivers/ranger/hokuyo_aist.cc
===================================================================
--- code/player/trunk/server/drivers/ranger/hokuyo_aist.cc 2009-09-04
23:58:07 UTC (rev 8242)
+++ code/player/trunk/server/drivers/ranger/hokuyo_aist.cc 2009-09-07
02:04:21 UTC (rev 8243)
@@ -305,7 +305,11 @@
}
catch (hokuyo_aist::HokuyoError &e)
{
+#if defined (WIN32)
+ if (e.Code () != HOKUYO_ERR_NOTSERIAL)
+#else
if (e.Code () !=
hokuyo_aist::HOKUYO_ERR_NOTSERIAL)
+#endif
{
PLAYER_ERROR2 ("hokuyo_aist: Error
while changing baud rate: (%d) %s",
e.Code (), e.what ());
@@ -635,7 +639,11 @@
}
catch (hokuyo_aist::HokuyoError &e)
{
- if (e.Code () == hokuyo_aist::HOKUYO_ERR_NOTSERIAL)
+#if defined (WIN32)
+ if (e.Code () != HOKUYO_ERR_NOTSERIAL)
+#else
+ if (e.Code () != hokuyo_aist::HOKUYO_ERR_NOTSERIAL)
+#endif
PLAYER_WARN ("hokuyo_aist: Cannot change the
baud rate of a non-serial connection.");
else
PLAYER_WARN2 ("hokuyo_aist: Error changing baud
rate: (%d) %s", e.Code (), e.what ());
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
