[openrtm-commit:02397] r2929 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-02-07 12:41:49 +0900 (Tue, 07 Feb 2017)
New Revision: 2929

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/InPortBase.h
   trunk/OpenRTM-aist/src/lib/rtm/OutPortBase.h
Log:
[compat] refs #3900

Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortBase.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortBase.h	2017-02-07 03:40:06 UTC (rev 2928)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortBase.h	2017-02-07 03:41:49 UTC (rev 2929)
@@ -25,6 +25,12 @@
 #include <rtm/CdrBufferBase.h>
 #include <rtm/ConnectorListener.h>
 
+#ifdef WIN32
+#pragma warning( push ) 
+#pragma warning( disable : 4290 )
+#endif
+
+
 /*!
  * @if jp
  * @namespace RTC
@@ -889,4 +895,8 @@
   };
 }; // namespace RTC
 
+#ifdef WIN32
+#pragma warning( pop )
+#endif
+
 #endif // RTC_INPORTBASE_H

Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPortBase.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPortBase.h	2017-02-07 03:40:06 UTC (rev 2928)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPortBase.h	2017-02-07 03:41:49 UTC (rev 2929)
@@ -34,6 +34,11 @@
 #include <rtm/SystemLogger.h>
 #include <rtm/ConnectorListener.h>
 
+#ifdef WIN32
+#pragma warning( push ) 
+#pragma warning( disable : 4290 )
+#endif
+
 namespace RTC
 {
   class PublisherBase;
@@ -1091,4 +1096,9 @@
     struct connector_cleanup;
   };
 }; // End of namespace RTC
+
+#ifdef WIN32
+#pragma warning( pop )
+#endif
+
 #endif // RTC_RTCOUTPORTBASE_H