[Personalrobots-commit] SF.net SVN: personalrobots:[3857] pkg/trunk

[<rob...@us...>]

Revision: 3857
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=3857&view=rev
Author:   rob_wheeler
Date:     2008-09-01 23:02:44 +0000 (Mon, 01 Sep 2008)

Log Message:
-----------
Wrap misc_utils in a namespace

Modified Paths:
--------------
    pkg/trunk/controllers/generic_controllers/include/generic_controllers/controller.h
    pkg/trunk/mechanism/mechanism_control/include/mechanism_control/mechanism_control.h
    pkg/trunk/mechanism/mechanism_model/include/mechanism_model/transmission.h
    pkg/trunk/util/misc_utils/include/misc_utils/factory.h
    pkg/trunk/util/misc_utils/include/misc_utils/realtime_publisher.h

Modified: pkg/trunk/controllers/generic_controllers/include/generic_controllers/controller.h
===================================================================
--- pkg/trunk/controllers/generic_controllers/include/generic_controllers/controller.h	2008-08-31 07:10:55 UTC (rev 3856)
+++ pkg/trunk/controllers/generic_controllers/include/generic_controllers/controller.h	2008-09-01 23:02:44 UTC (rev 3857)
@@ -72,7 +72,7 @@
 
 
 class Controller;
-typedef Factory<Controller> ControllerFactory;
+typedef misc_utils::Factory<Controller> ControllerFactory;
 
 #define ROS_REGISTER_CONTROLLER(c) \
   controller::Controller *ROS_New_##c() { return new c(); }             \

Modified: pkg/trunk/mechanism/mechanism_control/include/mechanism_control/mechanism_control.h
===================================================================
--- pkg/trunk/mechanism/mechanism_control/include/mechanism_control/mechanism_control.h	2008-08-31 07:10:55 UTC (rev 3856)
+++ pkg/trunk/mechanism/mechanism_control/include/mechanism_control/mechanism_control.h	2008-09-01 23:02:44 UTC (rev 3857)
@@ -129,7 +129,7 @@
   mechanism_control::MechanismState mechanism_state_;
   static const double STATE_PUBLISHING_PERIOD = 0.1;  // in seconds, higher rates are useless with the current speed of the simulator
   const char* const mechanism_state_topic_;
-  RealtimePublisher<mechanism_control::MechanismState> publisher_;
+  misc_utils::RealtimePublisher<mechanism_control::MechanismState> publisher_;
 };
 
 #endif /* MECHANISM_CONTROL_H */

Modified: pkg/trunk/mechanism/mechanism_model/include/mechanism_model/transmission.h
===================================================================
--- pkg/trunk/mechanism/mechanism_model/include/mechanism_model/transmission.h	2008-08-31 07:10:55 UTC (rev 3856)
+++ pkg/trunk/mechanism/mechanism_model/include/mechanism_model/transmission.h	2008-09-01 23:02:44 UTC (rev 3857)
@@ -46,7 +46,7 @@
 class Robot;
 
 class Transmission;
-typedef Factory<Transmission> TransmissionFactory;
+typedef misc_utils::Factory<Transmission> TransmissionFactory;
 
 #define ROS_REGISTER_TRANSMISSION(c) \
   mechanism::Transmission *ROS_New_##c() { return new c(); }             \

Modified: pkg/trunk/util/misc_utils/include/misc_utils/factory.h
===================================================================
--- pkg/trunk/util/misc_utils/include/misc_utils/factory.h	2008-08-31 07:10:55 UTC (rev 3856)
+++ pkg/trunk/util/misc_utils/include/misc_utils/factory.h	2008-09-01 23:02:44 UTC (rev 3857)
@@ -33,6 +33,8 @@
 #include <map>
 #include <vector>
 
+namespace misc_utils {
+
 template <class BaseResult,
           class Constructor = BaseResult* (*)()>
 class Factory
@@ -78,7 +80,7 @@
   ConstructorMap types_;
 };
 
+}
 
 
-
 #endif

Modified: pkg/trunk/util/misc_utils/include/misc_utils/realtime_publisher.h
===================================================================
--- pkg/trunk/util/misc_utils/include/misc_utils/realtime_publisher.h	2008-08-31 07:10:55 UTC (rev 3856)
+++ pkg/trunk/util/misc_utils/include/misc_utils/realtime_publisher.h	2008-09-01 23:02:44 UTC (rev 3857)
@@ -43,6 +43,8 @@
 #include <rosthread/mutex.h>
 #include <rosthread/member_thread.h>
 
+namespace misc_utils {
+
 template <class Msg>
 class RealtimePublisher
 {
@@ -121,4 +123,6 @@
   pthread_cond_t updated_cond_;
 };
 
+}
+
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.