Deprecate generic compiler definitions

Replaced with definitions prefixed with the package name. The old definitions are still present to
avoid breaking any user code that checks them.

Author: jdlangs

simple_message/cmake/platform_build_flags.cmake

@@ -3,9 +3,16 @@
 # cmake's `remove_definitions` command to change these defaults if desired.
 
 #Include code that interfaces with ROS
-add_definitions(-DROS)
+add_definitions(-DSIMPLE_MESSAGE_USE_ROS)
 
 #Control which platform's underlying networking library is used by this package.
 #The package will not build unless one (and only one) of these definitions is set.
+add_definitions(-DSIMPLE_MESSAGE_LINUX)
+#add_definitions(-DSIMPLE_MESSAGE_MOTOPLUS)
+
+#--------------------------------------------------------------------------
+#Old definitions (deprecated in kinetic, to be removed in lunar or melodic)
+#--------------------------------------------------------------------------
+add_definitions(-DROS)
 add_definitions(-DLINUXSOCKETS)
 #add_definitions(-DMOTOPLUS)

simple_message/include/simple_message/log_wrapper.h

@@ -32,11 +32,11 @@
 #ifndef LOG_WRAPPER_H_
 #define LOG_WRAPPER_H_
 
-#ifdef ROS
+#ifdef SIMPLE_MESSAGE_USE_ROS
 #include "ros/ros.h"
 #endif
 
-#ifdef MOTOPLUS
+#ifdef SIMPLE_MESSAGE_MOTOPLUS
 #include "motoPlus.h"
 #endif
 
@@ -55,7 +55,7 @@ namespace log_wrapper
 
 
 // Define ROS if this library will execute under ROS
-#ifdef ROS
+#ifdef SIMPLE_MESSAGE_USE_ROS
 
 // The LOG_COMM redirects to debug in ROS because ROS has
 // debug filtering tools that allow the communications messages

simple_message/include/simple_message/robot_status.h

@@ -60,7 +60,7 @@ enum RobotMode
   MANUAL = 1, AUTO = 2,
 };
 
-#ifdef ROS
+#ifdef SIMPLE_MESSAGE_USE_ROS
 int toROSMsgEnum(RobotModes::RobotMode mode);
 #endif
 
@@ -85,7 +85,7 @@ enum TriState
   TS_FALSE = 0,   TS_OFF = 0,  TS_DISABLED = 0,  TS_LOW = 0
 };
 
-#ifdef ROS
+#ifdef SIMPLE_MESSAGE_USE_ROS
 int toROSMsgEnum(TriStates::TriState state);
 #endif
 

simple_message/include/simple_message/socket/simple_socket.h

@@ -42,7 +42,7 @@
 #include "smpl_msg_connection.h"
 #endif
 
-#ifdef LINUXSOCKETS
+#ifdef SIMPLE_MESSAGE_LINUX
 
 #include "sys/socket.h"
 #include "arpa/inet.h"
@@ -73,7 +73,7 @@
 
 #endif
 
-#ifdef MOTOPLUS
+#ifdef SIMPLE_MESSAGE_MOTOPLUS
 
 #include "motoPlus.h"
 

simple_message/include/simple_message/socket/tcp_socket.h

@@ -40,15 +40,15 @@
 #include "shared_types.h"
 #endif
 
-#ifdef LINUXSOCKETS
+#ifdef SIMPLE_MESSAGE_LINUX
 #include "sys/socket.h"
 #include "netdb.h"
 #include "arpa/inet.h"
 #include "string.h"
 #include "unistd.h"
 #endif
 
-#ifdef MOTOPLUS
+#ifdef SIMPLE_MESSAGE_MOTOPLUS
 #include "motoPlus.h"
 #endif
 

simple_message/include/simple_message/socket/udp_socket.h

@@ -42,15 +42,15 @@
 #include "smpl_msg_connection.h"
 #endif
 
-#ifdef LINUXSOCKETS
+#ifdef SIMPLE_MESSAGE_LINUX
 #include "sys/socket.h"
 #include "arpa/inet.h"
 #include "string.h"
 #include "netdb.h"
 #include "unistd.h"
 #endif
 
-#ifdef MOTOPLUS
+#ifdef SIMPLE_MESSAGE_MOTOPLUS
 #include "motoPlus.h"
 #endif
 

simple_message/src/message_manager.cpp

@@ -38,7 +38,7 @@
 #include "simple_message.h"
 #endif
 
-#ifdef ROS
+#ifdef SIMPLE_MESSAGE_USE_ROS
 #include "ros/ros.h"
 #else
 #include "unistd.h"
@@ -171,7 +171,7 @@ void MessageManager::spinOnce()
 int ms_per_clock;
 void mySleep(int sec)
 {
-#ifdef MOTOPLUS
+#ifdef SIMPLE_MESSAGE_MOTOPLUS
   if (ms_per_clock <= 0)
     ms_per_clock = mpGetRtc();
 
@@ -184,7 +184,7 @@ void mySleep(int sec)
 void MessageManager::spin()
 {
   LOG_INFO("Entering message manager spin loop");
-#ifdef ROS
+#ifdef SIMPLE_MESSAGE_USE_ROS
   while (ros::ok())
 #else
   while (true)

simple_message/src/robot_status.cpp

@@ -38,7 +38,7 @@
 #include "log_wrapper.h"
 #endif
 
-#ifdef ROS
+#ifdef SIMPLE_MESSAGE_USE_ROS
 // Files below used to translate between ROS messages enums and
 // enums defined in this file
 #include "industrial_msgs/RobotMode.h"
@@ -55,7 +55,7 @@ namespace robot_status
 namespace RobotModes
 {
 
-#ifdef ROS
+#ifdef SIMPLE_MESSAGE_USE_ROS
 
 int toROSMsgEnum(RobotModes::RobotMode mode)
 {
@@ -83,7 +83,7 @@ int toROSMsgEnum(RobotModes::RobotMode mode)
 namespace TriStates
 {
 
-#ifdef ROS
+#ifdef SIMPLE_MESSAGE_USE_ROS
 
 int toROSMsgEnum(TriStates::TriState state)
 {

simple_message/src/simple_message.cpp

@@ -37,7 +37,7 @@
 #include "log_wrapper.h"
 #endif
 
-#ifdef MOTOPLUS
+#ifdef SIMPLE_MESSAGE_MOTOPLUS
 #include "motoPlus.h"
 #endif
 

simple_message/src/smpl_msg_connection.cpp

@@ -39,7 +39,7 @@
 #include "byte_array.h"
 #endif
 
-#ifdef MOTOPLUS
+#ifdef SIMPLE_MESSAGE_MOTOPLUS
 #include "motoPlus.h"
 #endif