[Orxonox-commit 5603] r10265 - code/trunk/src/libraries/core

[landauf at orxonox.net]

Author: landauf
Date: 2015-02-11 23:17:57 +0100 (Wed, 11 Feb 2015)
New Revision: 10265

Modified:
   code/trunk/src/libraries/core/Loader.cc
   code/trunk/src/libraries/core/LuaState.cc
   code/trunk/src/libraries/core/LuaState.h
Log:
fixed build with older compilers (pre c++11)

Modified: code/trunk/src/libraries/core/Loader.cc
===================================================================
--- code/trunk/src/libraries/core/Loader.cc	2015-02-11 09:56:26 UTC (rev 10264)
+++ code/trunk/src/libraries/core/Loader.cc	2015-02-11 22:17:57 UTC (rev 10265)
@@ -159,7 +159,7 @@
 
         std::string xmlInput;
 
-        shared_ptr<std::vector<std::vector<std::pair<std::string, size_t>>>> lineTrace(new std::vector<std::vector<std::pair<std::string, size_t>>>());
+        shared_ptr<std::vector<std::vector<std::pair<std::string, size_t> > > > lineTrace(new std::vector<std::vector<std::pair<std::string, size_t> > >());
         lineTrace->reserve(1000); //arbitrary number
 
 
@@ -250,9 +250,9 @@
                     istr >> line;
                     if (line <= lineTrace->size())
                     {
-                        std::vector<std::pair<std::string, size_t>> linesources = lineTrace->at(line - 1);
+                        std::vector<std::pair<std::string, size_t> > linesources = lineTrace->at(line - 1);
                         orxout(user_error, context::loader) << "Line contains data from:" << endl;
-                        for (std::vector<std::pair<std::string, size_t>>::iterator it = linesources.begin(); it != linesources.end(); ++it)
+                        for (std::vector<std::pair<std::string, size_t> >::iterator it = linesources.begin(); it != linesources.end(); ++it)
                         {
                             orxout(user_error, context::loader) << it->first << " , Line " << it->second << endl;
                         }                        

Modified: code/trunk/src/libraries/core/LuaState.cc
===================================================================
--- code/trunk/src/libraries/core/LuaState.cc	2015-02-11 09:56:26 UTC (rev 10264)
+++ code/trunk/src/libraries/core/LuaState.cc	2015-02-11 22:17:57 UTC (rev 10265)
@@ -244,7 +244,7 @@
             //Add first line, which always exists
             //Note: due to newlines etc., it's possible that one line consists of parts of
             //      multiple, different files
-            std::vector<std::vector<std::pair<std::string, size_t>>>::reverse_iterator it = lineTrace_->rbegin();
+            std::vector<std::vector<std::pair<std::string, size_t> > >::reverse_iterator it = lineTrace_->rbegin();
             std::pair<std::string, size_t> temppair = std::make_pair(filename, line);
             //Avoid duplicate entries. This could happen if there were lua blocks on the same line
             if (it->size() == 0 || std::find(it->begin(), it->end(), temppair) == it->end())
@@ -258,7 +258,7 @@
             for (size_t i = 1; i <= newlinecount; i++)
             {
                 //Add the new line to the trace map
-                lineTrace_->push_back(std::vector<std::pair<std::string, size_t>>());
+                lineTrace_->push_back(std::vector<std::pair<std::string, size_t> >());
                 //Add the source of the line at the end
                 lineTrace_->rbegin()->push_back(std::make_pair(filename, line + i));
             }

Modified: code/trunk/src/libraries/core/LuaState.h
===================================================================
--- code/trunk/src/libraries/core/LuaState.h	2015-02-11 09:56:26 UTC (rev 10264)
+++ code/trunk/src/libraries/core/LuaState.h	2015-02-11 22:17:57 UTC (rev 10265)
@@ -93,8 +93,8 @@
         const std::stringstream& getOutput() const { return output_; }
         void clearOutput() { output_.clear(); } // tolua_export
 
-        void setTraceMap(shared_ptr<std::vector<std::vector<std::pair<std::string, size_t>>>> map)
-            { map->push_back(std::vector<std::pair<std::string, size_t>>()); lineTrace_ = map; }
+        void setTraceMap(shared_ptr<std::vector<std::vector<std::pair<std::string, size_t> > > > map)
+            { map->push_back(std::vector<std::pair<std::string, size_t> >()); lineTrace_ = map; }
 
         void setIncludeParser(std::string (*function)(const std::string&)) { includeParseFunction_ = function; }
         lua_State* getInternalLuaState() { return luaState_; }
@@ -115,7 +115,7 @@
 
     private:
         shared_ptr<ResourceInfo> getFileInfo(const std::string& filename);
-        shared_ptr<std::vector<std::vector<std::pair<std::string, size_t>>>> lineTrace_;
+        shared_ptr<std::vector<std::vector<std::pair<std::string, size_t> > > > lineTrace_;
         
         std::stringstream output_;
         lua_State* luaState_;