build: Warnings correction for gcc 4.2
Also in this commit some code style corrections.
Change-Id: Idf2b5b96b328fb3dbea7440362c84d7759a10ec5
Refs: #1429
diff --git a/tests/util/test-config-file.cpp b/tests/util/test-config-file.cpp
index c091ccf..c431e19 100644
--- a/tests/util/test-config-file.cpp
+++ b/tests/util/test-config-file.cpp
@@ -4,12 +4,12 @@
* See COPYING for copyright and distribution information.
*/
-#include <boost/test/unit_test.hpp>
-
#include "util/config-file.hpp"
#include <cstdlib>
+#include "boost-test.hpp"
+
namespace ndn {
class ConfigFileFixture
diff --git a/tests/util/test-io.cpp b/tests/util/test-io.cpp
index 1e8b0bd..c3c247b 100644
--- a/tests/util/test-io.cpp
+++ b/tests/util/test-io.cpp
@@ -3,11 +3,11 @@
* See COPYING for copyright and distribution information.
*/
-#include <boost/test/unit_test.hpp>
-
#include "util/io.hpp"
#include "security/key-chain.hpp"
+#include "boost-test.hpp"
+
namespace ndn {
BOOST_AUTO_TEST_SUITE(TestIO)
diff --git a/tests/util/test-regex.cpp b/tests/util/test-regex.cpp
index b5d5903..86bad95 100644
--- a/tests/util/test-regex.cpp
+++ b/tests/util/test-regex.cpp
@@ -5,8 +5,6 @@
* See COPYING for copyright and distribution information.
*/
-#include <boost/test/unit_test.hpp>
-
#include "util/regex/regex-backref-manager.hpp"
#include "util/regex/regex-component-matcher.hpp"
#include "util/regex/regex-component-set-matcher.hpp"
@@ -16,7 +14,7 @@
#include "util/regex/regex-top-matcher.hpp"
#include "util/regex.hpp"
-#include <iostream>
+#include "boost-test.hpp"
using namespace std;
namespace ndn {
@@ -58,11 +56,11 @@
BOOST_CHECK_EQUAL(res, true);
BOOST_CHECK_EQUAL(cm->getMatchResult ().size(), 1);
BOOST_CHECK_EQUAL(cm->getMatchResult ()[0].toEscapedString(), string("a"));
-
+
res = cm->match(Name("/a/b/"), 1, 1);
BOOST_CHECK_EQUAL(res, false);
BOOST_CHECK_EQUAL(cm->getMatchResult ().size(), 0);
-
+
res = cm->match(Name("/a/b/"), 0, 2);
BOOST_CHECK_EQUAL(res, false);
BOOST_CHECK_EQUAL(cm->getMatchResult ().size(), 0);
@@ -77,12 +75,12 @@
res = cm->match(Name("/a/b/d"), 2, 1);
BOOST_CHECK_EQUAL(res, false);
BOOST_CHECK_EQUAL(cm->getMatchResult ().size(), 0);
-
+
backRef = ptr_lib::make_shared<RegexBackrefManager>();
cm = ptr_lib::make_shared<RegexComponentSetMatcher>("[^<a><b><c>]", backRef);
res = cm->match(Name("/b/d"), 1, 1);
BOOST_CHECK_EQUAL(res, true);
- BOOST_CHECK_EQUAL(cm->getMatchResult ().size(), 1);
+ BOOST_CHECK_EQUAL(cm->getMatchResult ().size(), 1);
BOOST_CHECK_EQUAL(cm->getMatchResult ()[0].toEscapedString(), string("d"));
}
@@ -229,7 +227,7 @@
BOOST_CHECK_EQUAL(cm->getMatchResult ().size(), 0);
-
+
backRef = ptr_lib::make_shared<RegexBackrefManager>();
cm = ptr_lib::make_shared<RegexRepeatMatcher>("[<a><b>]{,2}", backRef, 8);
res = cm->match(Name("/a/b/a/b/e/"), 0, 3);
diff --git a/tests/util/test-scheduler.cpp b/tests/util/test-scheduler.cpp
index 66417da..01fb18c 100644
--- a/tests/util/test-scheduler.cpp
+++ b/tests/util/test-scheduler.cpp
@@ -6,7 +6,7 @@
#include "util/scheduler.hpp"
-#include <boost/test/unit_test.hpp>
+#include "boost-test.hpp"
namespace ndn {
diff --git a/tests/util/test-time.cpp b/tests/util/test-time.cpp
index 6351bb1..9a6bf1e 100644
--- a/tests/util/test-time.cpp
+++ b/tests/util/test-time.cpp
@@ -3,10 +3,10 @@
* See COPYING for copyright and distribution information.
*/
-#include <boost/test/unit_test.hpp>
-
#include "util/time.hpp"
+#include "boost-test.hpp"
+
namespace ndn {
BOOST_AUTO_TEST_SUITE(TestTime)