[openrtm-commit:01222] r2417 - in branches/work_ForDoil/OpenRTM-aist: . src/lib/doil src/lib/doil/ice src/lib/doil/ice/tests src/lib/doil/ice/tests/IceManager src/lib/doil/tests src/lib/doil/tests/ORBManager

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2014-02-06 23:33:10 +0900 (Thu, 06 Feb 2014)
New Revision: 2417

Modified:
   branches/work_ForDoil/OpenRTM-aist/configure.ac
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/Ice.h
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/tests/IceManager/EchoSample.h
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/tests/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/tests/TestRunner.cpp
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/ORBManager/EchoImpl.cpp
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/TestRunner.cpp
Log:
Daily work.

Modified: branches/work_ForDoil/OpenRTM-aist/configure.ac
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/configure.ac	2014-02-06 10:39:18 UTC (rev 2416)
+++ branches/work_ForDoil/OpenRTM-aist/configure.ac	2014-02-06 14:33:10 UTC (rev 2417)
@@ -1707,6 +1707,8 @@
 	src/lib/doil/utils/omniidl_be/Makefile
 	src/lib/doil/utils/omniidl_be/tests/ConfigurationProxy/Makefile
 	src/lib/doil/ice/Makefile
+	src/lib/doil/ice/tests/Makefile
+	src/lib/doil/ice/tests/IceManager/Makefile
 	src/lib/doil/tests/Makefile
 	src/lib/doil/tests/ORBManager/Makefile
 	src/lib/doil/corba/Makefile

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/Makefile.am	2014-02-06 10:39:18 UTC (rev 2416)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/Makefile.am	2014-02-06 14:33:10 UTC (rev 2417)
@@ -7,8 +7,7 @@
 
 AUTOMAKE_OPTIONS = 1.4
 
-#SUBDIRS = . utils corba ice tests
-SUBDIRS = . utils corba tests
+SUBDIRS = . utils corba ice tests
 
 AM_CPPFLAGS=-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/rtm -I$(top_srcdir)/src/lib/coil/include
 AM_LDFLAGS=-L$(top_builddir)/src/lib/doil

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/Ice.h
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/Ice.h	2014-02-06 10:39:18 UTC (rev 2416)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/Ice.h	2014-02-06 14:33:10 UTC (rev 2417)
@@ -20,6 +20,6 @@
 #define DOIL_ICE_ICE_H
 
 #include <rtm/config_rtc.h>
-//#include <Ice/Ice.h>
+#include <Ice/Ice.h>
 
 #endif // DOIL_ICE_ICE_H

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/tests/IceManager/EchoSample.h
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/tests/IceManager/EchoSample.h	2014-02-06 10:39:18 UTC (rev 2416)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/tests/IceManager/EchoSample.h	2014-02-06 14:33:10 UTC (rev 2417)
@@ -27,7 +27,7 @@
 #include <Ice/UndefSysMacros.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 302
+#   if ICE_INT_VERSION / 100 < 302
 #       error Ice version mismatch!
 #   endif
 #   if ICE_INT_VERSION % 100 > 50

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/tests/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/tests/Makefile.am	2014-02-06 10:39:18 UTC (rev 2416)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/tests/Makefile.am	2014-02-06 14:33:10 UTC (rev 2417)
@@ -5,8 +5,9 @@
 ## $Id$
 ##---------------------------------------------------------------------------
 
-SUBDIRS = \
-        IceManager
+#SUBDIRS = \
+#        IceManager
+SUBDIRS = 
 
 clean-local:
 	rm -f *~

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/tests/TestRunner.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/tests/TestRunner.cpp	2014-02-06 10:39:18 UTC (rev 2416)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/tests/TestRunner.cpp	2014-02-06 14:33:10 UTC (rev 2417)
@@ -27,6 +27,7 @@
  *
  */
 
+#include <stdlib.h>
 #include <string>
 #include <fstream>
 #include <cppunit/ui/text/TestRunner.h>

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/Makefile.am	2014-02-06 10:39:18 UTC (rev 2416)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/Makefile.am	2014-02-06 14:33:10 UTC (rev 2417)
@@ -5,9 +5,8 @@
 ## $Id$
 ##---------------------------------------------------------------------------
 
-#SUBDIRS = \
-#        ORBManager
-SUBDIRS = 
+SUBDIRS = \
+        ORBManager
 
 clean-local:
 	rm -f *~

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/ORBManager/EchoImpl.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/ORBManager/EchoImpl.cpp	2014-02-06 10:39:18 UTC (rev 2416)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/ORBManager/EchoImpl.cpp	2014-02-06 14:33:10 UTC (rev 2417)
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <doil/ImplBase.h>
 #include "EchoImpl.h"
 

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/TestRunner.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/TestRunner.cpp	2014-02-06 10:39:18 UTC (rev 2416)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/TestRunner.cpp	2014-02-06 14:33:10 UTC (rev 2417)
@@ -27,6 +27,7 @@
  *
  */
 
+#include <stdlib.h>
 #include <string>
 #include <fstream>
 #include <cppunit/ui/text/TestRunner.h>