[openrtm-commit:00121] r2146 - branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2011-05-27 18:56:11 +0900 (Fri, 27 May 2011)
New Revision: 2146

Modified:
   branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/InPortConsumer.h
   branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/InPortProvider.h
   branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h
   branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPortProvider.h
   branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/PeriodicTaskFactory.h
   branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/PublisherBase.h
Log:
GlobalFactory's explicit instantiation has been added for Win32.


Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/InPortConsumer.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/InPortConsumer.h	2011-05-27 08:54:45 UTC (rev 2145)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/InPortConsumer.h	2011-05-27 09:56:11 UTC (rev 2146)
@@ -253,6 +253,10 @@
   };
 
   typedef ::coil::GlobalFactory<InPortConsumer> InPortConsumerFactory;
+
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
+  EXTERN template class DLL_PLUGIN ::coil::GlobalFactory<InPortConsumer>;
+#endif
 };     // namespace RTC
 
 #endif // RTC_INPORTCONSUMER_H

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/InPortProvider.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/InPortProvider.h	2011-05-27 08:54:45 UTC (rev 2145)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/InPortProvider.h	2011-05-27 09:56:11 UTC (rev 2146)
@@ -527,5 +527,8 @@
    */
   typedef ::coil::GlobalFactory<InPortProvider> InPortProviderFactory;
 
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
+  EXTERN template class DLL_PLUGIN ::coil::GlobalFactory<InPortProvider>;
+#endif
 };     // namespace RTC
 #endif // RTC_INPORTPROVIDER_H

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h	2011-05-27 08:54:45 UTC (rev 2145)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h	2011-05-27 09:56:11 UTC (rev 2146)
@@ -413,6 +413,9 @@
    */
   typedef ::coil::GlobalFactory<OutPortConsumer> OutPortConsumerFactory;
 
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
+  EXTERN template class DLL_PLUGIN ::coil::GlobalFactory<OutPortConsumer>;
+#endif
 };     // namespace RTC
 #endif // RTC_OUTPORTCONSUMER_H
 

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPortProvider.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPortProvider.h	2011-05-27 08:54:45 UTC (rev 2145)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPortProvider.h	2011-05-27 09:56:11 UTC (rev 2146)
@@ -547,5 +547,8 @@
    */
   typedef ::coil::GlobalFactory<OutPortProvider> OutPortProviderFactory;
 
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
+  EXTERN template class DLL_PLUGIN ::coil::GlobalFactory<OutPortProvider>;
+#endif
 }; // namespace RTC
 #endif // RTC_OUTPORTPROVIDER_H

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/PeriodicTaskFactory.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/PeriodicTaskFactory.h	2011-05-27 08:54:45 UTC (rev 2145)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/PeriodicTaskFactory.h	2011-05-27 09:56:11 UTC (rev 2146)
@@ -26,8 +26,12 @@
 namespace RTC
 {
 
-  typedef coil::GlobalFactory<coil::PeriodicTaskBase> PeriodicTaskFactory;
+  typedef ::coil::GlobalFactory<coil::PeriodicTaskBase> PeriodicTaskFactory;
 
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
+  EXTERN template class DLL_PLUGIN
+                     ::coil::GlobalFactory<coil::PeriodicTaskBase>;
+#endif
 };
 
 #endif // RTC_PERIODICTASKFACTORY_H

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/PublisherBase.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/PublisherBase.h	2011-05-27 08:54:45 UTC (rev 2145)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/PublisherBase.h	2011-05-27 09:56:11 UTC (rev 2146)
@@ -363,5 +363,8 @@
 
   typedef coil::GlobalFactory<PublisherBase> PublisherFactory;
 
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
+  EXTERN template class DLL_PLUGIN coil::GlobalFactory<PublisherBase>;
+#endif
 };
 #endif // RTC_PUBLISHERBASE_H