From b53b3265e4f13a1f4d107346897fb812f62ab724 Mon Sep 17 00:00:00 2001
From: rani_sharoni <rani_sharoni@7ec92016-0320-0410-acc4-a06ded1c099a>
Date: Thu, 27 Feb 2003 20:09:08 +0000
Subject: [PATCH] Fix various issues related to stability when using highly
 compliant compilers such as Comeau 4.3.0.1, VC7.1 and GCC 3.2

git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@108 7ec92016-0320-0410-acc4-a06ded1c099a
---
 AbstractFactory.h                             |   2 +
 AssocVector.h                                 |   2 +
 Borland/Factory.h                             |   2 +-
 Borland/{TypeInfo.h => LokiTypeInfo.h}        |  36 +----
 Borland/MultiMethods.h                        |   2 +-
 Borland/SmallObj.cpp                          |   3 +
 Borland/TypeManip.h                           |  21 +++
 Borland/Typelist.h                            |  41 ++++++
 DataGenerators.h                              |   2 +
 EmptyType.h                                   |   2 +
 Factory.h                                     |   2 +
 Functor.h                                     |   2 +
 HierarchyGenerators.h                         |   2 +
 TypeInfo.h => LokiTypeInfo.h                  |  16 ++-
 MSVC/1200/Factory.h                           |   2 +-
 .../TypeInfo.h => MSVC/1200/LokiTypeInfo.h    |  10 +-
 MSVC/1200/MultiMethods.h                      |   2 +-
 MSVC/1300/Factory.h                           |   2 +-
 MSVC/1300/HierarchyGenerators.h               |   4 +-
 MSVC/1300/{TypeInfo.h => LokiTypeInfo.h}      |   6 +-
 MSVC/1300/MultiMethods.h                      |   2 +-
 MSVC/1300/Singleton.h                         |   8 +-
 MSVC/1300/SmallObj.cpp                        |   3 +
 MSVC/1300/SmallObj.h                          |  27 +---
 MSVC/1300/SmartPtr.h                          |   2 +
 MSVC/1300/Threads.h                           |   5 +-
 MSVC/1300/TypeManip.h                         |  21 ++-
 MSVC/1300/TypeTraits.h                        |   8 +-
 MSVC/1300/Typelist.h                          |   4 +-
 MultiMethods.h                                |   2 +
 NullType.h                                    |   2 +
 Reference/Factory.h                           |   2 +-
 Reference/HierarchyGenerators.h               |   9 ++
 Reference/LokiTypeInfo.h                      | 108 ++++++++++++++
 Reference/MultiMethods.h                      |  22 ++-
 Reference/Singleton.h                         |   8 ++
 Reference/SmallObj.cpp                        |  21 ++-
 Reference/SmallObj.h                          |   3 -
 Reference/SmartPtr.h                          | 134 +++++++++++-------
 Reference/Threads.h                           |  27 ++--
 Reference/TypeManip.h                         |  25 +++-
 Reference/Typelist.h                          |  11 +-
 Reference/Visitor.h                           |   2 +-
 Singleton.h                                   |   2 +
 SmallObj.h                                    |   2 +
 SmartPtr.h                                    |   2 +
 Threads.h                                     |   2 +
 Tuple.h                                       |   2 +
 TypeManip.h                                   |   2 +
 TypeTraits.h                                  |   2 +
 Typelist.h                                    |   2 +
 Visitor.h                                     |   2 +
 static_check.h                                |   2 +
 tools/HeaderGen/Headers.lst                   |   2 +-
 tools/HeaderGen/vendors.lst                   |   3 +
 tools/RegressionTest/UnitTest.h               |   2 +-
 56 files changed, 441 insertions(+), 203 deletions(-)
 rename Borland/{TypeInfo.h => LokiTypeInfo.h} (88%)
 rename TypeInfo.h => LokiTypeInfo.h (54%)
 rename Reference/TypeInfo.h => MSVC/1200/LokiTypeInfo.h (94%)
 rename MSVC/1300/{TypeInfo.h => LokiTypeInfo.h} (97%)
 create mode 100644 Reference/LokiTypeInfo.h

diff --git a/AbstractFactory.h b/AbstractFactory.h
index b44be82..7e33124 100644
--- a/AbstractFactory.h
+++ b/AbstractFactory.h
@@ -14,6 +14,8 @@
 #		include "Reference/AbstractFactory.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/AbstractFactory.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/AbstractFactory.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/AbstractFactory.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/AssocVector.h b/AssocVector.h
index 4b16211..a72c6a3 100644
--- a/AssocVector.h
+++ b/AssocVector.h
@@ -14,6 +14,8 @@
 #		include "Reference/AssocVector.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/AssocVector.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/AssocVector.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/AssocVector.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/Borland/Factory.h b/Borland/Factory.h
index d13d2e3..c8af103 100644
--- a/Borland/Factory.h
+++ b/Borland/Factory.h
@@ -18,7 +18,7 @@
 #ifndef FACTORY_INC_
 #define FACTORY_INC_
 
-#include "Loki_TypeInfo.h"
+#include "LokiTypeInfo.h"
 #include "AssocVector.h"
 #include <exception>
 
diff --git a/Borland/TypeInfo.h b/Borland/LokiTypeInfo.h
similarity index 88%
rename from Borland/TypeInfo.h
rename to Borland/LokiTypeInfo.h
index 50fdce0..aa1e03e 100644
--- a/Borland/TypeInfo.h
+++ b/Borland/LokiTypeInfo.h
@@ -1,26 +1,4 @@
-head	1.1;
-access;
-symbols;
-locks; strict;
-comment	@ * @;
-
-
-1.1
-date	2002.07.16.22.42.05;	author tslettebo;	state Exp;
-branches;
-next	;
-
-
-desc
-@@
-
-
-1.1
-log
-@Initial commit
-@
-text
-@////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 // The Loki Library
 // Copyright (c) 2001 by Andrei Alexandrescu
 // This code accompanies the book:
@@ -35,10 +13,10 @@ text
 //     without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
 
-// Last update: June 20, 2001
+// Last update: August 9, 2002
 
-#ifndef TYPEINFO_INC_
-#define TYPEINFO_INC_
+#ifndef LOKITYPEINFO_INC_
+#define LOKITYPEINFO_INC_
 
 #include <typeinfo>
 #include <cassert>
