diff options
author | Antony Woods <acron1@gmail.com> | 2013-10-29 08:40:31 +0000 |
---|---|---|
committer | Antony Woods <acron1@gmail.com> | 2013-10-29 08:40:31 +0000 |
commit | bdccd70f7041425d0740fe155bf6d6f6a0cd46bd (patch) | |
tree | 3cf581941ac931249f59896f77076115ba7641e2 | |
parent | 58cae243738c77acf9b3722804ee96a0f68d7b9a (diff) |
Removed boost namespace from tests so they compile
-rw-r--r-- | entityx/Entity_test.cc | 3 | ||||
-rw-r--r-- | entityx/System_test.cc | 3 | ||||
-rw-r--r-- | entityx/tags/TagsComponent_test.cc | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/entityx/Entity_test.cc b/entityx/Entity_test.cc index 0f277a8..c4fdc64 100644 --- a/entityx/Entity_test.cc +++ b/entityx/Entity_test.cc @@ -16,8 +16,7 @@ #include <gtest/gtest.h>
#include "entityx/Entity.h"
-// using namespace std; // This will give name space conflicts with boost
-using namespace boost;
+// using namespace std;
using namespace entityx;
using std::ostream;
diff --git a/entityx/System_test.cc b/entityx/System_test.cc index 75ae6e7..269328a 100644 --- a/entityx/System_test.cc +++ b/entityx/System_test.cc @@ -15,8 +15,7 @@ #include "entityx/System.h"
-// using namespace std; // This will give name space conflicts with boost
-using namespace boost;
+// using namespace std;
using namespace entityx;
using std::string;
diff --git a/entityx/tags/TagsComponent_test.cc b/entityx/tags/TagsComponent_test.cc index 387c3a5..87b99b9 100644 --- a/entityx/tags/TagsComponent_test.cc +++ b/entityx/tags/TagsComponent_test.cc @@ -12,7 +12,6 @@ #include "entityx/tags/TagsComponent.h"
using namespace std;
-using namespace boost;
using namespace entityx;
using namespace entityx::tags;
|