Merge. Revision history for source files should be all back now.

--HG--
branch : trunk
rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h

1 files changed, 0 insertions, 130 deletions

diff --git a/src/server/shared/Policies/ThreadingModel.h b/src/server/shared/Policies/ThreadingModel.h
deleted file mode 100644
index d4c5e9a2333..00000000000
--- a/src/server/shared/Policies/ThreadingModel.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef TRINITY_THREADINGMODEL_H
-#define TRINITY_THREADINGMODEL_H
-
-/**
- * @class ThreadingModel<T>
- *
- */
-
-#include "Platform/Define.h"
-
-namespace Trinity
-{
-    inline void Guard(void *) {}
-
-    template<typename MUTEX> class GeneralLock
-    {
-        public:
-            GeneralLock(MUTEX &m) : i_mutex(m)
-            {
-                i_mutex.acquire();
-            }
-
-            ~GeneralLock()
-            {
-                i_mutex.release();
-            }
-        private:
-            GeneralLock(const GeneralLock &);
-            GeneralLock& operator=(const GeneralLock &);
-            MUTEX &i_mutex;
-    };
-
-    template <class T>
-        class SingleThreaded
-    {
-        public:
-
-            struct Lock                                     // empty object
-            {
-                Lock() {}
-                Lock(const T &) {}
-                Lock(const SingleThreaded<T> &)             // for single threaded we ignore this
-                {
-                }
-            };
-
-            typedef T VolatileType;
-    };
-
-    // object level lockable
-    template<class T, class MUTEX>
-        class ObjectLevelLockable
-    {
-        public:
-            ObjectLevelLockable() : i_mtx() {}
-
-            friend class Lock;
-
-            class Lock
-            {
-                public:
-                    Lock(ObjectLevelLockable<T, MUTEX> &host) : i_lock(host.i_mtx)
-                    {
-                    }
-
-                private:
-                    GeneralLock<MUTEX> i_lock;
-            };
-
-            typedef volatile T VolatileType;
-
-        private:
-            // prevent the compiler creating a copy construct
-            ObjectLevelLockable(const ObjectLevelLockable<T, MUTEX> &);
-            ObjectLevelLockable<T, MUTEX>& operator=(const ObjectLevelLockable<T, MUTEX> &);
-
-            MUTEX i_mtx;
-    };
-
-    template<class T, class MUTEX>
-        class ClassLevelLockable
-    {
-        public:
-            class Lock;
-            friend class Lock;
-            typedef volatile T VolatileType;
-
-            ClassLevelLockable() {}
-
-            class Lock
-            {
-                public:
-                    Lock(T& /*host*/) { ClassLevelLockable<T, MUTEX>::si_mtx.acquire(); }
-                    Lock(ClassLevelLockable<T, MUTEX> &) { ClassLevelLockable<T, MUTEX>::si_mtx.acquire(); }
-                    Lock() { ClassLevelLockable<T, MUTEX>::si_mtx.acquire(); }
-                    ~Lock() { ClassLevelLockable<T, MUTEX>::si_mtx.release(); }
-            };
-
-        private:
-            static MUTEX si_mtx;
-    };
-
-}
-
-template<class T, class MUTEX> MUTEX Trinity::ClassLevelLockable<T, MUTEX>::si_mtx;
-
-#define INSTANTIATE_CLASS_MUTEX(CTYPE,MUTEX) \
-    template class Trinity::ClassLevelLockable<CTYPE, MUTEX >
-#endif
-