Changeset 11010

Timestamp:

Dec 31, 2015, 5:11:22 PM (8 years ago)

Author:

muemart

Message:

Remove std::string forward declaration, conflicted with new libstdc++

Location:

code/branches/cpp11_v2/src

Files:

• OrxonoxConfig.h.in (modified) (1 diff)
• libraries/core/CorePrereqs.h (modified) (1 diff)
• libraries/core/config/ConfigFileSection.h (modified) (1 diff)
• libraries/util/UtilPrereqs.h (modified) (1 diff)
• modules/overlays/stats/CreateLines.h (modified) (1 diff)
• orxonox/Main.h (modified) (1 diff)

code/branches/cpp11_v2/src/OrxonoxConfig.h.in

@@ -207 +207 @@
 #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>

code/branches/cpp11_v2/src/libraries/core/CorePrereqs.h

@@ -38 +38 @@
 #include "OrxonoxConfig.h"
 #include <boost/version.hpp>
+#include <string>
 
 //-----------------------------------------------------------------------

code/branches/cpp11_v2/src/libraries/core/config/ConfigFileSection.h

@@ -39 +39 @@
 #include <string>
 #include <list>
+#include "util/StringUtils.h"
 #include "ConfigFileEntry.h"
 

code/branches/cpp11_v2/src/libraries/util/UtilPrereqs.h

@@ -37 +37 @@
 
 #include "OrxonoxConfig.h"
+#include <string>
 
 //-----------------------------------------------------------------------

code/branches/cpp11_v2/src/modules/overlays/stats/CreateLines.h

@@ -29 +29 @@
 
 #include "overlays/OverlaysPrereqs.h"
+
+#include <string>
 
 namespace orxonox

code/branches/cpp11_v2/src/orxonox/Main.h

@@ -33 +33 @@
 #include "OrxonoxPrereqs.h"
 
+#include <string>
+
 namespace orxonox
 {