Merge topic 'core-string' into master

7feab87c vtkOStreamWrapper: Support std::string

Common/Core/vtkOStreamWrapper.cxx

@@ -21,6 +21,8 @@
 #include "vtkObjectBase.h"
 #include "vtkSmartPointerBase.h"
 
+#include <string>
+
 #define VTKOSTREAM_OPERATOR(type) \
   vtkOStreamWrapper& vtkOStreamWrapper::operator << (type a) \
     { this->ostr << a; return *this; }
@@ -57,6 +59,7 @@ VTKOSTREAM_OPERATOR(vtkObjectBase&);
 VTKOSTREAM_OPERATOR(const vtkLargeInteger&);
 VTKOSTREAM_OPERATOR(const vtkSmartPointerBase&);
 VTKOSTREAM_OPERATOR(const vtkStdString&);
+VTKOSTREAM_OPERATOR(const std_string&);
 VTKOSTREAM_OPERATOR(const char*);
 VTKOSTREAM_OPERATOR(void*);
 VTKOSTREAM_OPERATOR(char);

Common/Core/vtkOStreamWrapper.h

@@ -41,8 +41,15 @@ class VTKCOMMONCORE_EXPORT vtkStdString;
 class vtkStdString;
 #endif
 
+namespace std
+{
+  template <typename, typename, typename> class basic_string;
+}
+
 class VTKCOMMONCORE_EXPORT vtkOStreamWrapper
 {
+  typedef std::basic_string< char, std::char_traits<char>,
+                             std::allocator<char> > std_string;
 public:
   // Description:
   // Construct class to reference a real ostream.  All methods and
@@ -65,6 +72,7 @@ public:
   vtkOStreamWrapper& operator << (const vtkLargeInteger&);
   vtkOStreamWrapper& operator << (const vtkSmartPointerBase&);
   vtkOStreamWrapper& operator << (const vtkStdString&);
+  vtkOStreamWrapper& operator << (const std_string&);
   vtkOStreamWrapper& operator << (const char*);
   vtkOStreamWrapper& operator << (void*);
   vtkOStreamWrapper& operator << (char);