diff options
| author | Bernard Normier <bernard@zeroc.com> | 2015-11-13 18:27:27 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2015-11-13 18:27:27 -0500 |
| commit | 8b9fe38d25f95060c4b14b11bf7526682b938a61 (patch) | |
| tree | 572c29de973b3d36c33510cf013f7792d3f50c31 | |
| parent | Moved Freeze to its own repository (diff) | |
| download | ice-8b9fe38d25f95060c4b14b11bf7526682b938a61.tar.bz2 ice-8b9fe38d25f95060c4b14b11bf7526682b938a61.tar.xz ice-8b9fe38d25f95060c4b14b11bf7526682b938a61.zip | |
Moved AbstractMutex and Cache
from IceUtil to Freeze
104 files changed, 278 insertions, 1658 deletions
diff --git a/cpp/include/IceUtil/AbstractMutex.h b/cpp/include/IceUtil/AbstractMutex.h deleted file mode 100644 index 02221b35b0e..00000000000 --- a/cpp/include/IceUtil/AbstractMutex.h +++ /dev/null @@ -1,119 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef ICE_UTIL_ABSTRACT_MUTEX_H -#define ICE_UTIL_ABSTRACT_MUTEX_H - -#include <IceUtil/Config.h> -#include <IceUtil/Lock.h> - - -namespace IceUtil -{ - -class ICE_UTIL_API AbstractMutex -{ -public: - - typedef LockT<AbstractMutex> Lock; - typedef TryLockT<AbstractMutex> TryLock; - - virtual ~AbstractMutex() - { - } - - virtual void lock() const = 0; - virtual void unlock() const = 0; - virtual bool tryLock() const = 0; -}; - -template <typename T> -class AbstractMutexI : public AbstractMutex, public T -{ -public: - - typedef LockT<AbstractMutexI> Lock; - typedef TryLockT<AbstractMutexI> TryLock; - - virtual void lock() const - { - T::lock(); - } - - virtual void unlock() const - { - T::unlock(); - } - - virtual bool tryLock() const - { - return T::tryLock(); - } - - virtual ~AbstractMutexI() - {} -}; - -template <typename T> -class AbstractMutexReadI : public AbstractMutex, public T -{ -public: - - typedef LockT<AbstractMutexReadI> Lock; - typedef TryLockT<AbstractMutexReadI> TryLock; - - virtual void lock() const - { - T::readLock(); - } - - virtual void unlock() const - { - T::unlock(); - } - - virtual bool tryLock() const - { - return T::tryReadLock(); - } - - virtual ~AbstractMutexReadI() - {} -}; - -template <typename T> -class AbstractMutexWriteI : public AbstractMutex, public T -{ -public: - - typedef LockT<AbstractMutexWriteI> Lock; - typedef TryLockT<AbstractMutexWriteI> TryLock; - - virtual void lock() const - { - T::writeLock(); - } - - virtual void unlock() const - { - T::unlock(); - } - - virtual bool tryLock() const - { - return T::tryWriteLock(); - } - - virtual ~AbstractMutexWriteI() - {} -}; - -} - -#endif diff --git a/cpp/include/IceUtil/Cache.h b/cpp/include/IceUtil/Cache.h deleted file mode 100644 index cb76f4466e0..00000000000 --- a/cpp/include/IceUtil/Cache.h +++ /dev/null @@ -1,362 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef ICE_UTIL_CACHE_H -#define ICE_UTIL_CACHE_H - -#include <IceUtil/Handle.h> -#include <IceUtil/Mutex.h> -#include <IceUtil/CountDownLatch.h> -#include <map> - -namespace IceUtil -{ - -// -// An abstraction to efficiently populate a Cache, without holding -// a lock while loading from a database. -// - -template<typename Key, typename Value> -class Cache -{ -public: - - // - // Latch and CacheValue are implementation details; - // application code should not use them. - // - - struct Latch : public IceUtilInternal::CountDownLatch - { - Latch() : - IceUtilInternal::CountDownLatch(1), - useCount(0) - { - } - int useCount; - }; - - struct CacheValue - { - CacheValue(const Handle<Value>& o) : - obj(o), - latch(0) - { - } - - Handle<Value> obj; - Latch* latch; - }; - - typedef typename std::map<Key, CacheValue>::iterator Position; - - Handle<Value> getIfPinned(const Key&, bool = false) const; - - void unpin(Position); - - void clear(); - size_t size() const; - - bool pin(const Key&, const Handle<Value>&); - - Handle<Value> pin(const Key&); - Handle<Value> putIfAbsent(const Key&, const Handle<Value>&); - -protected: - - virtual Handle<Value> load(const Key&) = 0; - - virtual void pinned(const Handle<Value>&, Position) - { - } - - virtual ~Cache() - { - } - -private: - - Handle<Value> pinImpl(const Key&, const Handle<Value>&); - - typedef std::map<Key, CacheValue> CacheMap; - - Mutex _mutex; - CacheMap _map; -}; - - -template<typename Key, typename Value> Handle<Value> -Cache<Key, Value>::getIfPinned(const Key& key, bool wait) const -{ - Mutex::Lock sync(_mutex); - - for(;;) - { - typename CacheMap::const_iterator p = _map.find(key); - if(p != _map.end()) - { - Handle<Value> result = (*p).second.obj; - if(result != 0 || wait == false) - { - return result; - } - - // - // The object is being loaded: we wait - // - - if(p->second.latch == 0) - { - const_cast<CacheValue&>(p->second).latch = new Latch; - } - - Latch* latch = p->second.latch; - ++latch->useCount; - sync.release(); - latch->await(); - sync.acquire(); - if(--latch->useCount == 0) - { - delete latch; - } - // - // Try again - // - } - else - { - return 0; - } - } -} - -template<typename Key, typename Value> void -Cache<Key, Value>::unpin(typename Cache::Position p) -{ - // - // There is no risk to erase a 'being loaded' position, - // since such position never got outside yet! - // - Mutex::Lock sync(_mutex); - _map.erase(p); -} - -template<typename Key, typename Value> void -Cache<Key, Value>::clear() -{ - // - // Not safe during a pin! - // - Mutex::Lock sync(_mutex); - _map.clear(); -} - -template<typename Key, typename Value> size_t -Cache<Key, Value>::size() const -{ - Mutex::Lock sync(_mutex); - return _map.size(); -} - -template<typename Key, typename Value> bool -Cache<Key, Value>::pin(const Key& key, const Handle<Value>& obj) -{ - Mutex::Lock sync(_mutex); - std::pair<typename CacheMap::iterator, bool> ir = -#ifdef _MSC_VER - _map.insert(CacheMap::value_type(key, CacheValue(obj))); -#else - _map.insert(typename CacheMap::value_type(key, CacheValue(obj))); -#endif - - if(ir.second) - { - pinned(obj, ir.first); - } - return ir.second; -} - -template<typename Key, typename Value> Handle<Value> -Cache<Key, Value>::pin(const Key& key) -{ - return pinImpl(key, 0); -} - -template<typename Key, typename Value> Handle<Value> -Cache<Key, Value>::putIfAbsent(const Key& key, const Handle<Value>& obj) -{ - return pinImpl(key, obj); -} - -template<typename Key, typename Value> Handle<Value> -Cache<Key, Value>::pinImpl(const Key& key, const Handle<Value>& newObj) -{ - Latch* latch = 0; - Position p; - - do - { - { - Mutex::Lock sync(_mutex); - - // - // Clean up latch from previous loop - // - if(latch != 0) - { - if(--latch->useCount == 0) - { - delete latch; - } - latch = 0; - } - - std::pair<typename CacheMap::iterator, bool> ir = -#if defined(_MSC_VER) - _map.insert(CacheMap::value_type(key, CacheValue(0))); -#else - _map.insert(typename CacheMap::value_type(key, CacheValue(0))); -#endif - - if(ir.second == false) - { - CacheValue& val = ir.first->second; - if(val.obj != 0) - { - return val.obj; - } - - // - // Otherwise wait - // - if(val.latch == 0) - { - // - // The first queued thread creates the latch - // - val.latch = new Latch; - } - latch = val.latch; - latch->useCount++; - } - - p = ir.first; - } - - if(latch != 0) - { - // - // Note: only the threads owning a "useCount" wait; upon wake-up, - // they loop back, release this useCount and possibly delete the latch - // - - latch->await(); - - // - // p could be stale now, e.g. some other thread pinned and unpinned the - // object while we were waiting. - // So start over. - } - } while(latch != 0); - - - // - // Load - // - Handle<Value> obj; - try - { - obj = load(key); - } - catch(...) - { - Mutex::Lock sync(_mutex); - latch = p->second.latch; - p->second.latch = 0; - _map.erase(p); - if(latch != 0) - { - // - // It is necessary to call countDown() within the sync - // because countDown may not be atomic, and we don't - // want the "await" thread to delete the latch while - // this thread is still in countDown(). - // - assert(latch->getCount() == 1); - latch->countDown(); - } - throw; - } - - Mutex::Lock sync(_mutex); - - // - // p is still valid here -- nobody knows about it. See also unpin(). - // - latch = p->second.latch; - p->second.latch = 0; - - try - { - if(obj != 0) - { - p->second.obj = obj; - pinned(obj, p); - } - else - { - if(newObj == 0) - { - // - // pin() did not find the object - // - - // - // The waiting threads will have to call load() to see by themselves. - // - _map.erase(p); - } - else - { - // - // putIfAbsent() inserts key/newObj - // - p->second.obj = newObj; - pinned(newObj, p); - } - } - } - catch(...) - { - if(latch != 0) - { - // - // Must be called within sync; see ->countDown() note above. - // - assert(latch->getCount() == 1); - latch->countDown(); - } - throw; - } - - if(latch != 0) - { - // - // Must be called within sync; see ->countDown() note above. - // - assert(latch->getCount() == 1); - latch->countDown(); - } - return obj; -} - -} - -#endif diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h index f0c91dc095a..4759a8f0fbf 100644 --- a/cpp/include/IceUtil/IceUtil.h +++ b/cpp/include/IceUtil/IceUtil.h @@ -18,8 +18,6 @@ // #include <IceUtil/Config.h> -#include <IceUtil/AbstractMutex.h> -#include <IceUtil/Cache.h> #include <IceUtil/Cond.h> #if !defined(__APPLE__) && !defined(ICE_OS_WINRT) # include <IceUtil/CtrlCHandler.h> diff --git a/cpp/src/Glacier2/.depend.mak b/cpp/src/Glacier2/.depend.mak index ef62a1c8c41..d4a270c603d 100755 --- a/cpp/src/Glacier2/.depend.mak +++ b/cpp/src/Glacier2/.depend.mak @@ -451,9 +451,6 @@ FilterManager.obj: \ "$(includedir)\Ice\FacetMap.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\IceUtil\RecMutex.h" \ diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak index 14c358c1ed2..e2a6aa1d08e 100755 --- a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak +++ b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak @@ -75,9 +75,6 @@ CryptPermissionsVerifierI.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\Config.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\IceUtil\RecMutex.h" \ diff --git a/cpp/src/Glacier2Lib/.depend.mak b/cpp/src/Glacier2Lib/.depend.mak index 86d87da9935..76443d62b0c 100755 --- a/cpp/src/Glacier2Lib/.depend.mak +++ b/cpp/src/Glacier2Lib/.depend.mak @@ -162,9 +162,6 @@ Application.obj: \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -424,12 +421,10 @@ SessionHelper.obj: \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ + "$(includedir)\IceUtil\CountDownLatch.h" \ Metrics.obj: \ Metrics.cpp \ diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp index 7ce2d2c3eb9..9ace9e5c682 100644 --- a/cpp/src/Glacier2Lib/SessionHelper.cpp +++ b/cpp/src/Glacier2Lib/SessionHelper.cpp @@ -10,6 +10,7 @@ #include <Glacier2/SessionHelper.h> #include <IceUtil/IceUtil.h> +#include <IceUtil/CountdownLatch.h> #include <Ice/Ice.h> #include <algorithm> // required by max diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak index 2e7434e1645..00b45064bf5 100755 --- a/cpp/src/Ice/.depend.mak +++ b/cpp/src/Ice/.depend.mak @@ -7475,18 +7475,15 @@ StringConverterPlugin.obj: \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\Thread.h" \ diff --git a/cpp/src/IceDiscovery/.depend.mak b/cpp/src/IceDiscovery/.depend.mak index c198faca95c..f948e02cb91 100755 --- a/cpp/src/IceDiscovery/.depend.mak +++ b/cpp/src/IceDiscovery/.depend.mak @@ -202,20 +202,17 @@ PluginI.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/src/IceGrid/.depend.mak b/cpp/src/IceGrid/.depend.mak index 343e1fda9a0..deb4df90340 100755 --- a/cpp/src/IceGrid/.depend.mak +++ b/cpp/src/IceGrid/.depend.mak @@ -657,20 +657,17 @@ Parser.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -3185,9 +3182,6 @@ AdapterCache.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -3314,9 +3308,6 @@ AdminCallbackRouter.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -3499,9 +3490,6 @@ AdminI.obj: \ "SessionServantManager.h" \ "AdminCallbackRouter.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "NodeSessionI.h" \ @@ -3658,9 +3646,6 @@ AdminSessionI.obj: \ "SessionServantManager.h" \ "AdminCallbackRouter.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "Topics.h" \ @@ -3818,9 +3803,6 @@ Allocatable.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -3966,9 +3948,6 @@ AllocatableObjectCache.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -4535,9 +4514,6 @@ LocatorI.obj: \ "SessionServantManager.h" \ "AdminCallbackRouter.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -4844,9 +4820,6 @@ NodeCache.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\UUID.h" \ "NodeSessionI.h" \ @@ -5166,9 +5139,6 @@ ObjectCache.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -5894,9 +5864,6 @@ RegistryI.obj: \ "SessionServantManager.h" \ "AdminCallbackRouter.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "AdminSessionI.h" \ "InternalRegistryI.h" \ @@ -6493,9 +6460,6 @@ ServerCache.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\UUID.h" \ "DescriptorHelper.h" \ @@ -6635,9 +6599,6 @@ SessionI.obj: \ "SessionServantManager.h" \ "AdminCallbackRouter.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "QueryI.h" \ @@ -6799,9 +6760,6 @@ SessionServantManager.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\Glacier2\Session.h" \ diff --git a/cpp/src/IceLocatorDiscovery/.depend.mak b/cpp/src/IceLocatorDiscovery/.depend.mak index f1487dcdf54..02e8062654f 100755 --- a/cpp/src/IceLocatorDiscovery/.depend.mak +++ b/cpp/src/IceLocatorDiscovery/.depend.mak @@ -10,20 +10,17 @@ PluginI.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/src/IcePatch2Lib/.depend.mak b/cpp/src/IcePatch2Lib/.depend.mak index dbf4cbd9d70..0cb1b3dd19b 100755 --- a/cpp/src/IcePatch2Lib/.depend.mak +++ b/cpp/src/IcePatch2Lib/.depend.mak @@ -142,20 +142,17 @@ Util.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/src/IceStorm/.depend.mak b/cpp/src/IceStorm/.depend.mak index beb72d0c62f..e1aabecdb24 100755 --- a/cpp/src/IceStorm/.depend.mak +++ b/cpp/src/IceStorm/.depend.mak @@ -216,9 +216,6 @@ Instance.obj: \ "TraceLevels.h" \ "Observers.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -345,20 +342,17 @@ NodeI.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -606,9 +600,6 @@ Observers.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -771,9 +762,6 @@ Service.obj: \ "$(includedir)\IceBox\Config.h" \ "Observers.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\UUID.h" \ "TraceLevels.h" \ @@ -923,9 +911,6 @@ Subscriber.obj: \ "TraceLevels.h" \ "NodeI.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\UUID.h" \ "Replica.h" \ @@ -1069,9 +1054,6 @@ TopicI.obj: \ "TraceLevels.h" \ "NodeI.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\UUID.h" \ "Replica.h" \ @@ -1217,9 +1199,6 @@ TopicManagerI.obj: \ "Instance.h" \ "NodeI.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\UUID.h" \ "Observers.h" \ diff --git a/cpp/src/IceUtil/.depend.mak b/cpp/src/IceUtil/.depend.mak index 53033f5f33b..9fa906c7214 100755 --- a/cpp/src/IceUtil/.depend.mak +++ b/cpp/src/IceUtil/.depend.mak @@ -126,7 +126,6 @@ RecMutex.obj: \ "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ SHA1.obj: \ SHA1.cpp \ diff --git a/cpp/src/IceUtil/RecMutex.cpp b/cpp/src/IceUtil/RecMutex.cpp index c963a6eb801..84b2f9181ff 100644 --- a/cpp/src/IceUtil/RecMutex.cpp +++ b/cpp/src/IceUtil/RecMutex.cpp @@ -10,12 +10,6 @@ #include <IceUtil/RecMutex.h> #include <IceUtil/Exception.h> -// -// AbstractMutex isn't used anywhere in IceUtil, we include it here -// to give the compiler a chance to export the class symbols. -// -#include <IceUtil/AbstractMutex.h> - using namespace std; IceUtil::RecMutex::RecMutex() : diff --git a/cpp/src/Slice/.depend.mak b/cpp/src/Slice/.depend.mak index ec4dcc11448..c7d45a19d88 100755 --- a/cpp/src/Slice/.depend.mak +++ b/cpp/src/Slice/.depend.mak @@ -132,18 +132,15 @@ PythonUtil.obj: \ "$(includedir)\Slice\Util.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -162,20 +159,17 @@ Python.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/src/iceserviceinstall/.depend.mak b/cpp/src/iceserviceinstall/.depend.mak index d925400fb05..d33f2323c71 100755 --- a/cpp/src/iceserviceinstall/.depend.mak +++ b/cpp/src/iceserviceinstall/.depend.mak @@ -122,9 +122,6 @@ ServiceInstaller.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -256,8 +253,5 @@ Install.obj: \ "$(includedir)\IceUtil\RecMutex.h" \ "ServiceInstaller.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/src/slice2php/.depend.mak b/cpp/src/slice2php/.depend.mak index d3fe6d6ca23..d3fa4d874ed 100755 --- a/cpp/src/slice2php/.depend.mak +++ b/cpp/src/slice2php/.depend.mak @@ -7,18 +7,15 @@ Main.obj: \ "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/test/Glacier2/attack/.depend.mak b/cpp/test/Glacier2/attack/.depend.mak index e17c02e9c72..25a7a30ba59 100755 --- a/cpp/test/Glacier2/attack/.depend.mak +++ b/cpp/test/Glacier2/attack/.depend.mak @@ -334,9 +334,6 @@ Client.obj: \ "Backend.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Glacier2/dynamicFiltering/.depend.mak b/cpp/test/Glacier2/dynamicFiltering/.depend.mak index d590f95b299..24c200acff3 100755 --- a/cpp/test/Glacier2/dynamicFiltering/.depend.mak +++ b/cpp/test/Glacier2/dynamicFiltering/.depend.mak @@ -219,9 +219,6 @@ Client.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Glacier2/override/.depend.mak b/cpp/test/Glacier2/override/.depend.mak index 16eec6259c0..c7120ea0b7c 100755 --- a/cpp/test/Glacier2/override/.depend.mak +++ b/cpp/test/Glacier2/override/.depend.mak @@ -207,9 +207,6 @@ CallbackI.obj: \ "Callback.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -219,20 +216,17 @@ Client.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/test/Glacier2/router/.depend.mak b/cpp/test/Glacier2/router/.depend.mak index 44103b909cd..aaf929f4593 100755 --- a/cpp/test/Glacier2/router/.depend.mak +++ b/cpp/test/Glacier2/router/.depend.mak @@ -209,9 +209,6 @@ CallbackI.obj: \ "Callback.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -223,19 +220,16 @@ Client.obj: \ "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/test/Glacier2/sessionControl/.depend.mak b/cpp/test/Glacier2/sessionControl/.depend.mak index 03ba1ae2b8e..5d29af9b3a0 100755 --- a/cpp/test/Glacier2/sessionControl/.depend.mak +++ b/cpp/test/Glacier2/sessionControl/.depend.mak @@ -220,9 +220,6 @@ Client.obj: \ "Session.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -483,9 +480,6 @@ SessionI.obj: \ "$(includedir)\Glacier2\Config.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Glacier2/sessionHelper/.depend.mak b/cpp/test/Glacier2/sessionHelper/.depend.mak index ef70b07fd07..94f0e71b2d8 100755 --- a/cpp/test/Glacier2/sessionHelper/.depend.mak +++ b/cpp/test/Glacier2/sessionHelper/.depend.mak @@ -87,20 +87,17 @@ Client.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -227,20 +224,17 @@ Server.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/test/Glacier2/ssl/.depend.mak b/cpp/test/Glacier2/ssl/.depend.mak index c77036deb9a..a3d5d447710 100755 --- a/cpp/test/Glacier2/ssl/.depend.mak +++ b/cpp/test/Glacier2/ssl/.depend.mak @@ -127,9 +127,6 @@ Client.obj: \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -261,9 +258,6 @@ Server.obj: \ "$(includedir)\Glacier2\Session.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Glacier2/staticFiltering/.depend.mak b/cpp/test/Glacier2/staticFiltering/.depend.mak index f6511d78820..0c59777e763 100755 --- a/cpp/test/Glacier2/staticFiltering/.depend.mak +++ b/cpp/test/Glacier2/staticFiltering/.depend.mak @@ -333,9 +333,6 @@ Client.obj: \ "Backend.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/acm/.depend.mak b/cpp/test/Ice/acm/.depend.mak index 68988959ed5..80524069778 100755 --- a/cpp/test/Ice/acm/.depend.mak +++ b/cpp/test/Ice/acm/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -334,9 +331,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -347,20 +341,17 @@ TestI.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -596,9 +587,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/adapterDeactivation/.depend.mak b/cpp/test/Ice/adapterDeactivation/.depend.mak index 7c52e0f66df..3fba0b9bd5a 100755 --- a/cpp/test/Ice/adapterDeactivation/.depend.mak +++ b/cpp/test/Ice/adapterDeactivation/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -334,9 +331,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -347,20 +341,17 @@ TestI.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -597,9 +588,6 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -730,9 +718,6 @@ Server.obj: \ "ServantLocatorI.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -861,9 +846,6 @@ Collocated.obj: \ "ServantLocatorI.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/admin/.depend.mak b/cpp/test/Ice/admin/.depend.mak index b61f5242d66..06a7e889e45 100755 --- a/cpp/test/Ice/admin/.depend.mak +++ b/cpp/test/Ice/admin/.depend.mak @@ -209,9 +209,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -340,9 +337,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -598,9 +592,6 @@ Server.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/ami/.depend.mak b/cpp/test/Ice/ami/.depend.mak index a440098417b..f9e651d5545 100755 --- a/cpp/test/Ice/ami/.depend.mak +++ b/cpp/test/Ice/ami/.depend.mak @@ -210,9 +210,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -342,9 +339,6 @@ AllTests.obj: \ "$(includedir)\IceUtil\Random.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -597,9 +591,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -729,9 +720,6 @@ Collocated.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/background/.depend.mak b/cpp/test/Ice/background/.depend.mak index 772b382cfef..15a6b85c5df 100755 --- a/cpp/test/Ice/background/.depend.mak +++ b/cpp/test/Ice/background/.depend.mak @@ -91,20 +91,17 @@ Configuration.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -187,18 +184,15 @@ Connector.obj: \ "Configuration.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -361,9 +355,6 @@ Acceptor.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "Configuration.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -456,9 +447,6 @@ EndpointI.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "Configuration.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -556,9 +544,6 @@ Transceiver.obj: \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "Configuration.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -659,9 +644,6 @@ EndpointFactory.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "Configuration.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -759,9 +741,6 @@ PluginI.obj: \ "PluginI.h" \ "Configuration.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -900,9 +879,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -921,20 +897,17 @@ AllTests.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -1131,9 +1104,6 @@ TestI.obj: \ "$(includedir)\Ice\Endpoint.h" \ "Configuration.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -1321,9 +1291,6 @@ Server.obj: \ "Test.h" \ "Configuration.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/binding/.depend.mak b/cpp/test/Ice/binding/.depend.mak index 495bed31d21..cb2d0107ae0 100755 --- a/cpp/test/Ice/binding/.depend.mak +++ b/cpp/test/Ice/binding/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -335,9 +332,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -590,9 +584,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/checksum/.depend.mak b/cpp/test/Ice/checksum/.depend.mak index 23e334021df..14cb5bb9697 100755 --- a/cpp/test/Ice/checksum/.depend.mak +++ b/cpp/test/Ice/checksum/.depend.mak @@ -291,9 +291,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -422,9 +419,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/checksum/server/.depend.mak b/cpp/test/Ice/checksum/server/.depend.mak index a10e7c8ee42..97ad822df9e 100755 --- a/cpp/test/Ice/checksum/server/.depend.mak +++ b/cpp/test/Ice/checksum/server/.depend.mak @@ -417,9 +417,6 @@ Server.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/custom/.depend.mak b/cpp/test/Ice/custom/.depend.mak index 1a35d8dcb0c..faef600cfab 100755 --- a/cpp/test/Ice/custom/.depend.mak +++ b/cpp/test/Ice/custom/.depend.mak @@ -342,9 +342,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -478,9 +475,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -832,9 +826,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1383,9 +1374,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1522,9 +1510,6 @@ Collocated.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/defaultServant/.depend.mak b/cpp/test/Ice/defaultServant/.depend.mak index b3f5167248f..24709959dce 100755 --- a/cpp/test/Ice/defaultServant/.depend.mak +++ b/cpp/test/Ice/defaultServant/.depend.mak @@ -327,9 +327,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -458,9 +455,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/defaultValue/.depend.mak b/cpp/test/Ice/defaultValue/.depend.mak index e49c4b044af..05055be438d 100755 --- a/cpp/test/Ice/defaultValue/.depend.mak +++ b/cpp/test/Ice/defaultValue/.depend.mak @@ -205,9 +205,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -336,9 +333,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/dispatcher/.depend.mak b/cpp/test/Ice/dispatcher/.depend.mak index e1d04c0796e..7a554e0119e 100755 --- a/cpp/test/Ice/dispatcher/.depend.mak +++ b/cpp/test/Ice/dispatcher/.depend.mak @@ -208,9 +208,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -341,9 +338,6 @@ AllTests.obj: \ "$(includedir)\IceUtil\Random.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -387,9 +381,6 @@ Dispatcher.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -525,9 +516,6 @@ TestI.obj: \ "Dispatcher.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -657,9 +645,6 @@ Server.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -788,9 +773,6 @@ Collocated.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/echo/.depend.mak b/cpp/test/Ice/echo/.depend.mak index dd37ea2c556..788529b791c 100755 --- a/cpp/test/Ice/echo/.depend.mak +++ b/cpp/test/Ice/echo/.depend.mak @@ -326,9 +326,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/enums/.depend.mak b/cpp/test/Ice/enums/.depend.mak index aebad322861..bc9acb90c91 100755 --- a/cpp/test/Ice/enums/.depend.mak +++ b/cpp/test/Ice/enums/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -334,9 +331,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -589,9 +583,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/exceptions/.depend.mak b/cpp/test/Ice/exceptions/.depend.mak index 404e060d594..0bbe33d23ea 100755 --- a/cpp/test/Ice/exceptions/.depend.mak +++ b/cpp/test/Ice/exceptions/.depend.mak @@ -284,9 +284,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -415,9 +412,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -548,9 +542,6 @@ TestI.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -678,9 +669,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -893,9 +881,6 @@ TestAMDI.obj: \ "TestAMD.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1023,9 +1008,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1155,9 +1137,6 @@ Collocated.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/facets/.depend.mak b/cpp/test/Ice/facets/.depend.mak index d06cc792c60..ceff27f3ac2 100755 --- a/cpp/test/Ice/facets/.depend.mak +++ b/cpp/test/Ice/facets/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -333,9 +330,6 @@ AllTests.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -589,9 +583,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -721,9 +712,6 @@ Collocated.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/faultTolerance/.depend.mak b/cpp/test/Ice/faultTolerance/.depend.mak index 091bee3ae5a..623670c29e2 100755 --- a/cpp/test/Ice/faultTolerance/.depend.mak +++ b/cpp/test/Ice/faultTolerance/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -334,9 +331,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/gc/.depend.mak b/cpp/test/Ice/gc/.depend.mak index dd991570c10..400bae8da2f 100755 --- a/cpp/test/Ice/gc/.depend.mak +++ b/cpp/test/Ice/gc/.depend.mak @@ -206,9 +206,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/hash/.depend.mak b/cpp/test/Ice/hash/.depend.mak index 7812a9b3f7d..16250fd0f9b 100755 --- a/cpp/test/Ice/hash/.depend.mak +++ b/cpp/test/Ice/hash/.depend.mak @@ -207,9 +207,6 @@ Client.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/hold/.depend.mak b/cpp/test/Ice/hold/.depend.mak index ad6057ff0ec..b5cc13a034d 100755 --- a/cpp/test/Ice/hold/.depend.mak +++ b/cpp/test/Ice/hold/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -335,9 +332,6 @@ AllTests.obj: \ "$(includedir)\IceUtil\Random.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -465,9 +459,6 @@ TestI.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -598,9 +589,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/info/.depend.mak b/cpp/test/Ice/info/.depend.mak index 48c3d132a1c..d27c1ffb66c 100755 --- a/cpp/test/Ice/info/.depend.mak +++ b/cpp/test/Ice/info/.depend.mak @@ -213,9 +213,6 @@ TestI.obj: \ "$(includedir)\IceSSL\EndpointInfo.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -345,9 +342,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -481,9 +475,6 @@ AllTests.obj: \ "$(includedir)\IceSSL\EndpointInfo.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -613,9 +604,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/inheritance/.depend.mak b/cpp/test/Ice/inheritance/.depend.mak index 03566acb454..d142abc4ef8 100755 --- a/cpp/test/Ice/inheritance/.depend.mak +++ b/cpp/test/Ice/inheritance/.depend.mak @@ -205,9 +205,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -336,9 +333,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -591,9 +585,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -723,9 +714,6 @@ Collocated.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/interceptor/.depend.mak b/cpp/test/Ice/interceptor/.depend.mak index 2e6941c1834..c0afe11efaf 100755 --- a/cpp/test/Ice/interceptor/.depend.mak +++ b/cpp/test/Ice/interceptor/.depend.mak @@ -125,9 +125,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -259,9 +256,6 @@ InterceptorI.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -393,9 +387,6 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -527,9 +518,6 @@ MyObjectI.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/invoke/.depend.mak b/cpp/test/Ice/invoke/.depend.mak index a376709129a..13749586535 100755 --- a/cpp/test/Ice/invoke/.depend.mak +++ b/cpp/test/Ice/invoke/.depend.mak @@ -205,9 +205,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -336,9 +333,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -469,9 +463,6 @@ BlobjectI.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -599,9 +590,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/location/.depend.mak b/cpp/test/Ice/location/.depend.mak index 3c972a14767..60da4595b9b 100755 --- a/cpp/test/Ice/location/.depend.mak +++ b/cpp/test/Ice/location/.depend.mak @@ -211,9 +211,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -341,9 +338,6 @@ AllTests.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -598,9 +592,6 @@ ServerLocator.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -732,9 +723,6 @@ Server.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/logger/.depend.mak b/cpp/test/Ice/logger/.depend.mak index 0e32a66d573..7075e5fc98e 100755 --- a/cpp/test/Ice/logger/.depend.mak +++ b/cpp/test/Ice/logger/.depend.mak @@ -122,9 +122,6 @@ Client1.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -252,9 +249,6 @@ Client2.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -382,9 +376,6 @@ Client3.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -512,9 +503,6 @@ Client4.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/metrics/.depend.mak b/cpp/test/Ice/metrics/.depend.mak index 78b605beecf..4d48ae21728 100755 --- a/cpp/test/Ice/metrics/.depend.mak +++ b/cpp/test/Ice/metrics/.depend.mak @@ -208,9 +208,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -340,9 +337,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -596,9 +590,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -933,9 +924,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1065,9 +1053,6 @@ Collocated.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/networkProxy/.depend.mak b/cpp/test/Ice/networkProxy/.depend.mak index b0790ac6f34..5ea151ca1a6 100755 --- a/cpp/test/Ice/networkProxy/.depend.mak +++ b/cpp/test/Ice/networkProxy/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -334,9 +331,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -465,9 +459,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/objects/.depend.mak b/cpp/test/Ice/objects/.depend.mak index 7233f599e53..c845ec47617 100755 --- a/cpp/test/Ice/objects/.depend.mak +++ b/cpp/test/Ice/objects/.depend.mak @@ -329,9 +329,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -461,9 +458,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -592,9 +586,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -724,9 +715,6 @@ Collocated.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/operations/.depend.mak b/cpp/test/Ice/operations/.depend.mak index a7bfced55fa..d10167dde9f 100755 --- a/cpp/test/Ice/operations/.depend.mak +++ b/cpp/test/Ice/operations/.depend.mak @@ -218,9 +218,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -349,9 +346,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -480,9 +474,6 @@ Twoways.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -611,9 +602,6 @@ Oneways.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -742,9 +730,6 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -873,9 +858,6 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1004,9 +986,6 @@ BatchOneways.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1135,9 +1114,6 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1265,9 +1241,6 @@ TestI.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1398,9 +1371,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1613,9 +1583,6 @@ TestAMDI.obj: \ "TestAMD.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1743,9 +1710,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1875,9 +1839,6 @@ Collocated.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/optional/.depend.mak b/cpp/test/Ice/optional/.depend.mak index b40de61d879..f6c19062c23 100755 --- a/cpp/test/Ice/optional/.depend.mak +++ b/cpp/test/Ice/optional/.depend.mak @@ -380,9 +380,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -514,9 +511,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -647,9 +641,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1033,9 +1024,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/plugin/.depend.mak b/cpp/test/Ice/plugin/.depend.mak index dbeb1d16cf3..533ca1adef5 100755 --- a/cpp/test/Ice/plugin/.depend.mak +++ b/cpp/test/Ice/plugin/.depend.mak @@ -122,9 +122,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -252,9 +249,6 @@ Plugin.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/properties/.depend.mak b/cpp/test/Ice/properties/.depend.mak index 13a65bb2e47..13e5e3347b1 100755 --- a/cpp/test/Ice/properties/.depend.mak +++ b/cpp/test/Ice/properties/.depend.mak @@ -122,9 +122,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/proxy/.depend.mak b/cpp/test/Ice/proxy/.depend.mak index 2d86b798f09..4b298f8f995 100755 --- a/cpp/test/Ice/proxy/.depend.mak +++ b/cpp/test/Ice/proxy/.depend.mak @@ -216,9 +216,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -347,9 +344,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -480,9 +474,6 @@ TestI.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -610,9 +601,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -823,9 +811,6 @@ TestAMDI.obj: \ "TestAMD.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -953,9 +938,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1085,9 +1067,6 @@ Collocated.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/retry/.depend.mak b/cpp/test/Ice/retry/.depend.mak index 8b941ac7584..dc709470a7f 100755 --- a/cpp/test/Ice/retry/.depend.mak +++ b/cpp/test/Ice/retry/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -335,9 +332,6 @@ InstrumentationI.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -465,9 +459,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -723,9 +714,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -855,9 +843,6 @@ Collocated.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/servantLocator/.depend.mak b/cpp/test/Ice/servantLocator/.depend.mak index 0846f79ade8..6fa2f15c7e6 100755 --- a/cpp/test/Ice/servantLocator/.depend.mak +++ b/cpp/test/Ice/servantLocator/.depend.mak @@ -208,9 +208,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -339,9 +336,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -352,20 +346,17 @@ TestI.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -603,9 +594,6 @@ ServantLocatorI.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -734,9 +722,6 @@ Server.obj: \ "ServantLocatorI.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -829,20 +814,17 @@ TestAMDI.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -1079,9 +1061,6 @@ ServerAMD.obj: \ "ServantLocatorI.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1212,9 +1191,6 @@ Collocated.obj: \ "ServantLocatorI.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/services/.depend.mak b/cpp/test/Ice/services/.depend.mak index 89a16e56e7a..a730edad423 100755 --- a/cpp/test/Ice/services/.depend.mak +++ b/cpp/test/Ice/services/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -359,9 +356,6 @@ AllTests.obj: \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/slicing/exceptions/.depend.mak b/cpp/test/Ice/slicing/exceptions/.depend.mak index 43095bfd674..6147ee954dc 100755 --- a/cpp/test/Ice/slicing/exceptions/.depend.mak +++ b/cpp/test/Ice/slicing/exceptions/.depend.mak @@ -221,9 +221,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -434,9 +431,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -651,9 +645,6 @@ TestI.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -784,9 +775,6 @@ Server.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1082,9 +1070,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1215,9 +1200,6 @@ ServerAMD.obj: \ "TestAMD.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/slicing/objects/.depend.mak b/cpp/test/Ice/slicing/objects/.depend.mak index d271076d636..aa4ed1ef281 100755 --- a/cpp/test/Ice/slicing/objects/.depend.mak +++ b/cpp/test/Ice/slicing/objects/.depend.mak @@ -308,9 +308,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -440,9 +437,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -739,9 +733,6 @@ TestI.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -873,9 +864,6 @@ Server.obj: \ "Forward.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1172,9 +1160,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -1306,9 +1291,6 @@ ServerAMD.obj: \ "Forward.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/stream/.depend.mak b/cpp/test/Ice/stream/.depend.mak index b1ce5bc8998..c6421b8e608 100755 --- a/cpp/test/Ice/stream/.depend.mak +++ b/cpp/test/Ice/stream/.depend.mak @@ -207,9 +207,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/stringConverter/.depend.mak b/cpp/test/Ice/stringConverter/.depend.mak index be426383681..c2fb276f381 100755 --- a/cpp/test/Ice/stringConverter/.depend.mak +++ b/cpp/test/Ice/stringConverter/.depend.mak @@ -205,9 +205,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -336,9 +333,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/threadPoolPriority/.depend.mak b/cpp/test/Ice/threadPoolPriority/.depend.mak index 79824121126..b9d72e1a44f 100755 --- a/cpp/test/Ice/threadPoolPriority/.depend.mak +++ b/cpp/test/Ice/threadPoolPriority/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -334,9 +331,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -591,9 +585,6 @@ Server.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -723,9 +714,6 @@ ServerCustomThreadPool.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/timeout/.depend.mak b/cpp/test/Ice/timeout/.depend.mak index 03b35bd640c..92d9520a9a2 100755 --- a/cpp/test/Ice/timeout/.depend.mak +++ b/cpp/test/Ice/timeout/.depend.mak @@ -327,9 +327,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -458,9 +455,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -590,9 +584,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Ice/udp/.depend.mak b/cpp/test/Ice/udp/.depend.mak index 8a8d46e0bd9..8f46119d3e3 100755 --- a/cpp/test/Ice/udp/.depend.mak +++ b/cpp/test/Ice/udp/.depend.mak @@ -204,9 +204,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -335,9 +332,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -348,20 +342,17 @@ TestI.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -597,9 +588,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceBox/admin/.depend.mak b/cpp/test/IceBox/admin/.depend.mak index d03894dd451..79c202fc823 100755 --- a/cpp/test/IceBox/admin/.depend.mak +++ b/cpp/test/IceBox/admin/.depend.mak @@ -208,9 +208,6 @@ Client.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -340,9 +337,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceBox/configuration/.depend.mak b/cpp/test/IceBox/configuration/.depend.mak index 9e149d7ae5a..34f47b79af2 100755 --- a/cpp/test/IceBox/configuration/.depend.mak +++ b/cpp/test/IceBox/configuration/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -335,9 +332,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceDiscovery/simple/.depend.mak b/cpp/test/IceDiscovery/simple/.depend.mak index 68988959ed5..80524069778 100755 --- a/cpp/test/IceDiscovery/simple/.depend.mak +++ b/cpp/test/IceDiscovery/simple/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -334,9 +331,6 @@ AllTests.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -347,20 +341,17 @@ TestI.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -596,9 +587,6 @@ Server.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceGrid/activation/.depend.mak b/cpp/test/IceGrid/activation/.depend.mak index 63798c9c31c..c25c47f7c1a 100755 --- a/cpp/test/IceGrid/activation/.depend.mak +++ b/cpp/test/IceGrid/activation/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -350,9 +347,6 @@ AllTests.obj: \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceGrid/allocation/.depend.mak b/cpp/test/IceGrid/allocation/.depend.mak index a7df8c0a792..4275667d41a 100755 --- a/cpp/test/IceGrid/allocation/.depend.mak +++ b/cpp/test/IceGrid/allocation/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -353,9 +350,6 @@ AllTests.obj: \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -610,9 +604,6 @@ Server.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceGrid/deployer/.depend.mak b/cpp/test/IceGrid/deployer/.depend.mak index 5d872bbf83b..89051ba24d9 100755 --- a/cpp/test/IceGrid/deployer/.depend.mak +++ b/cpp/test/IceGrid/deployer/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -350,9 +347,6 @@ AllTests.obj: \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -608,9 +602,6 @@ Server.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceGrid/distribution/.depend.mak b/cpp/test/IceGrid/distribution/.depend.mak index 53df2de6aa4..2211a51b3f7 100755 --- a/cpp/test/IceGrid/distribution/.depend.mak +++ b/cpp/test/IceGrid/distribution/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -350,9 +347,6 @@ AllTests.obj: \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -607,9 +601,6 @@ Server.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceGrid/noRestartUpdate/.depend.mak b/cpp/test/IceGrid/noRestartUpdate/.depend.mak index 9a7847a18c1..99e8541d697 100755 --- a/cpp/test/IceGrid/noRestartUpdate/.depend.mak +++ b/cpp/test/IceGrid/noRestartUpdate/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -350,9 +347,6 @@ AllTests.obj: \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -607,9 +601,6 @@ Server.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceGrid/replicaGroup/.depend.mak b/cpp/test/IceGrid/replicaGroup/.depend.mak index 251d89d58d4..b77a53a08c5 100755 --- a/cpp/test/IceGrid/replicaGroup/.depend.mak +++ b/cpp/test/IceGrid/replicaGroup/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -350,9 +347,6 @@ AllTests.obj: \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -607,9 +601,6 @@ Server.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceGrid/replication/.depend.mak b/cpp/test/IceGrid/replication/.depend.mak index b58d8e383ed..69d02294086 100755 --- a/cpp/test/IceGrid/replication/.depend.mak +++ b/cpp/test/IceGrid/replication/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -350,9 +347,6 @@ AllTests.obj: \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -607,9 +601,6 @@ Server.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceGrid/session/.depend.mak b/cpp/test/IceGrid/session/.depend.mak index addfe07c1e4..ba646e88178 100755 --- a/cpp/test/IceGrid/session/.depend.mak +++ b/cpp/test/IceGrid/session/.depend.mak @@ -212,9 +212,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -360,9 +357,6 @@ AllTests.obj: \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -497,9 +491,6 @@ Server.obj: \ "$(includedir)\IceSSL\ConnectionInfo.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceGrid/simple/.depend.mak b/cpp/test/IceGrid/simple/.depend.mak index c007d84ae45..fbaf06d7aa7 100755 --- a/cpp/test/IceGrid/simple/.depend.mak +++ b/cpp/test/IceGrid/simple/.depend.mak @@ -202,9 +202,6 @@ Client.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -216,20 +213,17 @@ AllTests.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/test/IceGrid/update/.depend.mak b/cpp/test/IceGrid/update/.depend.mak index 53df2de6aa4..2211a51b3f7 100755 --- a/cpp/test/IceGrid/update/.depend.mak +++ b/cpp/test/IceGrid/update/.depend.mak @@ -203,9 +203,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -350,9 +347,6 @@ AllTests.obj: \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -607,9 +601,6 @@ Server.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceSSL/configuration/.depend.mak b/cpp/test/IceSSL/configuration/.depend.mak index 31b970d0ba6..9229e4a5d73 100755 --- a/cpp/test/IceSSL/configuration/.depend.mak +++ b/cpp/test/IceSSL/configuration/.depend.mak @@ -333,9 +333,6 @@ AllTests.obj: \ "$(includedir)\IceSSL\ConnectionInfo.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -466,9 +463,6 @@ TestI.obj: \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceStorm/federation/.depend.mak b/cpp/test/IceStorm/federation/.depend.mak index 45305fd520a..51c9a594753 100755 --- a/cpp/test/IceStorm/federation/.depend.mak +++ b/cpp/test/IceStorm/federation/.depend.mak @@ -333,9 +333,6 @@ Subscriber.obj: \ "Event.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceStorm/federation2/.depend.mak b/cpp/test/IceStorm/federation2/.depend.mak index 61a7e3a547b..0a36fff01d3 100755 --- a/cpp/test/IceStorm/federation2/.depend.mak +++ b/cpp/test/IceStorm/federation2/.depend.mak @@ -85,20 +85,17 @@ Publisher.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -341,9 +338,6 @@ Subscriber.obj: \ "Event.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceStorm/rep1/.depend.mak b/cpp/test/IceStorm/rep1/.depend.mak index 5229e9772e4..883aade2386 100755 --- a/cpp/test/IceStorm/rep1/.depend.mak +++ b/cpp/test/IceStorm/rep1/.depend.mak @@ -204,9 +204,6 @@ Publisher.obj: \ "$(includedir)\IceUtil\Options.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\UUID.h" \ "$(includedir)\IceStorm\IceStorm.h" \ @@ -219,20 +216,17 @@ Subscriber.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -354,20 +348,17 @@ Sub.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/test/IceStorm/repgrid/.depend.mak b/cpp/test/IceStorm/repgrid/.depend.mak index f644c834629..adda0464171 100755 --- a/cpp/test/IceStorm/repgrid/.depend.mak +++ b/cpp/test/IceStorm/repgrid/.depend.mak @@ -207,9 +207,6 @@ Client.obj: \ "Single.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceStorm/repstress/.depend.mak b/cpp/test/IceStorm/repstress/.depend.mak index 429ada3f233..f1fe645ff9d 100755 --- a/cpp/test/IceStorm/repstress/.depend.mak +++ b/cpp/test/IceStorm/repstress/.depend.mak @@ -283,9 +283,6 @@ Publisher.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -300,20 +297,17 @@ Subscriber.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/test/IceStorm/single/.depend.mak b/cpp/test/IceStorm/single/.depend.mak index 19202f5106d..50560f88fee 100755 --- a/cpp/test/IceStorm/single/.depend.mak +++ b/cpp/test/IceStorm/single/.depend.mak @@ -333,9 +333,6 @@ Subscriber.obj: \ "Single.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceStorm/stress/.depend.mak b/cpp/test/IceStorm/stress/.depend.mak index 2ea7e09fae1..bacf31b965e 100755 --- a/cpp/test/IceStorm/stress/.depend.mak +++ b/cpp/test/IceStorm/stress/.depend.mak @@ -338,8 +338,5 @@ Subscriber.obj: \ "Event.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/IceUtil/ctrlCHandler/.depend.mak b/cpp/test/IceUtil/ctrlCHandler/.depend.mak index c9bb0858b21..381e9ad5970 100755 --- a/cpp/test/IceUtil/ctrlCHandler/.depend.mak +++ b/cpp/test/IceUtil/ctrlCHandler/.depend.mak @@ -5,20 +5,17 @@ Client.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/test/IceUtil/inputUtil/.depend.mak b/cpp/test/IceUtil/inputUtil/.depend.mak index 6eb3e48a374..09f6d4cb005 100755 --- a/cpp/test/IceUtil/inputUtil/.depend.mak +++ b/cpp/test/IceUtil/inputUtil/.depend.mak @@ -17,14 +17,11 @@ Client.obj: \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\StringConverter.h" \ diff --git a/cpp/test/IceUtil/priority/.depend.mak b/cpp/test/IceUtil/priority/.depend.mak index 55f200ac689..3f84c156582 100755 --- a/cpp/test/IceUtil/priority/.depend.mak +++ b/cpp/test/IceUtil/priority/.depend.mak @@ -4,20 +4,17 @@ TestBase.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -36,20 +33,17 @@ ThreadPriority.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -70,20 +64,17 @@ TimerPriority.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -120,9 +111,6 @@ PriorityInversion.obj: \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -152,20 +140,17 @@ Client.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/test/IceUtil/sha1/.depend.mak b/cpp/test/IceUtil/sha1/.depend.mak index 36607b823f5..33f64399c32 100755 --- a/cpp/test/IceUtil/sha1/.depend.mak +++ b/cpp/test/IceUtil/sha1/.depend.mak @@ -7,20 +7,17 @@ Client.obj: \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/test/IceUtil/stacktrace/.depend.mak b/cpp/test/IceUtil/stacktrace/.depend.mak index 8c0a7bbb278..9e9adc30c3b 100755 --- a/cpp/test/IceUtil/stacktrace/.depend.mak +++ b/cpp/test/IceUtil/stacktrace/.depend.mak @@ -6,20 +6,17 @@ Client.obj: \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/test/IceUtil/thread/.depend.mak b/cpp/test/IceUtil/thread/.depend.mak index 67d74d65ee2..bf931e49016 100755 --- a/cpp/test/IceUtil/thread/.depend.mak +++ b/cpp/test/IceUtil/thread/.depend.mak @@ -4,20 +4,17 @@ TestBase.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -36,20 +33,17 @@ CreateTest.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -70,20 +64,17 @@ AliveTest.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -104,20 +95,17 @@ StartTest.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -138,20 +126,17 @@ SleepTest.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -172,20 +157,17 @@ RecMutexTest.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -206,20 +188,17 @@ MutexTest.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -240,20 +219,17 @@ MonitorMutexTest.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -274,20 +250,17 @@ MonitorRecMutexTest.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -308,20 +281,17 @@ CountDownLatchTest.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ @@ -333,6 +303,7 @@ CountDownLatchTest.obj: \ "$(includedir)\IceUtil\UUID.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\IceUtil\CountDownLatch.h" \ "CountDownLatchTest.h" \ "TestBase.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -361,20 +332,17 @@ Client.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/test/IceUtil/thread/CountDownLatchTest.cpp b/cpp/test/IceUtil/thread/CountDownLatchTest.cpp index 7fd859e4644..76728f76777 100644 --- a/cpp/test/IceUtil/thread/CountDownLatchTest.cpp +++ b/cpp/test/IceUtil/thread/CountDownLatchTest.cpp @@ -8,6 +8,7 @@ // ********************************************************************** #include <IceUtil/IceUtil.h> +#include <IceUtil/CountDownLatch.h> #include <CountDownLatchTest.h> #include <TestCommon.h> diff --git a/cpp/test/IceUtil/timer/.depend.mak b/cpp/test/IceUtil/timer/.depend.mak index daad3b71c1d..826edcaf24a 100755 --- a/cpp/test/IceUtil/timer/.depend.mak +++ b/cpp/test/IceUtil/timer/.depend.mak @@ -18,9 +18,6 @@ Client.obj: \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ diff --git a/cpp/test/IceUtil/unicode/.depend.mak b/cpp/test/IceUtil/unicode/.depend.mak index 763ea5b6257..7a408da63ca 100755 --- a/cpp/test/IceUtil/unicode/.depend.mak +++ b/cpp/test/IceUtil/unicode/.depend.mak @@ -4,20 +4,17 @@ Client.obj: \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ diff --git a/cpp/test/IceUtil/uuid/.depend.mak b/cpp/test/IceUtil/uuid/.depend.mak index a19fa8aabc9..30a26b9e94b 100755 --- a/cpp/test/IceUtil/uuid/.depend.mak +++ b/cpp/test/IceUtil/uuid/.depend.mak @@ -18,9 +18,6 @@ Client.obj: \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\Functional.h" \ diff --git a/cpp/test/Slice/keyword/.depend.mak b/cpp/test/Slice/keyword/.depend.mak index 99ec9336297..ca8ae1f5bbd 100755 --- a/cpp/test/Slice/keyword/.depend.mak +++ b/cpp/test/Slice/keyword/.depend.mak @@ -207,9 +207,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Slice/macros/.depend.mak b/cpp/test/Slice/macros/.depend.mak index f610eb91620..0392268cd73 100755 --- a/cpp/test/Slice/macros/.depend.mak +++ b/cpp/test/Slice/macros/.depend.mak @@ -205,9 +205,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ diff --git a/cpp/test/Slice/structure/.depend.mak b/cpp/test/Slice/structure/.depend.mak index 123b3891b93..bde39630d82 100755 --- a/cpp/test/Slice/structure/.depend.mak +++ b/cpp/test/Slice/structure/.depend.mak @@ -272,9 +272,6 @@ Client.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ |