Revision: 8171
http://playerstage.svn.sourceforge.net/playerstage/?rev=8171&view=rev
Author: gbiggs
Date: 2009-08-04 03:06:07 +0000 (Tue, 04 Aug 2009)
Log Message:
-----------
Fixed bug #2825091
Modified Paths:
--------------
code/player/trunk/server/drivers/mixed/phidgetIFK/phidgetIFK.cc
code/player/trunk/server/drivers/wsn/phidgetAcc.cc
Modified: code/player/trunk/server/drivers/mixed/phidgetIFK/phidgetIFK.cc
===================================================================
--- code/player/trunk/server/drivers/mixed/phidgetIFK/phidgetIFK.cc
2009-08-04 03:00:26 UTC (rev 8170)
+++ code/player/trunk/server/drivers/mixed/phidgetIFK/phidgetIFK.cc
2009-08-04 03:06:07 UTC (rev 8171)
@@ -121,7 +121,6 @@
// Destructor
~PhidgetIFK();
- Shutdown
// Must implement the following methods.
virtual int MainSetup();
virtual void MainQuit();
@@ -561,13 +560,13 @@
gettimeofday( &tv_framerate_start, NULL );
if (done != 0) {
- cout << "Error in nanosleep! ERRNO: " << errno << " ";
+ std::cout << "Error in nanosleep! ERRNO: " << errno << " ";
if (errno == EINTR) {
- cout << "EINTR" ;
+ std::cout << "EINTR" ;
} else if (errno == EINVAL) {
- cout << "EINVAL" ;
+ std::cout << "EINVAL" ;
}
- cout << endl;
+ std::cout << endl;
}
Modified: code/player/trunk/server/drivers/wsn/phidgetAcc.cc
===================================================================
--- code/player/trunk/server/drivers/wsn/phidgetAcc.cc 2009-08-04 03:00:26 UTC
(rev 8170)
+++ code/player/trunk/server/drivers/wsn/phidgetAcc.cc 2009-08-04 03:06:07 UTC
(rev 8171)
@@ -109,7 +109,7 @@
~PhidgetAcc();
virtual int MainSetup();
- virtual int MainQuit();
+ virtual void MainQuit();
virtual int ProcessMessage(QueuePointer &resp_queue,
player_msghdr * hdr, void * data);
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
