Revert "Refactor code to build with VS2010"

danmar · danmar · commit a6124eec2bda · 2016-11-06T12:16:21.000+01:00
This reverts commit 2957412.
diff --git a/main.cpp b/main.cpp
@@ -54,16 +54,16 @@ int main(int argc, char **argv) {
     simplecpp::TokenList rawtokens(f,files,filename,&outputList);
     rawtokens.removeComments();
     std::map<std::string, simplecpp::TokenList*> included = simplecpp::load(rawtokens, files, dui, &outputList);
-    for (std::map<std::string, simplecpp::TokenList *>::const_iterator i = included.begin(); i!=included.end(); ++i)
-        i->second->removeComments();
+    for (std::pair<std::string, simplecpp::TokenList *> i : included)
+        i.second->removeComments();
     simplecpp::TokenList output(files);
     simplecpp::preprocess(output, rawtokens, files, included, dui, &outputList);
 
     // Output
     std::cout << output.stringify() << std::endl;
-	for (simplecpp::OutputList::const_iterator output = outputList.begin(); output!=outputList.end(); ++output) {
-        std::cerr << output->location.file() << ':' << output->location.line << ": ";
-        switch (output->type) {
+    for (const simplecpp::Output &output : outputList) {
+        std::cerr << output.location.file() << ':' << output.location.line << ": ";
+        switch (output.type) {
         case simplecpp::Output::ERROR:
             std::cerr << "#error: ";
             break;
@@ -83,7 +83,7 @@ int main(int argc, char **argv) {
             std::cerr << "portability: ";
             break;
         }
-        std::cerr << output->msg << std::endl;
+        std::cerr << output.msg << std::endl;
     }
 
     // cleanup included tokenlists
