Changeset 10265

Timestamp:

Feb 11, 2015, 11:17:57 PM (10 years ago)

Author:

landauf

Message:

fixed build with older compilers (pre c++11)

Location:

code/trunk/src/libraries/core

Files:

• Loader.cc (modified) (2 diffs)
• LuaState.cc (modified) (2 diffs)
• LuaState.h (modified) (2 diffs)

code/trunk/src/libraries/core/Loader.cc

@@ -160 +160 @@
         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
 
@@ -251 +251 @@
                     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;

code/trunk/src/libraries/core/LuaState.cc

@@ -245 +245 @@
             //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
@@ -259 +259 @@
             {
                 //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));

code/trunk/src/libraries/core/LuaState.h

@@ -94 +94 @@
         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; }
@@ -116 +116 @@
     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_;