[Orxonox-commit 6353] r11010 - in code/branches/cpp11_v2/src: . libraries/core libraries/core/config libraries/util modules/overlays/stats orxonox

[muemart at orxonox.net]

Author: muemart
Date: 2015-12-31 17:11:22 +0100 (Thu, 31 Dec 2015)
New Revision: 11010

Modified:
   code/branches/cpp11_v2/src/OrxonoxConfig.h.in
   code/branches/cpp11_v2/src/libraries/core/CorePrereqs.h
   code/branches/cpp11_v2/src/libraries/core/config/ConfigFileSection.h
   code/branches/cpp11_v2/src/libraries/util/UtilPrereqs.h
   code/branches/cpp11_v2/src/modules/overlays/stats/CreateLines.h
   code/branches/cpp11_v2/src/orxonox/Main.h
Log:
Remove std::string forward declaration, conflicted with new libstdc++

Modified: code/branches/cpp11_v2/src/OrxonoxConfig.h.in
===================================================================
--- code/branches/cpp11_v2/src/OrxonoxConfig.h.in	2015-12-31 13:23:59 UTC (rev 11009)
+++ code/branches/cpp11_v2/src/OrxonoxConfig.h.in	2015-12-31 16:11:22 UTC (rev 11010)
@@ -206,15 +206,6 @@
 #  define ORXONOX_RELEASE
 #endif
 
-// Forward declare the everywhere used std::string
-namespace std
-{
-    template<class _Elem> struct char_traits;
-    template<class _Ty>   class  allocator;
-    template<class _Elem, class _Traits, class _Ax> class basic_string;
-    typedef basic_string<char, char_traits<char>, allocator<char>> string;
-}
-
 // Define Boost Filesystem version
 #include <boost/version.hpp>
 #ifndef BOOST_FILESYSTEM_VERSION

Modified: code/branches/cpp11_v2/src/libraries/core/CorePrereqs.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/CorePrereqs.h	2015-12-31 13:23:59 UTC (rev 11009)
+++ code/branches/cpp11_v2/src/libraries/core/CorePrereqs.h	2015-12-31 16:11:22 UTC (rev 11010)
@@ -37,6 +37,7 @@
 
 #include "OrxonoxConfig.h"
 #include <boost/version.hpp>
+#include <string>
 
 //-----------------------------------------------------------------------
 // Shared library settings

Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFileSection.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFileSection.h	2015-12-31 13:23:59 UTC (rev 11009)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileSection.h	2015-12-31 16:11:22 UTC (rev 11010)
@@ -38,6 +38,7 @@
 
 #include <string>
 #include <list>
+#include "util/StringUtils.h"
 #include "ConfigFileEntry.h"
 
 namespace orxonox

Modified: code/branches/cpp11_v2/src/libraries/util/UtilPrereqs.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/UtilPrereqs.h	2015-12-31 13:23:59 UTC (rev 11009)
+++ code/branches/cpp11_v2/src/libraries/util/UtilPrereqs.h	2015-12-31 16:11:22 UTC (rev 11010)
@@ -36,6 +36,7 @@
 #define _UtilPrereqs_H__
 
 #include "OrxonoxConfig.h"
+#include <string>
 
 //-----------------------------------------------------------------------
 // Shared library settings

Modified: code/branches/cpp11_v2/src/modules/overlays/stats/CreateLines.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/stats/CreateLines.h	2015-12-31 13:23:59 UTC (rev 11009)
+++ code/branches/cpp11_v2/src/modules/overlays/stats/CreateLines.h	2015-12-31 16:11:22 UTC (rev 11010)
@@ -29,6 +29,8 @@
 
 #include "overlays/OverlaysPrereqs.h"
 
+#include <string>
+
 namespace orxonox
 {
     class _OverlaysExport CreateLines

Modified: code/branches/cpp11_v2/src/orxonox/Main.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/Main.h	2015-12-31 13:23:59 UTC (rev 11009)
+++ code/branches/cpp11_v2/src/orxonox/Main.h	2015-12-31 16:11:22 UTC (rev 11010)
@@ -32,6 +32,8 @@
 
 #include "OrxonoxPrereqs.h"
 
+#include <string>
+
 namespace orxonox
 {
     _OrxonoxExport int main(const std::string& strCmdLine);