[openrtm-commit:01241] r2436 - branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2014-02-12 03:32:21 +0900 (Wed, 12 Feb 2014)
New Revision: 2436

Modified:
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/OrganizationProxyTests.cpp
Log:
Daily work.

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/Makefile.am	2014-02-11 14:16:05 UTC (rev 2435)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/Makefile.am	2014-02-11 18:32:21 UTC (rev 2436)
@@ -25,36 +25,55 @@
 	-I$(top_builddir)                           \
 	-I.                                         \
 	-I../                                       \
-        -I$(top_builddir)/../../../../              \
-        -I$(top_builddir)/../../../../rtm           \
-        -I$(top_builddir)/../../../../coil/include  \
-        -I$(top_builddir)/../../../../rtc/corba/idl \
-        -I$(top_builddir)/../../../../rtc/corba     \
+        -I../../../../../              \
+        -I../../../../../rtm           \
+        -I../../../../../coil/include  \
+        -I../../../../../rtc/corba/idl \
+        -I../../../../../rtc/corba     \
         -I/usr/include/                             \
         -I/usr/include/omniORB4/
-
+#        -I$(top_builddir)/../../../../              \
+#        -I$(top_builddir)/../../../../rtm           \
+#        -I$(top_builddir)/../../../../coil/include  \
+#        -I$(top_builddir)/../../../../rtc/corba/idl \
+#        -I$(top_builddir)/../../../../rtc/corba     \
+#
 AM_LDFLAGS= -L.                   \
 	-L$(top_builddir)         \
         -L$(top_builddir)/../../../../coil/lib
 
 
 IDL_SOURCES = \
-        $(top_builddir)/../../../../rtc/corba/idl/SDOPackage.idl \
-        $(top_builddir)/../../../../rtc/corba/idl/RTC.idl        \
-        $(top_builddir)/../../../../rtc/corba/idl/OpenRTM.idl 
+        ../../../../../rtc/corba/idl/SDOPackage.idl \
+        ../../../../../rtc/corba/idl/RTC.idl        \
+        ../../../../../rtc/corba/idl/OpenRTM.idl 
+#        $(top_builddir)/../../../../rtc/corba/idl/SDOPackage.idl \
+#        $(top_builddir)/../../../../rtc/corba/idl/RTC.idl        \
+#        $(top_builddir)/../../../../rtc/corba/idl/OpenRTM.idl 
 
 noinst_PROGRAMS = OrganizationProxyTests
 
 OrganizationProxyTests_SOURCES = \
         ../TestRunner.cpp                                       \
 	$(IDL_SOURCES:.idl=Skel.cpp)                            \
-        $(top_builddir)/../../../../doil/corba/CORBAManager.cpp \
-        $(top_builddir)/../../../../doil/ORBManager.cpp         \
-        $(top_builddir)/../../../../rtm/NVUtil.cpp              \
-        $(top_builddir)/RTCTypeConversion.cpp                   \
-        $(top_builddir)/SDOPackageTypeConversion.cpp            \
-        $(top_builddir)/OrganizationProxy.cpp \
+        ../../../../../doil/corba/CORBAManager.cpp \
+        ../../../../../doil/ORBManager.cpp         \
+        ../../../../../rtm/NVUtil.cpp              \
+        ../RTCTypeConversion.cpp                   \
+        ../SDOPackageTypeConversion.cpp            \
+        ../OrganizationProxy.cpp \
         OrganizationProxyTests.cpp
+#OrganizationProxyTests_SOURCES = \
+#        ../TestRunner.cpp                                       \
+#	$(IDL_SOURCES:.idl=Skel.cpp)                            \
+#        $(top_builddir)/../../../../doil/corba/CORBAManager.cpp \
+#        $(top_builddir)/../../../../doil/ORBManager.cpp         \
+#        $(top_builddir)/../../../../rtm/NVUtil.cpp              \
+#        $(top_builddir)/RTCTypeConversion.cpp                   \
+#        $(top_builddir)/SDOPackageTypeConversion.cpp            \
+#        $(top_builddir)/OrganizationProxy.cpp \
+#        OrganizationProxyTests.cpp
+
 OrganizationProxyTests_LDFLAGS = -L$(libdir)
 OrganizationProxyTests_LDADD   = \
          -lcppunit                                 \

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/OrganizationProxyTests.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/OrganizationProxyTests.cpp	2014-02-11 14:16:05 UTC (rev 2435)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/OrganizationProxyTests.cpp	2014-02-11 18:32:21 UTC (rev 2436)
@@ -169,14 +169,24 @@
     /*! 
      *
      */
+/*
     virtual CORBA::Boolean set_organization_property(const SDOPackage::OrganizationProperty& organization_property)
     {
       return false;
     }
+*/
 		
     /*! 
      *
      */
+    virtual CORBA::Boolean add_organization_property(const SDOPackage::OrganizationProperty& organization_property)
+    {
+      return false;
+    }
+		
+    /*! 
+     *
+     */
     virtual CORBA::Boolean set_organization_property_value(const char* name, const CORBA::Any& value)
     {
       return false;