[openrtm-commit:02232] r2845 - in branches/DEV_IQ_2016/OpenRTM-aist/src/lib: coil/ace/coil coil/posix/coil coil/win32/coil rtm

[openrtm ＠ openrtm.org]

Author: sec_fukai
Date: 2017-01-16 20:05:43 +0900 (Mon, 16 Jan 2017)
New Revision: 2845

Modified:
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/atomic.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/atomic.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/atomic.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/config_coil.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/FactoryInit.h
Log:
[compat,->DEV_IQ_2016]Add double include guard. refs #3814

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/atomic.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/atomic.h	2017-01-16 10:35:22 UTC (rev 2844)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/atomic.h	2017-01-16 11:05:43 UTC (rev 2845)
@@ -17,6 +17,7 @@
  *
  */
 #ifndef COIL_ATOMIC_H
+#define COIL_ATOMIC_H
 
 #include <coil/Mutex.h>
 #include <coil/Guard.h>

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/atomic.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/atomic.h	2017-01-16 10:35:22 UTC (rev 2844)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/atomic.h	2017-01-16 11:05:43 UTC (rev 2845)
@@ -17,6 +17,7 @@
  *
  */
 #ifndef COIL_ATOMIC_H
+#define COIL_ATOMIC_H
 
 #ifdef COIL_HAS_ATOMIC_OP
 

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/atomic.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/atomic.h	2017-01-16 10:35:22 UTC (rev 2844)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/atomic.h	2017-01-16 11:05:43 UTC (rev 2845)
@@ -17,6 +17,7 @@
  *
  */
 #ifndef COIL_ATOMIC_H
+#define COIL_ATOMIC_H
 
 #ifdef COIL_HAS_ATOMIC_ADD
 #include <windows.h>

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/config_coil.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/config_coil.h	2017-01-16 10:35:22 UTC (rev 2844)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/config_coil.h	2017-01-16 11:05:43 UTC (rev 2845)
@@ -1,6 +1,7 @@
 /* config_coil.h.  Generated from config_coil.h.in by configure.  */
 /* config_coil.h.in.  Generated from configure.ac by autoheader.  */
-
+#ifndef COIL_CONFIG_COIL_H
+#define COIL_CONFIG_COIL_H
 /* ACE version 5.6.1 or earlier */
 /* #undef ACE_5_6_1_OR_EARLIER */
 
@@ -125,3 +126,4 @@
 
 /* Multi Thread Support */
 #define _REENTRANT TRUE
+#endif //COIL_CONFIG_COIL_H

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h	2017-01-16 10:35:22 UTC (rev 2844)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h	2017-01-16 11:05:43 UTC (rev 2845)
@@ -16,7 +16,8 @@
  * $Id$
  *
  */
-
+#ifndef RTM_DEFAULTCONFIGURATION_H
+#define RTM_DEFAULTCONFIGURATION_H
 #include "rtm/version.h"
 #include "rtm/config_rtc.h"
 /*!
@@ -111,4 +112,4 @@
     "sdo.service.consumer.enabled_service",  "ALL",
     ""
   };
-
+#endif //RTM_DEFAULTCONFIGURATION_H

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/FactoryInit.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/FactoryInit.h	2017-01-16 10:35:22 UTC (rev 2844)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/FactoryInit.h	2017-01-16 11:05:43 UTC (rev 2845)
@@ -15,5 +15,7 @@
  * $Id: Manager.cpp 1296 2009-04-27 08:43:24Z n-ando $
  *
  */
-
+#ifndef RTM_FACTORYINIT_H
+#define RTM_FACTORYINIT_H
 void FactoryInit();
+#endif //RTM_FACTORYINIT_H