[gentoo-commits] proj/libbash:master commit in: test/

[Petteri Räty]

commit:     2a3efed81037df11a5d338503713092e3ef0237c
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Sat Apr  2 15:30:50 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 15:46:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=2a3efed8

Use std::map to simplify variable printer

std::map is sorted so we can simplify the code by just creating a map
from the unsorted_map.

---
 test/variable_printer.cpp |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/test/variable_printer.cpp b/test/variable_printer.cpp
index ab2b4cb..b519d3f 100644
--- a/test/variable_printer.cpp
+++ b/test/variable_printer.cpp
@@ -24,11 +24,9 @@
 
 #include <algorithm>
 #include <iostream>
-#include <vector>
+#include <map>
 
-#include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/for_each.hpp>
-#include <boost/range/algorithm/sort.hpp>
 #include <gtest/gtest.h>
 
 #include "libbash.h"
@@ -46,11 +44,9 @@ int main(int argc, char** argv)
   unordered_map<string, string> variables;
   libbash::interpret(argv[1], variables);
 
-  auto keys = variables | boost::adaptors::map_keys;
-  vector<string> names(keys.begin(), keys.end());
-  auto sorted = boost::sort(names);
-  boost::for_each(boost::sort(names), [&](const string& key){
-    cout << key << '=' << variables[key] << endl;
+  std::map<string, string> sorted(variables.begin(), variables.end());
+  boost::for_each(sorted, [&](const std::pair<string,string>& pair){
+    cout << pair.first << '=' << pair.second << endl;
   });
 
   return 0;