X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FManager.hh;h=94f07ba4862bbca8f1938bad8d8181bafe0aaad7;hp=89c20760ba984b967267bd9f966ad8587fb4d5bf;hb=0b8dbc2d02c7f78d273ad9cfdf05c927c648ffd1;hpb=81ff940d1bea07447f8218ab9a764fbf393431e8

diff --git a/src/Moof/Manager.hh b/src/Moof/Manager.hh
index 89c2076..94f07ba 100644
--- a/src/Moof/Manager.hh
+++ b/src/Moof/Manager.hh
@@ -1,46 +1,29 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _MOOF_MANAGER_HH_
 #define _MOOF_MANAGER_HH_
 
 /**
  * @file Manager.hh
- * A library is a collection of named objects of the same type.  Libraries use
- * reference counting to automagically delete objects which no longer have any
- * interested code.
+ * A library is a collection of named objects of the same type.  Libraries
+ * use reference counting to automagically delete objects which no longer
+ * have any interested code.
  */
 
 #include <string>
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Hash.hh>
+#include <Moof/HashTools.hh>
 
 
 namespace Mf {
@@ -66,7 +49,7 @@ public:
 
 private:
 
-	typedef stlplus::hash<std::string,T*,getHash> PtrMap;
+	typedef stlplus::hash<std::string,T*,HashFunction> PtrMap;
 
 	static PtrMap	mPtrMap;
 	std::string		mName;
@@ -105,12 +88,10 @@ private:
 };
 
 template <class T>
-stlplus::hash<std::string,T*,getHash> Manager<T>::mPtrMap;
+stlplus::hash<std::string,T*,HashFunction> Manager<T>::mPtrMap;
 
 
 } // namespace Mf
 
 #endif // _MOOF_MANAGER_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-