@@ -54,6 +32,7 @@ namespace Loki
     class TypeInfo
     {
     public:
+
         // Constructors
         TypeInfo(); // needed for containers
         TypeInfo(const std::type_info&); // non-explicit
@@ -123,8 +102,7 @@ namespace Loki
 ////////////////////////////////////////////////////////////////////////////////
 // Change log:
 // June 20, 2001: ported by Nick Thurn to gcc 2.95.3. Kudos, Nick!!!
-// July 16, 2002: Ported by Terje Slettebų to BCC 5.6
+// July 16, 2002: Ported by Terje Slettebų and Pavel Vozenilek to BCC 5.6
 ////////////////////////////////////////////////////////////////////////////////
 
-#endif // TYPEINFO_INC_
-@
+#endif // LOKITYPEINFO_INC_
diff --git a/Borland/MultiMethods.h b/Borland/MultiMethods.h
index ca069da..c97424e 100644
--- a/Borland/MultiMethods.h
+++ b/Borland/MultiMethods.h
@@ -19,7 +19,7 @@
 #define MULTIMETHODS_INC_
 
 #include "Typelist.h"
-#include "Loki_TypeInfo.h" //### BCB
+#include "LokiTypeInfo.h" //### BCB
 #include "Functor.h"
 #include "AssocVector.h"
 #include <iostream> // ***
diff --git a/Borland/SmallObj.cpp b/Borland/SmallObj.cpp
index 8ce55e3..22ba29e 100644
--- a/Borland/SmallObj.cpp
+++ b/Borland/SmallObj.cpp
@@ -280,6 +280,9 @@ FixedAllocator::Chunk* FixedAllocator::VicinityFind(void* p)
     Chunk* loBound = &chunks_.front();
     Chunk* hiBound = &chunks_.back() + 1;
 
+	// Special case: deallocChunk_ is the last in the array
+	if (hi == hiBound) hi = 0;
+
     for (;;)
     {
         if (lo)
diff --git a/Borland/TypeManip.h b/Borland/TypeManip.h
index 8861101..32f5034 100644
--- a/Borland/TypeManip.h
+++ b/Borland/TypeManip.h
@@ -67,6 +67,27 @@ namespace Loki
         typedef U Result;
     };
 
+////////////////////////////////////////////////////////////////////////////////
+// class template IsSameType
+// Return true iff two given types are the same
+// Invocation: SameType<T, U>::value
+// where:
+// T and U are types
+// Result evaluates to true iff U == T (types equal)
+////////////////////////////////////////////////////////////////////////////////
+
+    template <typename T, typename U>
+    struct IsSameType
+    {
+        enum { value = false };
+    };
+    
+    template <typename T>
+    struct IsSameType<T,T>
+    {
+        enum { value = true };
+    };
+
 ////////////////////////////////////////////////////////////////////////////////
 // Helper types Small and Big - guarantee that sizeof(Small) < sizeof(Big)
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/Borland/Typelist.h b/Borland/Typelist.h
index d7e76fe..01fea52 100644
--- a/Borland/Typelist.h
+++ b/Borland/Typelist.h
@@ -368,6 +368,47 @@ namespace Loki
     namespace TL
     {
 ////////////////////////////////////////////////////////////////////////////////
+// class template MakeTypelist
+// Takes a number of arguments equal to its numeric suffix
+// The arguments are type names.
+// MakeTypelist<T1, T2, ...>::Result
+// returns a typelist that is of T1, T2, ...
+////////////////////////////////////////////////////////////////////////////////
+
+        template
+        <
+            typename T1  = NullType, typename T2  = NullType, typename T3  = NullType,
+            typename T4  = NullType, typename T5  = NullType, typename T6  = NullType,
+            typename T7  = NullType, typename T8  = NullType, typename T9  = NullType,
+            typename T10 = NullType, typename T11 = NullType, typename T12 = NullType,
+            typename T13 = NullType, typename T14 = NullType, typename T15 = NullType,
+            typename T16 = NullType, typename T17 = NullType, typename T18 = NullType
+        > 
+        struct MakeTypelist
+        {
+        private:
+            typedef typename MakeTypelist
+            <
+                T2 , T3 , T4 , 
+                T5 , T6 , T7 , 
+                T8 , T9 , T10, 
+                T11, T12, T13,
+                T14, T15, T16, 
+                T17, T18
+            >
+            ::Result TailResult;
+
+        public:
+            typedef Typelist<T1, TailResult> Result;
+        };
+
+        template<>
+        struct MakeTypelist<>
+        {
+            typedef NullType Result;
+        };
+
+////////////////////////////////////////////////////////////////////////////////
 // class template Length
 // Computes the length of a typelist
 // Invocation (TList is a typelist):
diff --git a/DataGenerators.h b/DataGenerators.h
index 1ef07f2..62dd970 100644
--- a/DataGenerators.h
+++ b/DataGenerators.h
@@ -14,6 +14,8 @@
 #		include "Reference/DataGenerators.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/DataGenerators.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/DataGenerators.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/DataGenerators.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/EmptyType.h b/EmptyType.h
index 780befa..a9a70c4 100644
--- a/EmptyType.h
+++ b/EmptyType.h
@@ -14,6 +14,8 @@
 #		include "Reference/EmptyType.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/EmptyType.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/EmptyType.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/EmptyType.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/Factory.h b/Factory.h
index d46ec0c..3a5905a 100644
--- a/Factory.h
+++ b/Factory.h
@@ -14,6 +14,8 @@
 #		include "Reference/Factory.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/Factory.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/Factory.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/Factory.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/Functor.h b/Functor.h
index e0796d4..0bab576 100644
--- a/Functor.h
+++ b/Functor.h
@@ -14,6 +14,8 @@
 #		include "Reference/Functor.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/Functor.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/Functor.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/Functor.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/HierarchyGenerators.h b/HierarchyGenerators.h
index 24ee545..1be9c03 100644
--- a/HierarchyGenerators.h
+++ b/HierarchyGenerators.h
@@ -14,6 +14,8 @@
 #		include "Reference/HierarchyGenerators.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/HierarchyGenerators.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/HierarchyGenerators.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/HierarchyGenerators.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/TypeInfo.h b/LokiTypeInfo.h
similarity index 54%
rename from TypeInfo.h
rename to LokiTypeInfo.h
index e2cd8e8..a13faf2 100644
--- a/TypeInfo.h
+++ b/LokiTypeInfo.h
@@ -6,19 +6,21 @@
 ////////////////////////////////
 
 #ifdef LOKI_USE_REFERENCE
-#	include "Reference/TypeInfo.h"
+#	include "Reference/LokiTypeInfo.h"
 #else
 #	if (__INTEL_COMPILER)
-#		include "Reference/TypeInfo.h"
+#		include "Reference/LokiTypeInfo.h"
 #	elif (__MWERKS__)
-#		include "Reference/TypeInfo.h"
+#		include "Reference/LokiTypeInfo.h"
 #	elif (__BORLANDC__ >= 0x560)
-#		include "Borland/TypeInfo.h"
+#		include "Borland/LokiTypeInfo.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Borland/LokiTypeInfo.h"
 #	elif (_MSC_VER >= 1300)
-#		include "MSVC/1300/TypeInfo.h"
+#		include "MSVC/1300/LokiTypeInfo.h"
 #	elif (_MSC_VER >= 1200)
-#		include "MSVC/1200/TypeInfo.h"
+#		include "MSVC/1200/LokiTypeInfo.h"
 #	else
-#		include "Reference/TypeInfo.h"
+#		include "Reference/LokiTypeInfo.h"
 #	endif
 #endif
diff --git a/MSVC/1200/Factory.h b/MSVC/1200/Factory.h
index 8894866..29d6bbf 100644
--- a/MSVC/1200/Factory.h
+++ b/MSVC/1200/Factory.h
@@ -21,7 +21,7 @@
 #ifndef FACTORY_INC_
 #define FACTORY_INC_
 
-#include "TypeInfo.h"
+#include "LokiTypeInfo.h"
 #include "AssocVector.h"
 #include <exception>
 
diff --git a/Reference/TypeInfo.h b/MSVC/1200/LokiTypeInfo.h
similarity index 94%
rename from Reference/TypeInfo.h
rename to MSVC/1200/LokiTypeInfo.h
index f9ed1a5..d8ec1ed 100644
--- a/Reference/TypeInfo.h
+++ b/MSVC/1200/LokiTypeInfo.h
@@ -15,8 +15,8 @@
 
 // Last update: June 20, 2001
 
-#ifndef TYPEINFO_INC_
-#define TYPEINFO_INC_
+#ifndef LOKITYPEINFO_INC_
+#define LOKITYPEINFO_INC_
 
 #include <typeinfo>
 #include <cassert>
@@ -62,7 +62,7 @@ namespace Loki
     inline bool TypeInfo::before(const TypeInfo& rhs) const
     {
         assert(pInfo_);
-        return pInfo_->before(*rhs.pInfo_);
+        return pInfo_->before(*rhs.pInfo_) != 0;
     }
 
     inline const std::type_info& TypeInfo::Get() const
@@ -80,7 +80,7 @@ namespace Loki
 // Comparison operators
     
     inline bool operator==(const TypeInfo& lhs, const TypeInfo& rhs)
-    { return lhs.Get() == rhs.Get(); }
+    { return (lhs.Get() == rhs.Get()) != 0; }
 
     inline bool operator<(const TypeInfo& lhs, const TypeInfo& rhs)
     { return lhs.before(rhs); }
@@ -103,4 +103,4 @@ namespace Loki
 // June 20, 2001: ported by Nick Thurn to gcc 2.95.3. Kudos, Nick!!!
 ////////////////////////////////////////////////////////////////////////////////
 
-#endif // TYPEINFO_INC_
+#endif // LOKITYPEINFO_INC_
diff --git a/MSVC/1200/MultiMethods.h b/MSVC/1200/MultiMethods.h
index 1303c2d..0655603 100644
--- a/MSVC/1200/MultiMethods.h
+++ b/MSVC/1200/MultiMethods.h
@@ -42,7 +42,7 @@
 #define MULTIMETHODS_INC_
 
 #include "Typelist.h"
-#include "TypeInfo.h"
+#include "LokiTypeInfo.h"
 #include "Functor.h"
 #include "AssocVector.h"
 
diff --git a/MSVC/1300/Factory.h b/MSVC/1300/Factory.h
index af61639..62bb4dc 100644
--- a/MSVC/1300/Factory.h
+++ b/MSVC/1300/Factory.h
@@ -18,7 +18,7 @@
 #ifndef FACTORY_INC_
 #define FACTORY_INC_
 
-#include "TypeInfo.h"
+#include "LokiTypeInfo.h"
 #include "AssocVector.h"
 #include <exception>
 
diff --git a/MSVC/1300/HierarchyGenerators.h b/MSVC/1300/HierarchyGenerators.h
index 4bf690f..16e882c 100644
--- a/MSVC/1300/HierarchyGenerators.h
+++ b/MSVC/1300/HierarchyGenerators.h
@@ -240,7 +240,7 @@ namespace Loki
 
             typedef typename Select
             <
-                SameType<UnitType, TupleUnit<ElementType> >::value, 
+                IsSameType<UnitType, TupleUnit<ElementType> >::value, 
                 ElementType, 
                 UnitType
             >
@@ -285,7 +285,7 @@ namespace Loki
 
             typedef typename Select
             <
-                SameType<UnitType, TupleUnit<ElementType> >::value, 
+                IsSameType<UnitType, TupleUnit<ElementType> >::value, 
                 ElementType, 
                 UnitType
             >
diff --git a/MSVC/1300/TypeInfo.h b/MSVC/1300/LokiTypeInfo.h
similarity index 97%
rename from MSVC/1300/TypeInfo.h
rename to MSVC/1300/LokiTypeInfo.h
index ee6701c..98c66be 100644
--- a/MSVC/1300/TypeInfo.h
+++ b/MSVC/1300/LokiTypeInfo.h
@@ -15,8 +15,8 @@
 
 // Last update: May 19, 2002
 
-#ifndef TYPEINFO_INC_
-#define TYPEINFO_INC_
+#ifndef LOKITYPEINFO_INC_
+#define LOKITYPEINFO_INC_
 
 #include <typeinfo>
 #include <cassert>
@@ -104,4 +104,4 @@ namespace Loki
 // May  10, 2002: ported by Rani Sharoni to VC7 (RTM - 9466)
 ////////////////////////////////////////////////////////////////////////////////
 
-#endif // TYPEINFO_INC_
+#endif // LOKITYPEINFO_INC_
diff --git a/MSVC/1300/MultiMethods.h b/MSVC/1300/MultiMethods.h
index 14421bd..21c6bd8 100644
--- a/MSVC/1300/MultiMethods.h
+++ b/MSVC/1300/MultiMethods.h
@@ -19,7 +19,7 @@
 #define MULTIMETHODS_INC_
 
 #include "Typelist.h"
-#include "TypeInfo.h"
+#include "LokiTypeInfo.h"
 #include "Functor.h"
 #include "AssocVector.h"
 
diff --git a/MSVC/1300/Singleton.h b/MSVC/1300/Singleton.h
index 1a232ed..c9c1118 100644
--- a/MSVC/1300/Singleton.h
+++ b/MSVC/1300/Singleton.h
@@ -335,14 +335,10 @@ namespace Loki
     class SingletonHolderStaticData
     {
         friend ClientType; // illegal (11.4/2) but works with VC
-        static ThreadingModelType s_ThreadingModelData;
         static PtrInstanceType    s_pInstance;
         static bool               s_destroyed;
     };
 
-    template<class C, class M, class P>
-    M SingletonHolderStaticData<C, M, P>::s_ThreadingModelData;
-
     template<class C, class M, class P>
     P SingletonHolderStaticData<C, M, P>::s_pInstance;
 
@@ -382,9 +378,7 @@ namespace Loki
         // Helpers
         static void MakeInstance()
         {
-            typename ThreadingModel<T>::Lock guard(
-                MySingletonHolderStaticData::s_ThreadingModelData);
-
+            typename ThreadingModel<SingletonHolder>::Lock guard;
             (void)guard;
 
             if (!pInstance_())
diff --git a/MSVC/1300/SmallObj.cpp b/MSVC/1300/SmallObj.cpp
index e7a8585..527445f 100644
--- a/MSVC/1300/SmallObj.cpp
+++ b/MSVC/1300/SmallObj.cpp
@@ -273,6 +273,9 @@ FixedAllocator::Chunk* FixedAllocator::VicinityFind(void* p)
     Chunk* loBound = &chunks_.front();
     Chunk* hiBound = &chunks_.back() + 1;
 
+	// Special case: deallocChunk_ is the last in the array
+	if (hi == hiBound) hi = 0;
+
     for (;;)
     {
         if (lo)
diff --git a/MSVC/1300/SmallObj.h b/MSVC/1300/SmallObj.h
index 4c5a2f0..ebab465 100644
--- a/MSVC/1300/SmallObj.h
+++ b/MSVC/1300/SmallObj.h
@@ -127,20 +127,6 @@ namespace Loki
 //     allocations/deallocations
 ////////////////////////////////////////////////////////////////////////////////
 
-    template
-    <
-        class ClientType,
-        class ThreadingModelType
-    >
-    class SmallObjectStaticData
-    {
-        friend ClientType; // illegal (11.4/2) but works with VC
-        static ThreadingModelType s_ThreadingModelData;
-    };
-
-    template<class C, class M>
-    M SmallObjectStaticData<C, M>::s_ThreadingModelData; 
-
     template
     <
         template <class> class ThreadingModel = DEFAULT_THREADING,
@@ -153,13 +139,6 @@ namespace Loki
         typedef ThreadingModel< SmallObject<ThreadingModel, 
                 chunkSize, maxSmallObjectSize> > MyThreadingModel;
                 
-        typedef SmallObjectStaticData
-        <
-            SmallObject,
-            MyThreadingModel
-        > 
-        MySmallObjectStaticData;
-
         struct MySmallObjAllocator : public SmallObjAllocator
         {
             MySmallObjAllocator() 
@@ -175,8 +154,7 @@ namespace Loki
         static void* operator new(std::size_t size)
         {
 #if (MAX_SMALL_OBJECT_SIZE != 0) && (DEFAULT_CHUNK_SIZE != 0)
-            typename MyThreadingModel::Lock lock(
-                MySmallObjectStaticData::s_ThreadingModelData);
+            typename MyThreadingModel::Lock lock;
             (void)lock; // get rid of warning
             
             return SingletonHolder<MySmallObjAllocator, CreateStatic, 
@@ -188,8 +166,7 @@ namespace Loki
         static void operator delete(void* p, std::size_t size)
         {
 #if (MAX_SMALL_OBJECT_SIZE != 0) && (DEFAULT_CHUNK_SIZE != 0)
-            typename MyThreadingModel::Lock lock(
-                MySmallObjectStaticData::s_ThreadingModelData);
+            typename MyThreadingModel::Lock lock;
             (void)lock; // get rid of warning
             
             SingletonHolder<MySmallObjAllocator, CreateStatic, 
diff --git a/MSVC/1300/SmartPtr.h b/MSVC/1300/SmartPtr.h
index 667b7bb..76c68f3 100644
--- a/MSVC/1300/SmartPtr.h
+++ b/MSVC/1300/SmartPtr.h
@@ -155,7 +155,9 @@ namespace Loki
 // class template RefCountedMT
 // Implementation of the OwnershipPolicy used by SmartPtr
 // Implements external reference counting for multithreaded programs
+// Policy Usage: RefCountedMTAdj<ThreadingModel>::RefCountedMT
 ////////////////////////////////////////////////////////////////////////////////
+
     template <template <class> class ThreadingModel>
     struct RefCountedMTAdj
     {
diff --git a/MSVC/1300/Threads.h b/MSVC/1300/Threads.h
index 81fc7ee..21508e9 100644
--- a/MSVC/1300/Threads.h
+++ b/MSVC/1300/Threads.h
@@ -54,9 +54,6 @@ namespace Loki
         
         static IntType AtomicDecrement(volatile IntType& lval)
         { return --lval; }
-
-        static IntType AtomicDivide(volatile IntType& lval)
-        { return lval /= val; }
         
         static void AtomicAssign(volatile IntType & lval, IntType val)
         { lval = val; }
@@ -98,13 +95,13 @@ namespace Loki
             
             Lock(const Lock&);
             Lock& operator=(const Lock&);
-            Lock(); // buggy design
         public:
 
             explicit Lock(ObjectLevelLockable& host) : host_(host)
             {
                 ::EnterCriticalSection(&host_.mtx_);
             }
+
             ~Lock()
             {
                 ::LeaveCriticalSection(&host_.mtx_);
diff --git a/MSVC/1300/TypeManip.h b/MSVC/1300/TypeManip.h
index cf94ee1..33a4b6f 100644
--- a/MSVC/1300/TypeManip.h
+++ b/MSVC/1300/TypeManip.h
@@ -73,18 +73,18 @@ namespace Loki
         typedef typename In<flag>::Result Result;
     };
     
-/*
+
 ////////////////////////////////////////////////////////////////////////////////
-// class template SameType
+// class template IsSameType
 // Return true iff two given types are the same
-// Invocation: SameType<T, U>::value
+// Invocation: IsSameType<T, U>::value
 // where:
 // T and U are types
 // Result evaluates to true iff U == T (types equal)
 ////////////////////////////////////////////////////////////////////////////////
 
     template <typename T, typename U>
-    struct SameType
+    struct IsSameType
     {
     private:
         template<typename>
@@ -98,7 +98,6 @@ namespace Loki
     public:
         enum { value = In<U>::value };
     };
-	//*/
     
 ////////////////////////////////////////////////////////////////////////////////
 // Helper types Small and Big - guarantee that sizeof(Small) < sizeof(Big)
@@ -113,10 +112,10 @@ namespace Loki
         struct IsVoid
         {
             enum { result = 
-                SameType<T, void>::value          ||
-                SameType<T, const void>::value    ||
-                SameType<T, volatile void>::value ||
-                SameType<T, const volatile void>::value
+                IsSameType<T, void>::value          ||
+                IsSameType<T, const void>::value    ||
+                IsSameType<T, volatile void>::value ||
+                IsSameType<T, const volatile void>::value
             };
         };
     }
@@ -172,7 +171,7 @@ namespace Loki
     {
         enum { exists = (is_convertible<T,U>::exists) };
         enum { exists2Way = (exists && is_convertible<U, T>::exists) };
-        enum { sameType = (SameType<T, U>::value) };
+        enum { sameType = (IsSameType<T, U>::value) };
     };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -238,7 +237,7 @@ struct SuperSubclassStrict
 // Change log:
 // June    20, 2001: ported by Nick Thurn to gcc 2.95.3. Kudos, Nick!!!
 // May     10, 2002: ported by Rani Sharoni to VC7 (RTM - 9466)
-// October 10, 2002: Commented SameType template (not a Loki-template - yet). MKH
+// October 10, 2002: Commented IsSameType template (not a Loki-template - yet). MKH
 // October 12, 2002: Added SuperSubclass and SuperSubclassStrict templates.
 //                   The corresponding macros are deprecated. T.S.
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/MSVC/1300/TypeTraits.h b/MSVC/1300/TypeTraits.h
index 1d615df..eca7218 100644
--- a/MSVC/1300/TypeTraits.h
+++ b/MSVC/1300/TypeTraits.h
@@ -226,10 +226,10 @@ namespace Loki
 
         enum { 
             isVoid = 
-                SameType<T, void>::value          ||
-                SameType<T, const void>::value    ||
-                SameType<T, volatile void>::value ||
-                SameType<T, const volatile void>::value
+                IsSameType<T, void>::value          ||
+                IsSameType<T, const void>::value    ||
+                IsSameType<T, volatile void>::value ||
+                IsSameType<T, const volatile void>::value
         };
 
         enum { isStdUnsignedInt = 
diff --git a/MSVC/1300/Typelist.h b/MSVC/1300/Typelist.h
index 4b6723d..524bd39 100644
--- a/MSVC/1300/Typelist.h
+++ b/MSVC/1300/Typelist.h
@@ -766,7 +766,7 @@ typedef char _type_##_is_not_a_Typelist[true]
             public:
                 typedef typename Select
                 <
-                    SameType<Head, T>::value,
+                    IsSameType<Head, T>::value,
                     TailResult,
                     Typelist<Head, TailResult>
                 >
@@ -885,7 +885,7 @@ typedef char _type_##_is_not_a_Typelist[true]
             public:
                 typedef typename Select
                 <
-                    SameType<Head, T>::value,
+                    IsSameType<Head, T>::value,
                     Typelist<U,    TailResult>,
                     Typelist<Head, TailResult>
                 >
diff --git a/MultiMethods.h b/MultiMethods.h
index 83fab8a..a560c9c 100644
--- a/MultiMethods.h
+++ b/MultiMethods.h
@@ -14,6 +14,8 @@
 #		include "Reference/MultiMethods.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/MultiMethods.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/MultiMethods.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/MultiMethods.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/NullType.h b/NullType.h
index 8565a77..f502a75 100644
--- a/NullType.h
+++ b/NullType.h
@@ -14,6 +14,8 @@
 #		include "Reference/NullType.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/NullType.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/NullType.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/NullType.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/Reference/Factory.h b/Reference/Factory.h
index c818bf1..1d0e305 100644
--- a/Reference/Factory.h
+++ b/Reference/Factory.h
@@ -16,7 +16,7 @@
 #ifndef FACTORY_INC_
 #define FACTORY_INC_
 
-#include "TypeInfo.h"
+#include "LokiTypeInfo.h"
 #include "AssocVector.h"
 #include <exception>
 
diff --git a/Reference/HierarchyGenerators.h b/Reference/HierarchyGenerators.h
index ef96dfa..2f40993 100644
--- a/Reference/HierarchyGenerators.h
+++ b/Reference/HierarchyGenerators.h
@@ -24,6 +24,12 @@
 
 namespace Loki
 {
+#if defined(_MSC_VER) && _MSC_VER >= 1300
+#pragma warning( push ) 
+ // 'class1' : base-class 'class2' is already a base-class of 'class3'
+#pragma warning( disable : 4584 )
+#endif // _MSC_VER
+
 ////////////////////////////////////////////////////////////////////////////////
 // class template GenScatterHierarchy
 // Generates a scattered hierarchy starting from a typelist and a template
@@ -244,6 +250,9 @@ namespace Loki
     {
     };
 
+#if defined(_MSC_VER) && _MSC_VER >= 1300
+#pragma warning( pop ) 
+#endif
 }   // namespace Loki
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/Reference/LokiTypeInfo.h b/Reference/LokiTypeInfo.h
new file mode 100644
index 0000000..aa45941
--- /dev/null
+++ b/Reference/LokiTypeInfo.h
@@ -0,0 +1,108 @@
+////////////////////////////////////////////////////////////////////////////////
+// The Loki Library
+// Copyright (c) 2001 by Andrei Alexandrescu
+// This code accompanies the book:
+// Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design 
+//     Patterns Applied". Copyright (c) 2001. Addison-Wesley.
+// Permission to use, copy, modify, distribute and sell this software for any 
+//     purpose is hereby granted without fee, provided that the above copyright 
+//     notice appear in all copies and that both that copyright notice and this 
+//     permission notice appear in supporting documentation.
+// The author or Addison-Wesley Longman make no representations about the 
+//     suitability of this software for any purpose. It is provided "as is" 
+//     without express or implied warranty.
+////////////////////////////////////////////////////////////////////////////////
+
+// Last update: June 20, 2001
+
+#ifndef LOKITYPEINFO_INC_
+#define LOKITYPEINFO_INC_
+
+#include <typeinfo>
+#include <cassert>
+#include "Typelist.h"
+
+namespace Loki
+{
+////////////////////////////////////////////////////////////////////////////////
+// class TypeInfo
+// Purpose: offer a first-class, comparable wrapper over std::type_info
+////////////////////////////////////////////////////////////////////////////////
+
+    class TypeInfo
+    {
+    public:
+        // Constructors
+        TypeInfo(); // needed for containers
+        TypeInfo(const std::type_info&); // non-explicit
+
+        // Access for the wrapped std::type_info
+        const std::type_info& Get() const;
+        // Compatibility functions
+        bool before(const TypeInfo& rhs) const;
+        const char* name() const;
+
+    private:
+        const std::type_info* pInfo_;
+    };
+    
+// Implementation
+    
+    inline TypeInfo::TypeInfo()
+    {
+        class Nil {};
+        pInfo_ = &typeid(Nil);
+        assert(pInfo_);
+    }
+    
+    inline TypeInfo::TypeInfo(const std::type_info& ti)
+    : pInfo_(&ti)
+    { assert(pInfo_); }
+    
+    inline bool TypeInfo::before(const TypeInfo& rhs) const
+    {
+        assert(pInfo_);
+        // type_info::before return type is int in some VC libraries 
+        return pInfo_->before(*rhs.pInfo_) != 0;
+    }
+
+    inline const std::type_info& TypeInfo::Get() const
+    {
+        assert(pInfo_);
+        return *pInfo_;
+    }
+    
+    inline const char* TypeInfo::name() const
+    {
+        assert(pInfo_);
+        return pInfo_->name();
+    }
+
+// Comparison operators
+    
+    inline bool operator==(const TypeInfo& lhs, const TypeInfo& rhs)
+    // type_info::operator== return type is int in some VC libraries
+    { return (lhs.Get() == rhs.Get()) != 0; }
+
+    inline bool operator<(const TypeInfo& lhs, const TypeInfo& rhs)
+    { return lhs.before(rhs); }
+
+    inline bool operator!=(const TypeInfo& lhs, const TypeInfo& rhs)
+    { return !(lhs == rhs); }    
+    
+    inline bool operator>(const TypeInfo& lhs, const TypeInfo& rhs)
+    { return rhs < lhs; }
+    
+    inline bool operator<=(const TypeInfo& lhs, const TypeInfo& rhs)
+    { return !(lhs > rhs); }
+     
+    inline bool operator>=(const TypeInfo& lhs, const TypeInfo& rhs)
+    { return !(lhs < rhs); }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Change log:
+// June 20, 2001: ported by Nick Thurn to gcc 2.95.3. Kudos, Nick!!!
+////////////////////////////////////////////////////////////////////////////////
+
+#endif // LOKITYPEINFO_INC_
diff --git a/Reference/MultiMethods.h b/Reference/MultiMethods.h
index ae0bbdd..367f058 100644
--- a/Reference/MultiMethods.h
+++ b/Reference/MultiMethods.h
@@ -17,7 +17,7 @@
 #define MULTIMETHODS_INC_
 
 #include "Typelist.h"
-#include "TypeInfo.h"
+#include "LokiTypeInfo.h"
 #include "Functor.h"
 #include "AssocVector.h"
 
@@ -77,13 +77,10 @@ namespace Loki
             Executor exec, NullType)
         { return exec.OnError(lhs, rhs); }
         
-        template <class TList, class SomeLhs>
+        template <class Head, class Tail, class SomeLhs>
         static ResultType DispatchRhs(SomeLhs& lhs, BaseRhs& rhs,
-            Executor exec, TList)
-        {
-            typedef typename TList::Head Head;
-            typedef typename TList::Tail Tail;
-            
+            Executor exec, Typelist<Head, Tail>)
+        {            
             if (Head* p2 = dynamic_cast<Head*>(&rhs))
             {
                 Int2Type<(symmetric &&
@@ -102,13 +99,10 @@ namespace Loki
             Executor exec, NullType)
         { return exec.OnError(lhs, rhs); }
         
-        template <class TList>
+        template <class Head, class Tail>
         static ResultType DispatchLhs(BaseLhs& lhs, BaseRhs& rhs,
-            Executor exec, TList)
-        {
-            typedef typename TList::Head Head;
-            typedef typename TList::Tail Tail;
-            
+            Executor exec, Typelist<Head, Tail>)
+        {            
             if (Head* p1 = dynamic_cast<Head*>(&lhs))
             {
                 return DispatchRhs(*p1, rhs, exec, TypesRhs());
@@ -286,7 +280,7 @@ namespace Loki
         template <class SomeLhs, class SomeRhs,
             ResultType (*callback)(SomeLhs&, SomeRhs&),
             bool symmetric>
-        void Add()
+        void Add(bool = true) // [gcc] dummy bool
         {
 	    typedef Private::FnDispatcherHelper<
 					BaseLhs, BaseRhs, 
diff --git a/Reference/Singleton.h b/Reference/Singleton.h
index 3bbb2c9..cb57a06 100644
--- a/Reference/Singleton.h
+++ b/Reference/Singleton.h
@@ -178,6 +178,11 @@ namespace Loki
 
     template <class T> struct CreateStatic
     {
+#if defined(_MSC_VER) && _MSC_VER >= 1300
+#pragma warning( push ) 
+ // alignment of a member was sensitive to packing
+#pragma warning( disable : 4121 )
+#endif // _MSC_VER
         union MaxAlign
         {
             char t_[sizeof(T)];
@@ -191,6 +196,9 @@ namespace Loki
             int Test::* pMember_;
             int (Test::*pMemberFn_)(int);
         };
+#if defined(_MSC_VER) && _MSC_VER >= 1300
+#pragma warning( pop )
+#endif // _MSC_VER
         
         static T* Create()
         {
diff --git a/Reference/SmallObj.cpp b/Reference/SmallObj.cpp
index 382d726..ebbbd87 100644
--- a/Reference/SmallObj.cpp
+++ b/Reference/SmallObj.cpp
@@ -18,6 +18,7 @@
 #include "SmallObj.h"
 #include <cassert>
 #include <algorithm>
+#include <functional>
 
 using namespace Loki;
 
@@ -365,6 +366,20 @@ SmallObjAllocator::SmallObjAllocator(
 {   
 }
 
+namespace { // anoymous 
+
+// See LWG DR #270
+struct CompareFixedAllocatorSize
+    : std::binary_function<const FixedAllocator &, std::size_t, bool>
+{
+    bool operator()(const FixedAllocator &x, std::size_t numBytes) const
+    {
+        return x.BlockSize() < numBytes;
+    }
+};
+
+} // anoymous namespace
+
 ////////////////////////////////////////////////////////////////////////////////
 // SmallObjAllocator::Allocate
 // Allocates 'numBytes' memory
@@ -379,7 +394,8 @@ void* SmallObjAllocator::Allocate(std::size_t numBytes)
     {
         return pLastAlloc_->Allocate();
     }
-    Pool::iterator i = std::lower_bound(pool_.begin(), pool_.end(), numBytes);
+    Pool::iterator i = std::lower_bound(pool_.begin(), pool_.end(), numBytes, 
+                                        CompareFixedAllocatorSize());
     if (i == pool_.end() || i->BlockSize() != numBytes)
     {
         i = pool_.insert(i, FixedAllocator(numBytes));
@@ -404,7 +420,8 @@ void SmallObjAllocator::Deallocate(void* p, std::size_t numBytes)
         pLastDealloc_->Deallocate(p);
         return;
     }
-    Pool::iterator i = std::lower_bound(pool_.begin(), pool_.end(), numBytes);
+    Pool::iterator i = std::lower_bound(pool_.begin(), pool_.end(), numBytes, 
+                                        CompareFixedAllocatorSize());
     assert(i != pool_.end());
     assert(i->BlockSize() == numBytes);
     pLastDealloc_ = &*i;
diff --git a/Reference/SmallObj.h b/Reference/SmallObj.h
index 93d70e8..ba55220 100644
--- a/Reference/SmallObj.h
+++ b/Reference/SmallObj.h
@@ -86,9 +86,6 @@ namespace Loki
         // Returns the block size with which the FixedAllocator was initialized
         std::size_t BlockSize() const
         { return blockSize_; }
-        // Comparison operator for sorting 
-        bool operator<(std::size_t rhs) const
-        { return BlockSize() < rhs; }
     };
     
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/Reference/SmartPtr.h b/Reference/SmartPtr.h
index 1ebcf4a..f96af67 100644
--- a/Reference/SmartPtr.h
+++ b/Reference/SmartPtr.h
@@ -152,56 +152,66 @@ namespace Loki
 // class template RefCountedMT
 // Implementation of the OwnershipPolicy used by SmartPtr
 // Implements external reference counting for multithreaded programs
+// Policy Usage: RefCountedMTAdj<ThreadingModel>::RefCountedMT
 ////////////////////////////////////////////////////////////////////////////////
-    template <class P,
-        template <class> class ThreadingModel>
-    class RefCountedMT : public ThreadingModel< RefCountedMT<P, ThreadingModel> >
-    {
-    public:
-        RefCountedMT() 
-        {
-            pCount_ = static_cast<unsigned int*>(
-                SmallObject<ThreadingModel>::operator new(
-                    sizeof(unsigned int)));
-            assert(pCount_);
-            *pCount_ = 1;
-        }
-        
-        RefCountedMT(const RefCountedMT& rhs) 
-        : pCount_(rhs.pCount_)
-        {}
-        
-        // MWCW lacks template friends, hence the following kludge
-        template <typename P1>
-        RefCountedMT(const RefCountedMT<P1, ThreadingModel>& rhs) 
-        : pCount_(reinterpret_cast<const RefCounted<P>&>(rhs).pCount_)
-        {}
-        
-        P Clone(const P& val)
-        {
-            ThreadingModel<RefCountedMT>::AtomicIncrement(*pCount_);
-            return val;
-        }
-        
-        bool Release(const P&)
-        {
-            if (!ThreadingModel<RefCountedMT>::AtomicDecrement(*pCount_))
-            {
-                SmallObject<ThreadingModel>::operator delete(pCount_, 
-                    sizeof(unsigned int));
-                return true;
-            }
-            return false;
-        }
-        
-        void Swap(RefCountedMT& rhs)
-        { std::swap(pCount_, rhs.pCount_); }
     
-        enum { destructiveCopy = false };
+    template <template <class> class ThreadingModel>
+    struct RefCountedMTAdj
+    {
+        template <class P>
+        class RefCountedMT : public ThreadingModel< RefCountedMT<P> >
+        {
+            typedef ThreadingModel< RefCountedMT<P> > base_type;
+            typedef typename base_type::IntType       CountType;
+            typedef volatile CountType               *CountPtrType;
 
-    private:
-        // Data
-        volatile unsigned int* pCount_;
+        public:
+            RefCountedMT() 
+            {
+                pCount_ = static_cast<CountPtrType>(
+                    SmallObject<ThreadingModel>::operator new(
+                        sizeof(*pCount_)));
+                assert(pCount_);
+                *pCount_ = 1;
+            }
+
+            RefCountedMT(const RefCountedMT& rhs) 
+            : pCount_(rhs.pCount_)
+            {}
+
+            //MWCW lacks template friends, hence the following kludge
+            template <typename P1>
+            RefCountedMT(const RefCountedMT<P1>& rhs) 
+            : pCount_(reinterpret_cast<const RefCountedMT<P>&>(rhs).pCount_)
+            {}
+
+            P Clone(const P& val)
+            {
+                ThreadingModel<RefCountedMT>::AtomicIncrement(*pCount_);
+                return val;
+            }
+
+            bool Release(const P&)
+            {
+                if (!ThreadingModel<RefCountedMT>::AtomicDecrement(*pCount_))
+                {
+                    SmallObject<ThreadingModel>::operator delete(
+                        const_cast<CountType *>(pCount_), 
+                        sizeof(*pCount_));
+                    return true;
+                }
+                return false;
+            }
+
+            void Swap(RefCountedMT& rhs)
+            { std::swap(pCount_, rhs.pCount_); }
+
+            enum { destructiveCopy = false };
+
+        private:
+            // Data
+            CountPtrType pCount_;
+        };
     };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -514,7 +524,7 @@ namespace Loki
         {}
 
         static void OnDereference(P val)
-        { assert(val); }
+        { assert(val); (void)val; }
 
         static void Swap(AssertCheck&)
         {}
@@ -691,6 +701,7 @@ namespace Loki
         // gcc doesn't like this:
         // operator const T&() const { return value_; }
     private:
+        ByRef& operator=(const ByRef &);
         T& value_;
     };
 
@@ -709,6 +720,33 @@ namespace Loki
     >
     class SmartPtr;
 
+////////////////////////////////////////////////////////////////////////////////
+// class template SmartPtrDef (definition)
+// this class added to unify the usage of SmartPtr 
+// instead of writing SmartPtr<T,OP,CP,KP,SP> write SmartPtrDef<T,OP,CP,KP,SP>::type
+////////////////////////////////////////////////////////////////////////////////
+
+    template
+    <
+        typename T,
+        template <class> class OwnershipPolicy = RefCounted,
+        class ConversionPolicy = DisallowConversion,
+        template <class> class CheckingPolicy = AssertCheck,
+        template <class> class StoragePolicy = DefaultSPStorage
+    >
+    struct SmartPtrDef
+    {
+        typedef SmartPtr
+        <
+            T,
+            OwnershipPolicy,
+            ConversionPolicy,
+            CheckingPolicy,
+            StoragePolicy
+        >
+        type;
+    };
+
 ////////////////////////////////////////////////////////////////////////////////
 // class template SmartPtr (definition)
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/Reference/Threads.h b/Reference/Threads.h
index faae362..21508e9 100644
--- a/Reference/Threads.h
+++ b/Reference/Threads.h
@@ -30,7 +30,7 @@ namespace Loki
         struct Lock
         {
             Lock() {}
-            Lock(const Host&) {}
+            explicit Lock(const SingleThreaded&) {}
         };
         
         typedef Host VolatileType;
@@ -96,10 +96,12 @@ namespace Loki
             Lock(const Lock&);
             Lock& operator=(const Lock&);
         public:
-            Lock(Host& host) : host_(host)
+
+            explicit Lock(ObjectLevelLockable& host) : host_(host)
             {
                 ::EnterCriticalSection(&host_.mtx_);
             }
+
             ~Lock()
             {
                 ::LeaveCriticalSection(&host_.mtx_);
@@ -126,12 +128,10 @@ namespace Loki
     template <class Host>
     class ClassLevelLockable
     {
-        static CRITICAL_SECTION mtx_;
-
-        struct Initializer;
-        friend struct Initializer;
         struct Initializer
-        {
+        {   
+            CRITICAL_SECTION mtx_;
+
             Initializer()
             {
                 ::InitializeCriticalSection(&mtx_);
@@ -155,15 +155,15 @@ namespace Loki
         public:
             Lock()
             {
-                ::EnterCriticalSection(&mtx_);
+                ::EnterCriticalSection(&initializer_.mtx_);
             }
-            Lock(Host&)
+            explicit Lock(ClassLevelLockable&)
             {
-                ::EnterCriticalSection(&mtx_);
+                ::EnterCriticalSection(&initializer_.mtx_);
             }
             ~Lock()
             {
-                ::LeaveCriticalSection(&mtx_);
+                ::LeaveCriticalSection(&initializer_.mtx_);
             }
         };
 
@@ -184,9 +184,6 @@ namespace Loki
         { InterlockedExchange(&lval, val); }
     };
     
-    template <class Host>
-    CRITICAL_SECTION ClassLevelLockable<Host>::mtx_;
-    
     template <class Host>
     typename ClassLevelLockable<Host>::Initializer 
     ClassLevelLockable<Host>::initializer_;
@@ -197,8 +194,6 @@ namespace Loki
 ////////////////////////////////////////////////////////////////////////////////
 // Change log:
 // June 20, 2001: ported by Nick Thurn to gcc 2.95.3. Kudos, Nick!!!
-// January 10, 2002: Fixed bug in AtomicDivide - credit due to Jordi Guerrero
-// August 14, 2002: Changed some AtomicDivide's to AtomicDecrement's MKH
 ////////////////////////////////////////////////////////////////////////////////
 
 #endif
diff --git a/Reference/TypeManip.h b/Reference/TypeManip.h
index 3cb1ea8..d5ca196 100644
--- a/Reference/TypeManip.h
+++ b/Reference/TypeManip.h
@@ -67,6 +67,27 @@ namespace Loki
         typedef U Result;
     };
     
+////////////////////////////////////////////////////////////////////////////////
+// class template IsSameType
+// Return true iff two given types are the same
+// Invocation: SameType<T, U>::value
+// where:
+// T and U are types
+// Result evaluates to true iff U == T (types equal)
+////////////////////////////////////////////////////////////////////////////////
+
+    template <typename T, typename U>
+    struct IsSameType
+    {
+        enum { value = false };
+    };
+    
+    template <typename T>
+    struct IsSameType<T,T>
+    {
+        enum { value = true };
+    };
+
 ////////////////////////////////////////////////////////////////////////////////
 // Helper types Small and Big - guarantee that sizeof(Small) < sizeof(Big)
 ////////////////////////////////////////////////////////////////////////////////
@@ -128,11 +149,11 @@ namespace Loki
     template <class T>
     struct Conversion<T, void>    
     {
-        enum { exists = 1, exists2Way = 0, sameType = 0 };
+        enum { exists = 0, exists2Way = 0, sameType = 0 };
     };
     
     template <>
-    class Conversion<void, void>    
+    struct Conversion<void, void>    
     {
     public:
         enum { exists = 1, exists2Way = 1, sameType = 1 };
diff --git a/Reference/Typelist.h b/Reference/Typelist.h
index 349d096..db59272 100644
--- a/Reference/Typelist.h
+++ b/Reference/Typelist.h
@@ -407,15 +407,8 @@ namespace Loki
         };
 
         template<>
-        struct MakeTypelist
-        <
-            NullType, NullType, NullType, 
-            NullType, NullType, NullType, 
-            NullType, NullType, NullType, 
-            NullType, NullType, NullType,
-            NullType, NullType, NullType,
-            NullType, NullType, NullType
-        >{
+        struct MakeTypelist<>
+        {
             typedef NullType Result;
         };
 
diff --git a/Reference/Visitor.h b/Reference/Visitor.h
index a52fcbe..99145ed 100644
--- a/Reference/Visitor.h
+++ b/Reference/Visitor.h
@@ -143,7 +143,7 @@ struct DefaultCatchAll
         static ReturnType AcceptImpl(T& visited, BaseVisitor& guest)
         {
             // Apply the Acyclic Visitor
-            if (Visitor<T>* p = dynamic_cast<Visitor<T>*>(&guest))
+            if (Visitor<T,R>* p = dynamic_cast<Visitor<T,R>*>(&guest))
             {
                 return p->Visit(visited);
             }
diff --git a/Singleton.h b/Singleton.h
index 9d50a7b..f370bfb 100644
--- a/Singleton.h
+++ b/Singleton.h
@@ -14,6 +14,8 @@
 #		include "Reference/Singleton.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/Singleton.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/Singleton.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/Singleton.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/SmallObj.h b/SmallObj.h
index aa3b0f0..9c6159b 100644
--- a/SmallObj.h
+++ b/SmallObj.h
@@ -14,6 +14,8 @@
 #		include "Reference/SmallObj.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/SmallObj.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/SmallObj.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/SmallObj.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/SmartPtr.h b/SmartPtr.h
index 5b0d1e8..b02e67f 100644
--- a/SmartPtr.h
+++ b/SmartPtr.h
@@ -14,6 +14,8 @@
 #		include "Reference/SmartPtr.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/SmartPtr.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/SmartPtr.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/SmartPtr.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/Threads.h b/Threads.h
index d414b06..b4d7792 100644
--- a/Threads.h
+++ b/Threads.h
@@ -14,6 +14,8 @@
 #		include "Reference/Threads.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/Threads.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/Threads.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/Threads.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/Tuple.h b/Tuple.h
index a56eb7e..eefe7ea 100644
--- a/Tuple.h
+++ b/Tuple.h
@@ -14,6 +14,8 @@
 #		include "Reference/Tuple.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/Tuple.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/Tuple.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/Tuple.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/TypeManip.h b/TypeManip.h
index 3f7c587..a266887 100644
--- a/TypeManip.h
+++ b/TypeManip.h
@@ -14,6 +14,8 @@
 #		include "Reference/TypeManip.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/TypeManip.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/TypeManip.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/TypeManip.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/TypeTraits.h b/TypeTraits.h
index 7f2cfe6..feb0acd 100644
--- a/TypeTraits.h
+++ b/TypeTraits.h
@@ -14,6 +14,8 @@
 #		include "Reference/TypeTraits.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/TypeTraits.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/TypeTraits.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/TypeTraits.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/Typelist.h b/Typelist.h
index 017f2cf..6958a2d 100644
--- a/Typelist.h
+++ b/Typelist.h
@@ -14,6 +14,8 @@
 #		include "Reference/Typelist.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/Typelist.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/Typelist.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/Typelist.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/Visitor.h b/Visitor.h
index 6e6f69b..f5c5838 100644
--- a/Visitor.h
+++ b/Visitor.h
@@ -14,6 +14,8 @@
 #		include "Reference/Visitor.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/Visitor.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/Visitor.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/Visitor.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/static_check.h b/static_check.h
index d45b46d..16a4a22 100644
--- a/static_check.h
+++ b/static_check.h
@@ -14,6 +14,8 @@
 #		include "Reference/static_check.h"
 #	elif (__BORLANDC__ >= 0x560)
 #		include "Borland/static_check.h"
+#	elif (_MSC_VER >= 1301)
+#		include "Reference/static_check.h"
 #	elif (_MSC_VER >= 1300)
 #		include "MSVC/1300/static_check.h"
 #	elif (_MSC_VER >= 1200)
diff --git a/tools/HeaderGen/Headers.lst b/tools/HeaderGen/Headers.lst
index 3858963..f1f4be8 100644
--- a/tools/HeaderGen/Headers.lst
+++ b/tools/HeaderGen/Headers.lst
@@ -13,7 +13,7 @@ SmartPtr.h
 static_check.h
 Threads.h
 Tuple.h
-TypeInfo.h
+LokiTypeInfo.h
 Typelist.h
 TypeManip.h
 TypeTraits.h
diff --git a/tools/HeaderGen/vendors.lst b/tools/HeaderGen/vendors.lst
index ce9dcbe..a2e288c 100644
--- a/tools/HeaderGen/vendors.lst
+++ b/tools/HeaderGen/vendors.lst
@@ -7,6 +7,9 @@ Reference
 (__BORLANDC__ >= 0x560)
 Borland
 
+(_MSC_VER >= 1301)
+Reference
+
 (_MSC_VER >= 1300)
 MSVC/1300
 
diff --git a/tools/RegressionTest/UnitTest.h b/tools/RegressionTest/UnitTest.h
index 3d3f652..72deb5e 100644
--- a/tools/RegressionTest/UnitTest.h
+++ b/tools/RegressionTest/UnitTest.h
@@ -97,7 +97,7 @@ public:
   virtual void execute(TestResult &) =0;
   
 protected:
-  ~Test() {}
+  virtual ~Test() {}
 
   void printName(const TestResult &result) const
     {