From: <bo...@us...> - 2008-11-08 04:52:07
|
Revision: 361 http://gearbox.svn.sourceforge.net/gearbox/?rev=361&view=rev Author: borax00 Date: 2008-11-08 04:51:58 +0000 (Sat, 08 Nov 2008) Log Message: ----------- removed namespace concatenation. Modified Paths: -------------- gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/serialdevicehandler.cpp gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/serialdevicehandler.h Modified: gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/serialdevicehandler.cpp =================================================================== --- gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/serialdevicehandler.cpp 2008-11-07 04:21:07 UTC (rev 360) +++ gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/serialdevicehandler.cpp 2008-11-08 04:51:58 UTC (rev 361) @@ -14,7 +14,6 @@ using namespace std; -namespace gbxsickacfr { namespace gbxserialdeviceacfr { namespace { @@ -275,5 +274,4 @@ return ss.str(); } -} } // namespace Modified: gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/serialdevicehandler.h =================================================================== --- gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/serialdevicehandler.h 2008-11-07 04:21:07 UTC (rev 360) +++ gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/serialdevicehandler.h 2008-11-08 04:51:58 UTC (rev 361) @@ -16,7 +16,6 @@ #include <gbxsickacfr/gbxiceutilacfr/buffer.h> #include <IceUtil/IceUtil.h> -namespace gbxsickacfr { namespace gbxserialdeviceacfr { //! @brief A generic Response: a message received from the device @@ -26,8 +25,10 @@ ~IResponse() {} // Does the response indicate a warning condition? + // If so, this will be reported to SerialDeviceHandler's status. virtual bool isWarn() const=0; // Does the response indicate an error condition? + // If so, this will be reported to SerialDeviceHandler's status. virtual bool isError() const=0; // Human-readable string @@ -114,7 +115,8 @@ // The main thread function, inherited from SubsystemThread virtual void walk(); - // Allow external non-const access direct to (thread-safe) responseBuffer + // Allow external non-const access direct to (thread-safe) responseBuffer. + // This is what you use to hear responses. gbxiceutilacfr::Buffer<TimedResponse> &responseBuffer() { return responseBuffer_; } private: @@ -140,6 +142,8 @@ gbxutilacfr::Tracer& tracer_; gbxutilacfr::SubStatus subStatus_; }; +//! A smart pointer to the class. +typedef IceUtil::Handle<SerialDeviceHandler> SerialDeviceHandlerPtr; ////////////////////////////////////////////////////////////////////// // Printing Functions @@ -151,7 +155,6 @@ inline std::string toHexString( const std::vector<char> &buf ) {return toHexString( &(buf[0]), buf.size() );} -} } // namespace #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |