Merge branch 'move_public_h_to_include' into trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@794325 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 91 deletions

diff --git a/cpp/src/qpid/sys/Mutex.h b/cpp/src/qpid/sys/Mutex.h
deleted file mode 100644
index 00bf392604..0000000000
--- a/cpp/src/qpid/sys/Mutex.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef _sys_Mutex_h
-#define _sys_Mutex_h
-
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-namespace qpid {
-namespace sys {
-
-/**
- * Scoped lock template: calls lock() in ctor, unlock() in dtor.
- * L can be any class with lock() and unlock() functions.
- */
-template <class L>
-class ScopedLock
-{
-  public:
-    ScopedLock(L& l) : mutex(l) { l.lock(); }
-    ~ScopedLock() { mutex.unlock(); }
-  private:
-    L& mutex;
-};
-
-template <class L>
-class ScopedUnlock
-{
-  public:
-    ScopedUnlock(L& l) : mutex(l) { l.unlock(); }
-    ~ScopedUnlock() { mutex.lock(); }
-  private:
-    L& mutex;
-};
-
-template <class L>
-class ScopedRlock
-{
-  public:
-    ScopedRlock(L& l) : mutex(l) { l.rlock(); }
-    ~ScopedRlock() { mutex.unlock(); }
-  private:
-    L& mutex;
-};
-
-template <class L>
-class ScopedWlock
-{
-  public:
-    ScopedWlock(L& l) : mutex(l) { l.wlock(); }
-    ~ScopedWlock() { mutex.unlock(); }
-  private:
-    L& mutex;
-};
-
-template <class L>
-class ConditionalScopedLock
-{
-  public:
-    ConditionalScopedLock(L& l) : mutex(l) { acquired = l.trylock(); }
-    ~ConditionalScopedLock() { if (acquired) mutex.unlock(); }
-    bool lockAcquired() { return acquired; }
-  private:
-    L& mutex;
-    bool acquired;
-};
-
-}}
-    
-#ifdef USE_APR_PLATFORM
-#include "apr/Mutex.h"
-#elif defined (_WIN32)
-#include "windows/Mutex.h"
-#else
-#include "posix/Mutex.h"
-#endif
-
-#endif  /*!_sys_Mutex_h*/