[openrtm-commit:01218] r2413 - in branches/RELENG_1_1/OpenRTM-aist: . examples/ConfigSample examples/SimpleIO

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2014-02-06 12:20:51 +0900 (Thu, 06 Feb 2014)
New Revision: 2413

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/examples/ConfigSample/VectorConvert.h
   branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/ConsoleIn.h
Log:
[merge] r2411-2412 has been merged from trunk.


Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409
   + /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412

Modified: branches/RELENG_1_1/OpenRTM-aist/examples/ConfigSample/VectorConvert.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/ConfigSample/VectorConvert.h	2014-02-06 03:19:47 UTC (rev 2412)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/ConfigSample/VectorConvert.h	2014-02-06 03:20:51 UTC (rev 2413)
@@ -1,26 +1,30 @@
-// -*- C++ -*-
-
-#include <istream>
-#include <ostream>
-#include <vector>
-#include <string>
-#include <coil/stringutil.h>
-
-template<typename T>
-std::istream& operator>>(std::istream& is, std::vector<T>& v)
-{
-  std::string s;
-  std::vector<std::string> sv;
-  is >> s;
-  sv = coil::split(s ,",");
-  v.resize(sv.size());
-  for (int i(0), len(sv.size()); i < len; ++i)
-    {
-      T tv;
-      if (coil::stringTo(tv, sv[i].c_str()))
-	{
-	  v[i] = tv;
-	}
-    }
-  return is;
-}
+// -*- C++ -*-
+
+#include <istream>
+#include <ostream>
+#include <vector>
+#include <string>
+#include <coil/stringutil.h>
+
+namespace std
+{
+  template<typename T>
+  std::istream& operator>>(std::istream& is, std::vector<T>& v)
+  {
+    std::string s;
+    std::vector<std::string> sv;
+    is >> s;
+    sv = coil::split(s ,",");
+    v.resize(sv.size());
+    for (int i(0), len(sv.size()); i < len; ++i)
+      {
+	T tv;
+	if (coil::stringTo(tv, sv[i].c_str()))
+	  {
+	    v[i] = tv;
+	  }
+      }
+    return is;
+  }
+}
+

Modified: branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/ConsoleIn.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/ConsoleIn.h	2014-02-06 03:19:47 UTC (rev 2412)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/ConsoleIn.h	2014-02-06 03:20:51 UTC (rev 2413)
@@ -10,12 +10,12 @@
 #ifndef CONSOLEIN_H
 #define CONSOLEIN_H
 
+#include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/Manager.h>
 #include <rtm/DataFlowComponentBase.h>
 #include <rtm/CorbaPort.h>
 #include <rtm/DataInPort.h>
 #include <rtm/DataOutPort.h>
-#include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/ConnectorListener.h>
 
 #include <iostream>