Remove the remaining obsolete Zthread code Part3 Really this time.

--HG--
branch : trunk

1 files changed, 0 insertions, 290 deletions

diff --git a/dep/include/zthread/CountedPtr.h b/dep/include/zthread/CountedPtr.h
deleted file mode 100644
index c94392398e2..00000000000
--- a/dep/include/zthread/CountedPtr.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * Copyright (c) 2005, Eric Crahen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#ifndef __ZTCOUNTEDPTR_H__
-#define __ZTCOUNTEDPTR_H__
-
-#include <algorithm>
-#include <cassert>
-
-#include "zthread/AtomicCount.h"
-
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4786)  // warning: long template symbol name
-# pragma warning(push)
-# pragma warning(disable:4284)  // warning: odd return type for operator->
-#endif
-
-namespace ZThread {
-
-  /**
-   * @class CountedPtr
-   *
-   * @author Eric Crahen <http://www.code-foo.com/>
-   * @date <2003-07-29T06:43:48-0400>
-   * @version 2.3.0
-   *
-   */
-  template <typename T, typename CountT = AtomicCount>
-    class CountedPtr {
-
-#if !defined(__MWERKS__)
-#if !defined(_MSC_VER) || (_MSC_VER > 1200)
-      template <typename U, typename V> friend class CountedPtr;
-#endif
-#endif
-
-      CountT* _count;
-      T*  _instance;
-
-      public:
-
-      CountedPtr() : _count(0), _instance(0) { }
-
-#if !defined(__MWERKS__)
-#if !defined(_MSC_VER) || (_MSC_VER > 1200)
-
-      explicit CountedPtr(T* raw) : _count(new CountT()), _instance(raw) {
-        (*_count)++;
-      }
-
-#endif
-#endif
-
-      template <typename U>
-      explicit CountedPtr(U* raw) : _count(new CountT()), _instance(raw) {
-        (*_count)++;
-      }
-
-#if !defined(__MWERKS__)
-#if !defined(_MSC_VER) || (_MSC_VER > 1200)
-
-      CountedPtr(const CountedPtr& ptr) : _count(ptr._count), _instance(ptr._instance) {
-
-        if(_count)
-          (*_count)++;
-
-      }
-
-#endif
-#endif
-
-      template <typename U, typename V>
-      CountedPtr(const CountedPtr<U, V>& ptr) : _count(ptr._count), _instance(ptr._instance) {
-
-        if(_count)
-          (*_count)++;
-
-      }
-
-      ~CountedPtr() {
-
-        if(_count && --(*_count) == 0) {
-
-          if(_instance)
-            delete _instance;
-
-          delete _count;
-
-        }
-
-      }
-
-
-#if !defined(__MWERKS__)
-#if !defined(_MSC_VER) || (_MSC_VER > 1200)
-
-      const CountedPtr& operator=(const CountedPtr& ptr) {
-
-        typedef CountedPtr<T, CountT> ThisT;
-
-        ThisT(ptr).swap(*this);
-        return *this;
-
-      }
-
-#endif
-#endif
-
-      template <typename U, typename V>
-      const CountedPtr& operator=(const CountedPtr<U, V>& ptr) {
-
-        typedef CountedPtr<T, CountT> ThisT;
-
-        ThisT(ptr).swap(*this);
-        return *this;
-
-      }
-
-      void reset() {
-
-        typedef CountedPtr<T, CountT> ThisT;
-        ThisT().swap(*this);
-
-      }
-
-#if !defined(__MWERKS__)
-#if !defined(_MSC_VER) || (_MSC_VER > 1200)
-
-      void swap(CountedPtr& ptr) {
-
-        std::swap(_count, ptr._count);
-        std::swap(_instance, ptr._instance);
-
-      }
-
-#endif
-#endif
-
-      template <typename U, typename V>
-      void swap(CountedPtr<U, V>& ptr) {
-
-        std::swap(_count, ptr._count);
-        std::swap(_instance, ptr._instance);
-
-      }
-
-      // Convience operators
-
-#if !defined(__MWERKS__)
-#if !defined(_MSC_VER) || (_MSC_VER > 1200)
-
-      bool less(const CountedPtr& ptr) const {
-        return _instance < ptr._instance;
-      }
-
-#endif
-#endif
-
-      template <typename U, typename V>
-      bool less(const CountedPtr<U, V>& ptr) const {
-        return _instance < ptr._instance;
-      }
-
-
-#if !defined(__MWERKS__)
-#if !defined(_MSC_VER) || (_MSC_VER > 1200)
-
-      bool equal(const CountedPtr& ptr) const {
-        return _count == ptr._count;
-      }
-
-#endif
-#endif
-
-      template <typename U, typename V>
-      bool equal(const CountedPtr<U, V>& ptr) const {
-        return _count == ptr._count;
-      }
-
-
-      friend inline bool operator==(const CountedPtr& lhs, const CountedPtr& rhs) {
-        return lhs.equal(rhs);
-      }
-
-      friend inline bool operator<(const CountedPtr& lhs, const CountedPtr& rhs) {
-        return lhs.less(rhs);
-      }
-
-
-      T& operator*() {
-        assert(_instance != 0);
-        return *_instance;
-      }
-
-      T* operator->() {
-        assert(_instance != 0);
-        return _instance;
-      }
-
-      const T* operator->() const {
-        assert(_instance != 0);
-        return _instance;
-      }
-
-      bool operator!() const {
-        return _instance == 0;
-      }
-
-      operator bool() const {
-        return _instance != 0;
-      }
-
-    }; /* CountedPtr */
-
-  template<typename U, typename V, typename X, typename Y>
-    inline bool operator<(CountedPtr<U, V> const &lhs, CountedPtr<X, Y> const &rhs) {
-    return lhs.less(rhs);
-  }
-
-  template<typename U, typename V, typename X, typename Y>
-    inline bool operator==(CountedPtr<U, V> const &lhs, CountedPtr<X, Y> const &rhs) {
-    return lhs.equal(rhs.get);
-  }
-
-  template<typename U, typename V, typename X, typename Y>
-    inline bool operator!=(CountedPtr<U, V> const &lhs, CountedPtr<X, Y> const &rhs) {
-    return !(lhs.equal(rhs.get));
-  }
-
-  template<typename U, typename V, typename X, typename Y>
-    inline void swap(CountedPtr<U, V> const &lhs, CountedPtr<X, Y> const &rhs) {
-    lhs.swap(rhs);
-  }
-
-#if !defined(__MWERKS__)
-#if !defined(_MSC_VER) || (_MSC_VER > 1200)
-
-  template<typename U, typename V>
-    inline bool operator<(CountedPtr<U, V> const &lhs, CountedPtr<U, V> const &rhs) {
-    return lhs.less(rhs);
-  }
-
-  template<typename U, typename V>
-    inline bool operator==(CountedPtr<U, V> const &lhs, CountedPtr<U, V> const &rhs) {
-    return lhs.equal(rhs.get);
-  }
-
-  template<typename U, typename V>
-    inline bool operator!=(CountedPtr<U, V> const &lhs, CountedPtr<U, V> const &rhs) {
-    return !(lhs.equal(rhs.get));
-  }
-
-  template<typename U, typename V>
-    inline void swap(CountedPtr<U, V> const &lhs, CountedPtr<U, V> const &rhs) {
-    lhs.swap(rhs);
-  }
-
-#endif
-#endif
-
-} // namespace ZThread
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-# pragma warning(pop)
-#endif
-
-
-#endif // __ZTCOUNTEDPTR_H__
-