[#883, !506] fixed rebase

diff --git a/src/lib/util/lock_guard.h b/src/lib/util/lock_guard.h
index 8957f0d6c4f1377666f17983369a458bda495788..de919ab5f718ef7dcdc3e4efb1ab4996b3ea10da 100644 (file)
--- a/src/lib/util/lock_guard.h
+++ b/src/lib/util/lock_guard.h
@@ -11,7 +11,6 @@
 
 namespace isc {
 namespace util {
-namespace thread {
 
 template <typename Lock>
 class LockGuard {
@@ -38,7 +37,6 @@ private:
     Lock* lk_;
 };
 
-}  // namespace thread
 }  // namespace util
 }  // namespace isc
 

diff --git a/src/lib/util/tests/lock_guard_unittest.cc b/src/lib/util/tests/lock_guard_unittest.cc
index 617cca7ff1d710d7415232503bb6e4c84b0af50d..425a5b440b590196b0a820fed2573e991cd616fc 100644 (file)
--- a/src/lib/util/tests/lock_guard_unittest.cc
+++ b/src/lib/util/tests/lock_guard_unittest.cc
@@ -11,8 +11,6 @@
 #include <util/lock_guard.h>
 #include <exceptions/exceptions.h>
 
-#include <exceptions/exceptions.h>
-
 #include <condition_variable>
 #include <list>
 #include <mutex>
@@ -20,7 +18,6 @@
 #include <thread>
 
 using namespace isc::util;
-using namespace isc::util::thread;
 using namespace std;
 
 namespace {
@@ -161,7 +158,7 @@ private:
     std::thread::id id_;
 };
 
-/// @brief Test Fixture for testing isc::util::thread::LockGuard
+/// @brief Test Fixture for testing isc::util::LockGuard
 class LockGuardTest : public ::testing::Test {
 };