Fixing test (cherry pick from master)

STEllAR-GROUP · Aug 6, 2017 · 1860cc2 · 1860cc2
1 parent 307c280
commit 1860cc2
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/tests/regressions/agas/duplicate_id_registration_1596.cpp b/tests/regressions/agas/duplicate_id_registration_1596.cpp
@@ -17,7 +17,7 @@
 
 using namespace std;
 
-namespace server
+namespace tests { namespace server
 {
 
 struct ViewRegistrationListener
@@ -46,23 +46,23 @@ struct ViewRegistrationListener
     string name;
 };
 
-}
+}}
 
 typedef hpx::components::simple_component<
-        server::ViewRegistrationListener
+        tests::server::ViewRegistrationListener
     > view_registration_listener_type;
 
 HPX_REGISTER_COMPONENT(
     view_registration_listener_type, ViewRegistrationListener);
 
 HPX_REGISTER_ACTION_DECLARATION(
-    server::ViewRegistrationListener::register_view_action,
+    tests::server::ViewRegistrationListener::register_view_action,
     view_registration_listener_register_view_action);
 HPX_REGISTER_ACTION(
-    server::ViewRegistrationListener::register_view_action,
+    tests::server::ViewRegistrationListener::register_view_action,
     view_registration_listener_register_view_action);
 
-namespace client
+namespace tests { namespace client
 {
 
 struct ViewRegistrationListener
@@ -93,13 +93,13 @@ struct ViewRegistrationListener
     }
 };
 
-}
+}}
 
 int hpx_main()
 {
     std::size_t num_expected_ids = 0;
     {
-        auto id = hpx::new_<server::ViewRegistrationListener>(
+        auto id = hpx::new_<tests::server::ViewRegistrationListener>(
             hpx::find_here(), string("A")).get();
         bool result = hpx::register_with_basename("Listener", id).get();
         HPX_TEST(result);
@@ -108,7 +108,7 @@ int hpx_main()
     }
 
     {
-        auto id = hpx::new_<server::ViewRegistrationListener>(
+        auto id = hpx::new_<tests::server::ViewRegistrationListener>(
             hpx::find_here(), string("B")).get();
         bool result = hpx::register_with_basename("Listener", id).get();
         HPX_TEST(!result);
@@ -117,7 +117,7 @@ int hpx_main()
     }
 
     {
-        auto id = hpx::new_<server::ViewRegistrationListener>(
+        auto id = hpx::new_<tests::server::ViewRegistrationListener>(
             hpx::find_here(), string("C")).get();
         bool result = hpx::register_with_basename("Listener", id).get();
         HPX_TEST(!result);
@@ -136,7 +136,7 @@ int hpx_main()
 
             cout << "resolved id: " << id << endl;
 
-            client::ViewRegistrationListener client(id);
+            tests::client::ViewRegistrationListener client(id);
             cout << "created client with id " << client.get_id() << endl;
 
             client.register_view();