|
From: <rob...@us...> - 2009-07-01 01:08:07
|
Revision: 18045
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=18045&view=rev
Author: rob_wheeler
Date: 2009-07-01 00:39:41 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Mark old realtime_publisher constructor as deprecated and switch pr2_etherCAT to use the new constructor.
Modified Paths:
--------------
pkg/trunk/stacks/pr2/pr2_etherCAT/src/main.cpp
pkg/trunk/util/realtime_tools/include/realtime_tools/realtime_publisher.h
Modified: pkg/trunk/stacks/pr2/pr2_etherCAT/src/main.cpp
===================================================================
--- pkg/trunk/stacks/pr2/pr2_etherCAT/src/main.cpp 2009-07-01 00:34:21 UTC (rev 18044)
+++ pkg/trunk/stacks/pr2/pr2_etherCAT/src/main.cpp 2009-07-01 00:39:41 UTC (rev 18045)
@@ -181,13 +181,13 @@
void *controlLoop(void *)
{
ros::NodeHandle node;
- realtime_tools::RealtimePublisher<diagnostic_msgs::DiagnosticMessage> publisher("/diagnostics", 2);
+ realtime_tools::RealtimePublisher<diagnostic_msgs::DiagnosticMessage> publisher(node, "/diagnostics", 2);
realtime_tools::RealtimePublisher<pr2_etherCAT::RealtimeStats> *rtpublisher = 0;
accumulator_set<double, stats<tag::max, tag::mean> > acc;
if (g_options.stats)
{
- rtpublisher = new realtime_tools::RealtimePublisher<pr2_etherCAT::RealtimeStats> ("/realtime", 2);
+ rtpublisher = new realtime_tools::RealtimePublisher<pr2_etherCAT::RealtimeStats> (node, "/realtime", 2);
}
// Initialize the hardware interface
Modified: pkg/trunk/util/realtime_tools/include/realtime_tools/realtime_publisher.h
===================================================================
--- pkg/trunk/util/realtime_tools/include/realtime_tools/realtime_publisher.h 2009-07-01 00:34:21 UTC (rev 18044)
+++ pkg/trunk/util/realtime_tools/include/realtime_tools/realtime_publisher.h 2009-07-01 00:39:41 UTC (rev 18045)
@@ -70,7 +70,7 @@
public:
// Deprecated
- RealtimePublisher(const std::string &topic, int queue_size)
+ __attribute__((deprecated)) RealtimePublisher(const std::string &topic, int queue_size)
: topic_(topic), is_running_(false), keep_running_(false), turn_(REALTIME)
{
construct(queue_size);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|