[openrtm-commit:00113] r2142 - in branches/RELENG_1_1/OpenRTM-aist: examples src/lib/rtm

openrtm ＠ openrtm.org openrtm ＠ openrtm.org
2011年 5月 26日 (木) 23:23:02 JST 

Author: n-ando
Date: 2011-05-26 23:23:02 +0900 (Thu, 26 May 2011)
New Revision: 2142

Modified:
   branches/RELENG_1_1/OpenRTM-aist/examples/rtc.vcproj.yaml
   branches/RELENG_1_1/OpenRTM-aist/examples/rtcdll.vcproj.yaml
   branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp
   branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceConsumerBase.h
   branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml
Log:
The problem that ComponentObserver cannot be used in Windows envrionment
has been fixed. IDL compiler option and definition has been changed.
SdoServiceConsumerBase's virtual dtor has been added. refs #2138


Modified: branches/RELENG_1_1/OpenRTM-aist/examples/rtc.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/rtc.vcproj.yaml	2011-05-26 14:19:28 UTC (rev 2141)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/rtc.vcproj.yaml	2011-05-26 14:23:02 UTC (rev 2142)
@@ -24,12 +24,12 @@
         Value: |
           set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
           for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
-          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
     VCCLCompilerTool:
       - Key: Optimization
         Value: 0
       - Key: PreprocessorDefinitions
-        Value: "USE_stub_in_nt_dll;WIN32;_DEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
+        Value: "INCLUDE_stub_in_nt_dll;WIN32;_DEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
       - Key: MinimalRebuild
         Value: "true"
       - Key: BasicRuntimeChecks
@@ -66,12 +66,12 @@
         Value: |
           set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
           for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
-          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
     VC10_VCCLCompilerTool:
       - Key: Optimization
         Value: "Disabled"
       - Key: PreprocessorDefinitions
-        Value: "USE_stub_in_nt_dll;WIN32;_DEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+        Value: "INCLUDED_stub_in_nt_dll;WIN32;_DEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
       - Key: MinimalRebuild
         Value: "true"
       - Key: BasicRuntimeChecks
@@ -112,7 +112,7 @@
         Value: |
           set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
           for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
-          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
     VCPostBuildEventTool:
       - Key: CommandLine
         Value: |
@@ -120,7 +120,7 @@
           copy "$(OutDir)\\\\__PROJECT_NAME__.exe" "$(SolutionDir)\\\\components"
     VCCLCompilerTool:
       - Key: PreprocessorDefinitions
-        Value: "USE_stub_in_nt_dll;WIN32;NDEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
+        Value: "INCLUDED_stub_in_nt_dll;WIN32;NDEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
       - Key: RuntimeLibrary
         Value: "2"
       - Key: UsePrecompiledHeader
@@ -159,7 +159,7 @@
         Value: |
           set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
           for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
-          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
     VC10_VCPostBuildEventTool:
       - Key: Command
         Value: |

Modified: branches/RELENG_1_1/OpenRTM-aist/examples/rtcdll.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/rtcdll.vcproj.yaml	2011-05-26 14:19:28 UTC (rev 2141)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/rtcdll.vcproj.yaml	2011-05-26 14:23:02 UTC (rev 2142)
@@ -24,12 +24,12 @@
         Value: |
           set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
           for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
-          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
     VCCLCompilerTool:
       - Key: Optimization
         Value: "0"
       - Key: PreprocessorDefinitions
-        Value: "USE_stub_in_nt_dll;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+        Value: "INCLUDED_stub_in_nt_dll;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
       - Key: MinimalRebuild
         Value: "true"
       - Key: BasicRuntimeChecks
@@ -70,7 +70,7 @@
         Value: |
           set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
           for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
-          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
     VC10_VCCLCompilerTool:
       - Key: Optimization
         Value: "Disabled"
@@ -120,7 +120,7 @@
         Value: |
           set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
           for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
-          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
     VCPostBuildEventTool:
       - Key: CommandLine
         Value: |
@@ -128,7 +128,7 @@
           copy "$(OutDir)\\\\__PROJECT_NAME__.dll" "$(SolutionDir)\\\\components"
     VCCLCompilerTool:
       - Key: PreprocessorDefinitions
-        Value: "USE_stub_in_nt_dll;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+        Value: "INCLUDED_stub_in_nt_dll;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
       - Key:         RuntimeLibrary
         Value: "2"
       - Key:         UsePrecompiledHeader
@@ -167,7 +167,7 @@
         Value: |
           set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
           for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
-          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+          for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
     VC10_VCPostBuildEventTool:
       - Key: Command
         Value: |

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp	2011-05-26 14:19:28 UTC (rev 2141)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp	2011-05-26 14:23:02 UTC (rev 2142)
@@ -221,10 +221,10 @@
         if (strid == static_cast<const char*>((*it)->getProfile().id))
           {
             (*it)->finalize();
-            m_consumers.erase(it);
             SdoServiceConsumerFactory& 
               factory(SdoServiceConsumerFactory::instance());
             factory.deleteObject(*it);
+            m_consumers.erase(it);
             RTC_INFO(("SDO service has been deleted: %s", id));
             return true;
           }

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceConsumerBase.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceConsumerBase.h	2011-05-26 14:19:28 UTC (rev 2141)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceConsumerBase.h	2011-05-26 14:23:02 UTC (rev 2142)
@@ -50,6 +50,7 @@
   class SdoServiceConsumerBase
   {
   public:
+    virtual ~SdoServiceConsumerBase() {};
     virtual bool init(RTObject_impl& rtobj,
                       const SDOPackage::ServiceProfile& profile) = 0;
     virtual bool reinit(const SDOPackage::ServiceProfile& profile) = 0;
@@ -59,6 +60,11 @@
 
   typedef ::coil::GlobalFactory<
     ::RTC::SdoServiceConsumerBase > SdoServiceConsumerFactory;
+
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
+  EXTERN template class DLL_PLUGIN 
+                     ::coil::GlobalFactory< ::RTC::SdoServiceConsumerBase >;
+#endif
   
 }; // namespace RTC
 

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml	2011-05-26 14:19:28 UTC (rev 2141)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml	2011-05-26 14:23:02 UTC (rev 2142)
@@ -23,7 +23,7 @@
       - Key: Optimization
         Value: "0"
       - Key: PreprocessorDefinitions
-        Value: "WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+        Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
       - Key: MinimalRebuild
         Value: "true"
       - Key: BasicRuntimeChecks
@@ -76,7 +76,7 @@
       - Key: Optimization
         Value: "Disabled"
       - Key: PreprocessorDefinitions
-        Value: "WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+        Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
       - Key: MinimalRebuild
         Value: "true"
       - Key: BasicRuntimeChecks
@@ -131,7 +131,7 @@
     WholeProgramOptimization: "0"
     VCCLCompilerTool:
       - Key: PreprocessorDefinitions
-        Value: "WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+        Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
       - Key:         RuntimeLibrary
         Value: "2"
       - Key:         UsePrecompiledHeader
@@ -180,7 +180,7 @@
     VC10_LinkIncrementalCondition: "false"
     VC10_VCCLCompilerTool:
       - Key: PreprocessorDefinitions
-        Value: "WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+        Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
       - Key:         RuntimeLibrary
         Value: "MultiThreadedDLL"
       - Key: PrecompiledHeader

openrtm-commit メーリングリストの案内