From 93089a4261e38469f41b9665df67209d760928f9 Mon Sep 17 00:00:00 2001 From: dimitr Date: Wed, 16 Nov 2011 17:41:27 +0000 Subject: [PATCH] Misc. --- src/jrd/GlobalRWLock.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/jrd/GlobalRWLock.cpp b/src/jrd/GlobalRWLock.cpp index 175ec4093d..178bd10b5d 100644 --- a/src/jrd/GlobalRWLock.cpp +++ b/src/jrd/GlobalRWLock.cpp @@ -44,8 +44,9 @@ IMPLEMENT_TRACE_ROUTINE(cos_trace, "COS") #endif +using namespace Firebird; +using namespace Jrd; -namespace Jrd { int GlobalRWLock::blocking_ast_cached_lock(void* ast_object) { @@ -57,12 +58,12 @@ int GlobalRWLock::blocking_ast_cached_lock(void* ast_object) AsyncContextHolder tdbb(dbb); - Firebird::MutexLockGuard counterGuard(globalRWLock->counterMutex); + MutexLockGuard counterGuard(globalRWLock->counterMutex); if (globalRWLock->cachedLock) globalRWLock->blockingAstHandler(tdbb); } - catch (const Firebird::Exception&) + catch (const Exception&) {} // no-op return 0; @@ -253,7 +254,7 @@ bool GlobalRWLock::lockRead(thread_db* tdbb, SSHORT wait, const bool queueJump) if (!pendingLock) break; - Firebird::MutexUnlockGuard cout(counterMutex); + MutexUnlockGuard cout(counterMutex); Attachment::Checkout attCout(att, true); THD_yield(); } @@ -356,6 +357,3 @@ void GlobalRWLock::blockingAstHandler(thread_db* tdbb) blocking = true; } } - - -} // namespace Jrd