[openrtm-commit:00792] r2356 - trunk/OpenRTM-aist/src/lib/rtm/idl

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2012-05-07 15:04:28 +0900 (Mon, 07 May 2012)
New Revision: 2356

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/idl/SDOPackage.idl
Log:
Now SDOPackage.idl uses __ORBIT_IDL__ definition to switch CORBA TypeCode member declaration. refs #2181


Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/SDOPackage.idl
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/SDOPackage.idl	2012-05-07 02:08:36 UTC (rev 2355)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/SDOPackage.idl	2012-05-07 06:04:28 UTC (rev 2356)
@@ -36,9 +36,7 @@
 #ifdef USE_MONITORING
 #include <CosNotifyComm.idl>
 #endif
-#ifndef ORBIT2_IDL
-#define TypeCode CORBA::TypeCode
-#endif
+
 /** CORBA specific model for SDOs */
 
 #pragma prefix "org.omg"
@@ -52,7 +50,7 @@
   interface Configuration;
   interface Monitoring;
   interface Organization;
-  
+
   /** ------- Data Types -------*/
   typedef sequence<string>       StringList;
   typedef sequence<SDO>          SDOList;
@@ -120,10 +118,10 @@
   struct Parameter
   {
     string         name;
-#ifndef ORBIT2_IDL
-    TypeCode       type;
+#ifdef __ORBIT_IDL__
+    TypeCode type;
 #else
-    TypeCode       type;
+    CORBA::TypeCode type;
 #endif
     AllowedValues  allowed_values;
   };
@@ -173,7 +171,7 @@
   exception InterfaceNotImplemented  exception_body;
   exception InvalidParameter         exception_body;
   exception InternalError            exception_body;
-  
+
   /** ------- Interfaces -------*/
   interface SDOSystemElement
   {
@@ -261,7 +259,7 @@
 #endif
 
   interface SDOService {};
-  
+
   interface Organization
   {
     UniqueIdentifier get_organization_id ()