diff options
author | Cory Fields <cory-nospam-@coryfields.com> | 2014-12-19 16:50:15 -0500 |
---|---|---|
committer | Cory Fields <cory-nospam-@coryfields.com> | 2015-01-02 15:12:03 -0500 |
commit | 856e862f4a736fbdc38daae3b7f0fa34e1da317c (patch) | |
tree | 2095eef431d539acfef432321aa82fa6062219fa /src/test | |
parent | 9b1ab860ff00180142d9e514f3e1b6a91c86df7a (diff) |
namespace: drop most boost namespaces and a few header cleanups
A few boost::asio were left around because they're very wordy otherwise.
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/bloom_tests.cpp | 1 | ||||
-rw-r--r-- | src/test/script_tests.cpp | 7 | ||||
-rw-r--r-- | src/test/transaction_tests.cpp | 3 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp index c32098efa0..98a2cbc92f 100644 --- a/src/test/bloom_tests.cpp +++ b/src/test/bloom_tests.cpp @@ -20,7 +20,6 @@ #include <boost/tuple/tuple.hpp> using namespace std; -using namespace boost::tuples; BOOST_AUTO_TEST_SUITE(bloom_tests) diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 4d2a9aff45..a5c6a21f4b 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -23,12 +23,6 @@ #include <string> #include <vector> -#include <boost/algorithm/string/classification.hpp> -#include <boost/algorithm/string/predicate.hpp> -#include <boost/algorithm/string/replace.hpp> -#include <boost/algorithm/string/split.hpp> -#include <boost/filesystem/operations.hpp> -#include <boost/filesystem/path.hpp> #include <boost/foreach.hpp> #include <boost/test/unit_test.hpp> #include "json/json_spirit_reader_template.h" @@ -37,7 +31,6 @@ using namespace std; using namespace json_spirit; -using namespace boost::algorithm; // Uncomment if you want to output updated JSON tests. // #define UPDATE_JSON_TESTS diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index 2594f89ac3..48386994af 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -24,7 +24,6 @@ using namespace std; using namespace json_spirit; -using namespace boost::algorithm; // In script_tests.cpp extern Array read_json(const std::string& jsondata); @@ -47,7 +46,7 @@ unsigned int ParseScriptFlags(string strFlags) } unsigned int flags = 0; vector<string> words; - split(words, strFlags, is_any_of(",")); + boost::algorithm::split(words, strFlags, boost::algorithm::is_any_of(",")); BOOST_FOREACH(string word, words) { |