From 5ebd0dcf5a968354ccf7776f60e804398f986938 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sun, 1 Feb 2009 01:01:44 +0100 Subject: [PATCH] WIP fix namespace --- src/backend/thread-wrapper.hpp | 4 ++-- src/gui/guistart.cpp | 2 +- tests/lib/subsystem-runner-test.cpp | 2 +- tests/lib/thread-wrapper-join-test.cpp | 10 +++++----- tests/lib/thread-wrapper-test.cpp | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/backend/thread-wrapper.hpp b/src/backend/thread-wrapper.hpp index 75aec7f61..635602a97 100644 --- a/src/backend/thread-wrapper.hpp +++ b/src/backend/thread-wrapper.hpp @@ -36,7 +36,7 @@ extern "C" { #include -namespace lib { +namespace backend { using std::tr1::bind; using std::tr1::function; @@ -226,5 +226,5 @@ namespace lib { - } // namespace lib + } // namespace backend #endif diff --git a/src/gui/guistart.cpp b/src/gui/guistart.cpp index d220d8264..bb6793ecc 100644 --- a/src/gui/guistart.cpp +++ b/src/gui/guistart.cpp @@ -67,7 +67,7 @@ extern "C" { using std::string; -using lib::Thread; +using backend::Thread; using std::tr1::bind; using lumiera::Subsys; using lumiera::error::LUMIERA_ERROR_STATE; diff --git a/tests/lib/subsystem-runner-test.cpp b/tests/lib/subsystem-runner-test.cpp index 99d1fd11f..648b32d0c 100644 --- a/tests/lib/subsystem-runner-test.cpp +++ b/tests/lib/subsystem-runner-test.cpp @@ -43,7 +43,7 @@ using util::cStr; using test::Test; using lib::Sync; using lib::RecursiveLock_Waitable; -using lib::Thread; +using backend::Thread; namespace lumiera { diff --git a/tests/lib/thread-wrapper-join-test.cpp b/tests/lib/thread-wrapper-join-test.cpp index 5c87e3a65..9ced9c4b3 100644 --- a/tests/lib/thread-wrapper-join-test.cpp +++ b/tests/lib/thread-wrapper-join-test.cpp @@ -35,15 +35,15 @@ using test::Test; -namespace lib { - namespace test { +namespace backend { + namespace test { /************************************************************************** * @test use the Lumiera backend to create some new threads, additionally * passing an condition variable for waiting on thread termination. * Actually this is implemented as creating and passing a JoinHandle. * - * @see lib::Thread + * @see backend::Thread * @see threads.h */ class ThreadWrapperJoin_test : public Test @@ -62,7 +62,7 @@ namespace lib { void theAction (int secretValue) ///< to be run in a new thread... { - usleep (100000); // pause 100ms prior to modifying + usleep (100000); // pause 100ms prior to modifying aValue_ = secretValue+42; } @@ -138,4 +138,4 @@ namespace lib { } // namespace test -} // namespace lib +} // namespace backend diff --git a/tests/lib/thread-wrapper-test.cpp b/tests/lib/thread-wrapper-test.cpp index 4d08150ed..9c66b4145 100644 --- a/tests/lib/thread-wrapper-test.cpp +++ b/tests/lib/thread-wrapper-test.cpp @@ -34,8 +34,8 @@ using test::Test; -namespace lib { - namespace test { +namespace backend { + namespace test { namespace { // private test classes and data... @@ -86,7 +86,7 @@ namespace lib { * lumiera::Thread wrapper for binding to an arbitrary operation * and passing the appropriate context. * - * @see lib::Thread + * @see backend::Thread * @see threads.h */ class ThreadWrapper_test : public Test @@ -116,4 +116,4 @@ namespace lib { } // namespace test -} // namespace lib +} // namespace backend