diff --git a/src/container.h b/src/container.h
index 5e622566..5fffc7b7 100644
--- a/src/container.h
+++ b/src/container.h
@@ -295,11 +295,11 @@ namespace etl
   char(&array_size(T(&array)[ARRAY_SIZE]))[ARRAY_SIZE];
 }
 
-//#if ETL_CPP11_SUPPORTED
-//  #define ETL_ARRAY_SIZE(a) (etl::size(a))
-//#else
+#if ETL_CPP11_SUPPORTED
+  #define ETL_ARRAY_SIZE(a) (etl::size(a))
+#else
   #define ETL_ARRAY_SIZE(a) sizeof(etl::array_size(a))
-//#endif
+#endif
 
 #endif
 
diff --git a/src/generate_variant_pool.bat b/src/generate_variant_pool.bat
new file mode 100644
index 00000000..87d1fba7
--- /dev/null
+++ b/src/generate_variant_pool.bat
@@ -0,0 +1 @@
+python -m cogapp -d -e -ovariant_pool.h -DNTypes=16 variant_pool_generator.h
diff --git a/src/variant_pool.h b/src/variant_pool.h
index f671776a..55e1a45a 100644
--- a/src/variant_pool.h
+++ b/src/variant_pool.h
@@ -26,6 +26,28 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
+#if 0
+#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
+#endif
+
+//***************************************************************************
+// This file has been auto generated. Do not edit this file.
+//***************************************************************************
+
+//***************************************************************************
+// To generate to header file, run this at the command line.
+// Note: You will need Python and COG installed.
+//
+// python -m cogapp -d -e -ovariant_pool.h -DNTypes=<n> variant_pool_generator.h
+// Where <n> is the number of types to support.
+//
+// e.g.
+// To generate handlers for up to 16 types...
+// python -m cogapp -d -e -ovariant_pool.h -DNTypes=16 variant_pool_generator.h
+//
+// See generate.bat
+//***************************************************************************
+
 #ifndef __ETL_VARIANT_POOL__
 #define __ETL_VARIANT_POOL__
 
@@ -82,21 +104,21 @@ namespace etl
 
   //***************************************************************************
   template <const size_t MAX_SIZE_,
-            typename T1,
-            typename T2  = void,
-            typename T3  = void,
-            typename T4  = void,
-            typename T5  = void,
-            typename T6  = void,
-            typename T7  = void,
-            typename T8  = void,
-            typename T9  = void,
-            typename T10 = void,
-            typename T11 = void,
-            typename T12 = void,
-            typename T13 = void,
-            typename T14 = void,
-            typename T15 = void,
+            typename T1, 
+            typename T2 = void, 
+            typename T3 = void, 
+            typename T4 = void, 
+            typename T5 = void, 
+            typename T6 = void, 
+            typename T7 = void, 
+            typename T8 = void, 
+            typename T9 = void, 
+            typename T10 = void, 
+            typename T11 = void, 
+            typename T12 = void, 
+            typename T13 = void, 
+            typename T14 = void, 
+            typename T15 = void, 
             typename T16 = void>
   class variant_pool
   {
@@ -282,15 +304,15 @@ namespace etl
     bool destroy(const T* const p)
     {
       STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value ||
-                     etl::is_base_of<T, T1>::value  ||
-                     etl::is_base_of<T, T2>::value  ||
-                     etl::is_base_of<T, T3>::value  ||
-                     etl::is_base_of<T, T4>::value  ||
-                     etl::is_base_of<T, T5>::value  ||
-                     etl::is_base_of<T, T6>::value  ||
-                     etl::is_base_of<T, T7>::value  ||
-                     etl::is_base_of<T, T8>::value  ||
-                     etl::is_base_of<T, T9>::value  ||
+                     etl::is_base_of<T, T1>::value ||
+                     etl::is_base_of<T, T2>::value ||
+                     etl::is_base_of<T, T3>::value ||
+                     etl::is_base_of<T, T4>::value ||
+                     etl::is_base_of<T, T5>::value ||
+                     etl::is_base_of<T, T6>::value ||
+                     etl::is_base_of<T, T7>::value ||
+                     etl::is_base_of<T, T8>::value ||
+                     etl::is_base_of<T, T9>::value ||
                      etl::is_base_of<T, T10>::value ||
                      etl::is_base_of<T, T11>::value ||
                      etl::is_base_of<T, T12>::value ||
diff --git a/src/variant_pool_generator.h b/src/variant_pool_generator.h
new file mode 100644
index 00000000..6ca24891
--- /dev/null
+++ b/src/variant_pool_generator.h
@@ -0,0 +1,479 @@
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+https://github.com/ETLCPP/etl
+https://www.etlcpp.com
+
+Copyright(c) 2017 jwellbelove
+
+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.
+******************************************************************************/
+
+/*[[[cog
+import cog
+cog.outl("#if 0")
+]]]*/
+/*[[[end]]]*/
+#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
+/*[[[cog
+import cog
+cog.outl("#endif")
+]]]*/
+/*[[[end]]]*/
+
+/*[[[cog
+import cog
+cog.outl("//***************************************************************************")
+cog.outl("// This file has been auto generated. Do not edit this file.")
+cog.outl("//***************************************************************************")
+]]]*/
+/*[[[end]]]*/
+
+//***************************************************************************
+// To generate to header file, run this at the command line.
+// Note: You will need Python and COG installed.
+//
+// python -m cogapp -d -e -ovariant_pool.h -DNTypes=<n> variant_pool_generator.h
+// Where <n> is the number of types to support.
+//
+// e.g.
+// To generate handlers for up to 16 types...
+// python -m cogapp -d -e -ovariant_pool.h -DNTypes=16 variant_pool_generator.h
+//
+// See generate.bat
+//***************************************************************************
+
+#ifndef __ETL_VARIANT_POOL__
+#define __ETL_VARIANT_POOL__
+
+#include <stdint.h>
+#include <utility>
+
+#include "platform.h"
+#include "error_handler.h"
+#include "exception.h"
+#include "largest.h"
+#include "type_traits.h"
+#include "alignment.h"
+#include "static_assert.h"
+#include "type_lookup.h"
+#include <pool.h>
+
+#undef ETL_FILE
+#define ETL_FILE "40"
+
+namespace etl
+{
+  //***************************************************************************
+  class variant_pool_exception : public etl::exception
+  {
+  public:
+
+    variant_pool_exception(string_type reason_, string_type file_name_, numeric_type line_number_)
+      : exception(reason_, file_name_, line_number_)
+    {
+    }
+  };
+
+  //***************************************************************************
+  class variant_pool_cannot_create : public etl::variant_pool_exception
+  {
+  public:
+
+    variant_pool_cannot_create(string_type file_name_, numeric_type line_number_)
+      : variant_pool_exception(ETL_ERROR_TEXT("variant_pool:cannot create", ETL_FILE"A"), file_name_, line_number_)
+    {
+    }
+  };
+
+  //***************************************************************************
+  class variant_pool_did_not_create : public etl::variant_pool_exception
+  {
+  public:
+
+    variant_pool_did_not_create(string_type file_name_, numeric_type line_number_)
+      : variant_pool_exception(ETL_ERROR_TEXT("variant_pool:did not create", ETL_FILE"B"), file_name_, line_number_)
+    {
+    }
+  };
+
+  //***************************************************************************
+  /*[[[cog
+  import cog
+  cog.outl("template <const size_t MAX_SIZE_,")
+  cog.outl("          typename T1, ")
+  for n in range(2, int(NTypes)):
+      cog.outl("          typename T%s = void, " % n)
+      if n % 16 == 0:
+          cog.outl("")
+          cog.out("          ")
+  cog.outl("          typename T%s = void>" % int(NTypes))
+  ]]]*/
+  /*[[[end]]]*/
+  class variant_pool
+  {
+  public:
+
+    static const size_t MAX_SIZE = MAX_SIZE_;
+
+    //*************************************************************************
+    /// Default constructor.
+    //*************************************************************************
+    variant_pool()
+    {
+    }
+
+#if !ETL_CPP11_SUPPORTED
+    //*************************************************************************
+    /// Creates the object. Default constructor.
+    //*************************************************************************
+    template <typename T>
+    T* create()
+    {
+      /*[[[cog
+      import cog
+      cog.out("STATIC_ASSERT((etl::is_one_of<T, ")
+      for n in range(1, int(NTypes)):
+          cog.out("T%s, " % n)
+          if n % 16 == 0:
+              cog.outl("")
+              cog.out("                              ")
+      cog.outl("T%s>::value), \"Unsupported type\");" % int(NTypes))
+      ]]]*/
+      /*[[[end]]]*/
+
+      T* p = nullptr;
+
+      if (pool.full())
+      {
+        ETL_ASSERT(false, ETL_ERROR(etl::variant_pool_cannot_create));
+      }
+      else
+      {
+        p = pool.template allocate<T>();
+
+        if (p != nullptr)
+        {
+          new (p) T();
+        }
+      }
+
+      return p;
+    }
+
+    //*************************************************************************
+    /// Creates the object. One parameter constructor.
+    //*************************************************************************
+    template <typename T, typename TP1>
+    T* create(const TP1& p1)
+    {
+      /*[[[cog
+      import cog
+      cog.out("STATIC_ASSERT((etl::is_one_of<T, ")
+      for n in range(1, int(NTypes)):
+          cog.out("T%s, " % n)
+          if n % 16 == 0:
+              cog.outl("")
+              cog.out("                              ")
+      cog.outl("T%s>::value), \"Unsupported type\");" % int(NTypes))
+      ]]]*/
+      /*[[[end]]]*/
+
+      T* p = nullptr;
+
+      if (pool.full())
+      {
+        ETL_ASSERT(false, ETL_ERROR(etl::variant_pool_cannot_create));
+      }
+      else
+      {
+        p = pool.template allocate<T>();
+
+        if (p != nullptr)
+        {
+          new (p) T(p1);
+        }
+      }
+
+      return p;
+    }
+
+    //*************************************************************************
+    /// Creates the object. Two parameter constructor.
+    //*************************************************************************
+    template <typename T, typename TP1, typename TP2>
+    T* create(const TP1& p1, const TP2& p2)
+    {
+      /*[[[cog
+      import cog
+      cog.out("STATIC_ASSERT((etl::is_one_of<T, ")
+      for n in range(1, int(NTypes)):
+          cog.out("T%s, " % n)
+          if n % 16 == 0:
+              cog.outl("")
+              cog.out("                              ")
+      cog.outl("T%s>::value), \"Unsupported type\");" % int(NTypes))
+      ]]]*/
+      /*[[[end]]]*/
+
+      T* p = nullptr;
+
+      if (pool.full())
+      {
+        ETL_ASSERT(false, ETL_ERROR(etl::variant_pool_cannot_create));
+      }
+      else
+      {
+        p = pool.template allocate<T>();
+
+        if (p != nullptr)
+        {
+          new (p) T(p1, p2);
+        }
+      }
+
+      return p;
+    }
+
+    //*************************************************************************
+    /// Creates the object. Three parameter constructor.
+    //*************************************************************************
+    template <typename T, typename TP1, typename TP2, typename TP3>
+    T* create(const TP1& p1, const TP2& p2, const TP3& p3)
+    {
+      /*[[[cog
+      import cog
+      cog.out("STATIC_ASSERT((etl::is_one_of<T, ")
+      for n in range(1, int(NTypes)):
+          cog.out("T%s, " % n)
+          if n % 16 == 0:
+              cog.outl("")
+              cog.out("                              ")
+      cog.outl("T%s>::value), \"Unsupported type\");" % int(NTypes))
+      ]]]*/
+      /*[[[end]]]*/
+
+      T* p = nullptr;
+
+      if (pool.full())
+      {
+        ETL_ASSERT(false, ETL_ERROR(etl::variant_pool_cannot_create));
+      }
+      else
+      {
+        p = pool.template allocate<T>();
+
+        if (p != nullptr)
+        {
+          new (p) T(p1, p2, p3);
+        }
+      }
+
+      return p;
+    }
+
+    //*************************************************************************
+    /// Creates the object. Four parameter constructor.
+    //*************************************************************************
+    template <typename T, typename TP1, typename TP2, typename TP3, typename TP4>
+    T* create(const TP1& p1, const TP2& p2, const TP3& p3, const TP4& p4)
+    {
+      /*[[[cog
+      import cog
+      cog.out("STATIC_ASSERT((etl::is_one_of<T, ")
+      for n in range(1, int(NTypes)):
+          cog.out("T%s, " % n)
+          if n % 16 == 0:
+              cog.outl("")
+              cog.out("                              ")
+      cog.outl("T%s>::value), \"Unsupported type\");" % int(NTypes))
+      ]]]*/
+      /*[[[end]]]*/
+
+      T* p = nullptr;
+
+      if (pool.full())
+      {
+        ETL_ASSERT(false, ETL_ERROR(etl::variant_pool_cannot_create));
+      }
+      else
+      {
+        p = pool.template allocate<T>();
+
+        if (p != nullptr)
+        {
+          new (p) T(p1, p2, p3, p4);
+        }
+      }
+
+      return p;
+    }
+#else
+    //*************************************************************************
+    /// Creates the object from a type. Variadic parameter constructor.
+    //*************************************************************************
+    template <typename T, typename... Args>
+    T* create(Args&&... args)
+    {
+      /*[[[cog
+      import cog
+      cog.out("STATIC_ASSERT((etl::is_one_of<T, ")
+      for n in range(1, int(NTypes)):
+          cog.out("T%s, " % n)
+          if n % 16 == 0:
+              cog.outl("")
+              cog.out("                              ")
+      cog.outl("T%s>::value), \"Unsupported type\");" % int(NTypes))
+      ]]]*/
+      /*[[[end]]]*/
+
+      T* p = nullptr;
+
+      if (pool.full())
+      {
+        ETL_ASSERT(false, ETL_ERROR(etl::variant_pool_cannot_create));
+      }
+      else
+      {
+        p = pool.template allocate<T>();
+
+        if (p != nullptr)
+        {
+          new (p) T(std::forward<Args>(args)...);
+        }
+      }
+
+      return p;
+    }
+#endif
+
+    //*************************************************************************
+    /// Destroys the object.
+    //*************************************************************************
+    template <typename T>
+    bool destroy(const T* const p)
+    {
+      /*[[[cog
+      import cog
+      cog.out("STATIC_ASSERT((etl::is_one_of<T, ")
+      for n in range(1, int(NTypes)):
+          cog.out("T%s, " % n)
+          if n % 16 == 0:
+              cog.outl("")
+              cog.out("                              ")
+      cog.outl("T%s>::value ||" % int(NTypes))
+
+      for n in range(1, int(NTypes)):
+          cog.outl("               etl::is_base_of<T, T%s>::value ||" % n)
+      cog.outl("               etl::is_base_of<T, T%s>::value), \"Invalid type\");" % int(NTypes))
+
+      ]]]*/
+      /*[[[end]]]*/
+
+      p->~T();
+
+      void* vp = reinterpret_cast<char*>(const_cast<T*>(p));
+
+      if (pool.is_in_pool(vp))
+      {
+        pool.release(vp);
+        return true;
+      }
+      else
+      {
+        ETL_ASSERT(false, ETL_ERROR(variant_pool_did_not_create));
+        return false;
+      }
+    }
+
+    //*************************************************************************
+    /// Returns the maximum number of items in the variant_pool.
+    //*************************************************************************
+    size_t max_size() const
+    {
+      return MAX_SIZE;
+    }
+
+    //*************************************************************************
+    /// Returns the number of free items in the variant_pool.
+    //*************************************************************************
+    size_t available() const
+    {
+      return pool.available();
+    }
+
+    //*************************************************************************
+    /// Returns the number of allocated items in the variant_pool.
+    //*************************************************************************
+    size_t size() const
+    {
+      return pool.size();
+    }
+
+    //*************************************************************************
+    /// Checks to see if there are no allocated items in the variant_pool.
+    /// \return <b>true</b> if there are none allocated.
+    //*************************************************************************
+    bool empty() const
+    {
+      return pool.empty();
+    }
+
+    //*************************************************************************
+    /// Checks to see if there are no free items in the variant_pool.
+    /// \return <b>true</b> if there are none free.
+    //*************************************************************************
+    bool full() const
+    {
+      return pool.full();
+    }
+
+  private:
+
+    variant_pool(const variant_pool&);
+    variant_pool& operator =(const variant_pool&);
+
+    // The pool.
+    /*[[[cog
+    import cog
+    cog.out("etl::generic_pool<etl::largest<")
+    for n in range(1, int(NTypes)):
+        cog.out("T%s, " % n)
+        if n % 16 == 0:
+            cog.outl("")
+            cog.out("                  ")
+    cog.outl("T%s>::size," % int(NTypes))
+
+    cog.out("                  etl::largest<")
+    for n in range(1, int(NTypes)):
+        cog.out("T%s, " % n)
+        if n % 16 == 0:
+            cog.outl("")
+            cog.out("                  ")
+    cog.outl("T%s>::alignment," % int(NTypes))
+    cog.outl("                  MAX_SIZE> pool;")
+    ]]]*/
+    /*[[[end]]]*/
+  };
+}
+
+#undef ETL_FILE
+
+#endif
diff --git a/test/codeblocks/.gitignore b/test/codeblocks/.gitignore
index 1c0f0f11..bb6d6ef9 100644
--- a/test/codeblocks/.gitignore
+++ b/test/codeblocks/.gitignore
@@ -2,3 +2,4 @@ random_*.csv
 /ETL.depend
 /ETL.layout
 *.depend
+*.layout
diff --git a/test/codeblocks/ETL.layout b/test/codeblocks/ETL.layout
index 9c71eeb5..5b77f6af 100644
--- a/test/codeblocks/ETL.layout
+++ b/test/codeblocks/ETL.layout
@@ -2,439 +2,49 @@
 <CodeBlocks_layout_file>
 	<FileVersion major="1" minor="0" />
 	<ActiveTarget name="Windows" />
-	<File name="..\..\src\multimap.h" open="0" top="0" tabpos="46" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="7557" topLine="193" />
-		</Cursor>
-	</File>
-	<File name="..\test_flat_map.cpp" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="7577" topLine="189" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\memory.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2221" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\array_wrapper.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4244" topLine="93" />
-		</Cursor>
-	</File>
-	<File name="..\test_message_router.cpp" open="0" top="0" tabpos="88" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4827" topLine="140" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\multiset.h" open="0" top="0" tabpos="45" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="7599" topLine="193" />
-		</Cursor>
-	</File>
-	<File name="..\test_variant.cpp" open="0" top="0" tabpos="71" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="7555" topLine="221" />
-		</Cursor>
-	</File>
-	<File name="..\test_type_traits.cpp" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="37662" topLine="472" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\type_def.h" open="0" top="0" tabpos="61" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2398" topLine="38" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\private\ivectorpointer.h" open="0" top="0" tabpos="26" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="18646" topLine="415" />
-		</Cursor>
-	</File>
-	<File name="..\test_task_scheduler.cpp" open="0" top="0" tabpos="65" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2139" topLine="52" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\list.h" open="0" top="0" tabpos="43" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="11472" topLine="283" />
-		</Cursor>
-	</File>
-	<File name="..\test_intrusive_links.cpp" open="0" top="0" tabpos="39" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="39889" topLine="1110" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\unordered_set.h" open="0" top="0" tabpos="68" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="24920" topLine="711" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\type_traits.h" open="0" top="0" tabpos="72" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="0" topLine="12" />
-		</Cursor>
-	</File>
-	<File name="..\..\unittest-cpp\UnitTest++\HelperMacros.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="0" topLine="35" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\string_view.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="20498" topLine="537" />
-		</Cursor>
-	</File>
 	<File name="..\..\src\callback_timer.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="16444" topLine="558" />
 		</Cursor>
 	</File>
-	<File name="..\..\src\intrusive_flat_map.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4065" topLine="242" />
-		</Cursor>
-	</File>
-	<File name="..\test_forward_list.cpp" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5177" topLine="80" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\cstring.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4190" topLine="27" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\user_type.h" open="0" top="0" tabpos="70" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5459" topLine="68" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\queue.h" open="0" top="0" tabpos="48" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5750" topLine="102" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\private\vector_base.h" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5342" topLine="94" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\flat_set.h" open="0" top="0" tabpos="34" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="18892" topLine="471" />
-		</Cursor>
-	</File>
-	<File name="..\test_intrusive_stack.cpp" open="0" top="0" tabpos="58" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1641" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\unordered_map.h" open="0" top="0" tabpos="62" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="19759" topLine="537" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\profiles\gcc_windows_x86.h" open="0" top="0" tabpos="74" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1761" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\profiles\armv5.h" open="0" top="0" tabpos="76" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1889" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\function.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="13069" topLine="359" />
-		</Cursor>
-	</File>
-	<File name="..\..\unittest-cpp\UnitTest++\Checks.cpp" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="0" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\message_router.h" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5518" topLine="138" />
-		</Cursor>
-	</File>
-	<File name="..\test_checksum.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="218" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\flat_multimap.h" open="0" top="0" tabpos="30" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="24090" topLine="583" />
-		</Cursor>
-	</File>
-	<File name="..\test_instance_count.cpp" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1957" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\u16string.h" open="0" top="0" tabpos="51" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="3035" topLine="57" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\profiles\cpp03.h" open="0" top="0" tabpos="78" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1891" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\test_binary.cpp" open="0" top="0" tabpos="89" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="47560" topLine="1228" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\profiles\cpp14.h" open="0" top="0" tabpos="80" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1888" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\pool.h" open="0" top="0" tabpos="31" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="15670" topLine="382" />
-		</Cursor>
-	</File>
-	<File name="..\test_list.cpp" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4552" topLine="80" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\error_handler.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2935" topLine="56" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\set.h" open="0" top="0" tabpos="64" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="18154" topLine="461" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\message_timer.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="14673" topLine="484" />
-		</Cursor>
-	</File>
-	<File name="..\test_endian.cpp" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1392" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\message_bus.h" open="0" top="0" tabpos="86" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="9567" topLine="248" />
-		</Cursor>
-	</File>
-	<File name="..\test_error_handler.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2281" topLine="4" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\io_port.h" open="0" top="0" tabpos="42" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4011" topLine="132" />
-		</Cursor>
-	</File>
-	<File name="..\test_string_u32.cpp" open="0" top="0" tabpos="56" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="21412" topLine="691" />
-		</Cursor>
-	</File>
-	<File name="..\test_string_wchar_t.cpp" open="0" top="0" tabpos="57" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="21101" topLine="685" />
-		</Cursor>
-	</File>
-	<File name="..\..\unittest-cpp\UnitTest++\MemoryOutStream.h" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="178" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\flat_map.h" open="0" top="0" tabpos="28" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="10984" topLine="246" />
-		</Cursor>
-	</File>
-	<File name="..\..\unittest-cpp\UnitTest++\Posix\SignalTranslator.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1062" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\test_intrusive_queue.cpp" open="0" top="0" tabpos="63" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1641" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\vector.h" open="0" top="0" tabpos="83" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="832" topLine="7" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\binary.h" open="0" top="0" tabpos="90" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="14862" topLine="310" />
-		</Cursor>
-	</File>
-	<File name="..\test_message_bus.cpp" open="0" top="0" tabpos="87" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4035" topLine="143" />
-		</Cursor>
-	</File>
-	<File name="..\main.cpp" open="0" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="141" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\basic_string.h" open="0" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="66388" topLine="1848" />
-		</Cursor>
-	</File>
-	<File name="..\test_string_char.cpp" open="0" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="21608" topLine="677" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\wstring.h" open="0" top="0" tabpos="55" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5149" topLine="104" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\stack.h" open="0" top="0" tabpos="50" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5893" topLine="104" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\pearson.h" open="0" top="0" tabpos="49" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4500" topLine="94" />
-		</Cursor>
-	</File>
-	<File name="..\test_callback_timer.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5922" topLine="109" />
-		</Cursor>
-	</File>
-	<File name="..\test_pearson.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1707" topLine="29" />
-		</Cursor>
-	</File>
-	<File name="..\test_message_timer.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="3030" topLine="92" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\deque.h" open="0" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="67409" topLine="1989" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\reference_flat_set.h" open="0" top="0" tabpos="35" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="6404" topLine="199" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\platform.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1621" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\test_deque.cpp" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4328" topLine="87" />
-		</Cursor>
-	</File>
-	<File name="..\test_intrusive_forward_list.cpp" open="0" top="0" tabpos="36" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="37971" topLine="942" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\reference_flat_multimap.h" open="0" top="0" tabpos="29" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5897" topLine="182" />
-		</Cursor>
-	</File>
-	<File name="..\test_exception.cpp" open="1" top="1" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1261" topLine="8" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\array.h" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1970" topLine="47" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\profiles\gcc_generic.h" open="0" top="0" tabpos="81" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1738" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="775" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\unordered_multimap.h" open="0" top="0" tabpos="66" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="33847" topLine="959" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\reference_flat_map.h" open="0" top="0" tabpos="27" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="6877" topLine="207" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\bitset.h" open="0" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="19345" topLine="665" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\forward_list.h" open="0" top="0" tabpos="37" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="10238" topLine="270" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\enum_type.h" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="3810" topLine="60" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\profiles\gcc_linux_x86.h" open="0" top="0" tabpos="82" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1735" topLine="0" />
-		</Cursor>
-	</File>
 	<File name="..\..\src\profiles\arduino_arm.h" open="0" top="0" tabpos="75" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="1881" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="..\etl_profile.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_message_router.cpp" open="0" top="0" tabpos="88" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="853" topLine="0" />
+			<Cursor1 position="4827" topLine="140" />
 		</Cursor>
 	</File>
-	<File name="..\test_packet.cpp" open="0" top="0" tabpos="53" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\src\intrusive_list.h" open="0" top="0" tabpos="41" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="1942" topLine="39" />
+			<Cursor1 position="33670" topLine="1023" />
 		</Cursor>
 	</File>
-	<File name="..\..\src\flat_multiset.h" open="0" top="0" tabpos="33" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\unittest-cpp\UnitTest++\MemoryOutStream.h" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="11498" topLine="256" />
+			<Cursor1 position="178" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="..\..\unittest-cpp\UnitTest++\CheckMacros.h" open="0" top="0" tabpos="24" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\src\static_assert.h" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="19645" topLine="116" />
+			<Cursor1 position="1460" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\test_message_timer.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3030" topLine="92" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\pool.h" open="0" top="0" tabpos="31" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="15670" topLine="382" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\list.h" open="0" top="0" tabpos="43" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="11472" topLine="283" />
 		</Cursor>
 	</File>
 	<File name="..\..\src\profiles\msvc_x86.h" open="0" top="0" tabpos="73" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -442,9 +52,154 @@
 			<Cursor1 position="1761" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="..\..\src\profiles\armv6.h" open="0" top="0" tabpos="77" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_forward_list.cpp" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="1890" topLine="0" />
+			<Cursor1 position="5177" topLine="80" />
+		</Cursor>
+	</File>
+	<File name="..\test_string_char.cpp" open="0" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="21608" topLine="677" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\platform.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1621" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\message_router.h" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="5518" topLine="138" />
+		</Cursor>
+	</File>
+	<File name="..\test_deque.cpp" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4328" topLine="87" />
+		</Cursor>
+	</File>
+	<File name="..\main.cpp" open="0" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="141" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\test_string_u32.cpp" open="0" top="0" tabpos="56" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="21412" topLine="691" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\profiles\gcc_generic.h" open="0" top="0" tabpos="81" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1738" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\multimap.h" open="0" top="0" tabpos="46" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="7557" topLine="193" />
+		</Cursor>
+	</File>
+	<File name="..\test_checksum.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="218" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\error_handler.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2935" topLine="56" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\variant.h" open="0" top="0" tabpos="69" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="33022" topLine="747" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\array.h" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1970" topLine="47" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\queue.h" open="0" top="0" tabpos="48" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="5750" topLine="102" />
+		</Cursor>
+	</File>
+	<File name="..\..\unittest-cpp\UnitTest++\Posix\SignalTranslator.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1062" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\reference_flat_map.h" open="0" top="0" tabpos="27" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="6877" topLine="207" />
+		</Cursor>
+	</File>
+	<File name="..\test_type_traits.cpp" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="37662" topLine="472" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\unordered_set.h" open="0" top="0" tabpos="68" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="24920" topLine="711" />
+		</Cursor>
+	</File>
+	<File name="..\test_intrusive_forward_list.cpp" open="0" top="0" tabpos="36" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="37971" topLine="942" />
+		</Cursor>
+	</File>
+	<File name="..\test_string_view.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="30686" topLine="645" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\type_def.h" open="0" top="0" tabpos="61" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2398" topLine="38" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\private\vector_base.h" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="5342" topLine="94" />
+		</Cursor>
+	</File>
+	<File name="..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="775" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\wstring.h" open="0" top="0" tabpos="55" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="5149" topLine="104" />
+		</Cursor>
+	</File>
+	<File name="..\data.h" open="0" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2648" topLine="75" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\u16string.h" open="0" top="0" tabpos="51" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3035" topLine="57" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\profiles\cpp14.h" open="0" top="0" tabpos="80" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1888" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\cstring.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4190" topLine="27" />
+		</Cursor>
+	</File>
+	<File name="..\test_exception.cpp" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1261" topLine="8" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\io_port.h" open="0" top="0" tabpos="42" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4011" topLine="132" />
 		</Cursor>
 	</File>
 	<File name="..\test_array.cpp" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -457,124 +212,19 @@
 			<Cursor1 position="2474" topLine="34" />
 		</Cursor>
 	</File>
-	<File name="..\test_vector_non_trivial.cpp" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\src\intrusive_flat_map.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="4068" topLine="65" />
+			<Cursor1 position="4065" topLine="242" />
 		</Cursor>
 	</File>
-	<File name="..\..\src\u32string.h" open="0" top="0" tabpos="54" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\src\unordered_map.h" open="0" top="0" tabpos="62" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="6674" topLine="103" />
+			<Cursor1 position="19759" topLine="537" />
 		</Cursor>
 	</File>
-	<File name="..\test_string_u16.cpp" open="0" top="0" tabpos="52" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\src\profiles\cpp03.h" open="0" top="0" tabpos="78" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="21098" topLine="685" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\intrusive_list.h" open="0" top="0" tabpos="41" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="33670" topLine="1023" />
-		</Cursor>
-	</File>
-	<File name="..\test_flat_multimap.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="6646" topLine="148" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\reference_flat_multiset.h" open="0" top="0" tabpos="32" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="6534" topLine="199" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\frame_check_sequence.h" open="0" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4943" topLine="79" />
-		</Cursor>
-	</File>
-	<File name="..\test_flat_multiset.cpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4714" topLine="134" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\exception.h" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="3744" topLine="51" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\static_assert.h" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1460" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\map.h" open="0" top="0" tabpos="59" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="7462" topLine="200" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\fsm.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="9501" topLine="262" />
-		</Cursor>
-	</File>
-	<File name="..\test_string_view.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="30686" topLine="645" />
-		</Cursor>
-	</File>
-	<File name="..\data.h" open="0" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2648" topLine="75" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\variant.h" open="0" top="0" tabpos="69" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="33022" topLine="747" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\profiles\ticc.h" open="0" top="0" tabpos="84" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1902" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\test_algorithm.cpp" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2243" topLine="43" />
-		</Cursor>
-	</File>
-	<File name="..\test_fsm.cpp" open="0" top="0" tabpos="40" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="7419" topLine="228" />
-		</Cursor>
-	</File>
-	<File name="..\..\unittest-cpp\UnitTest++\Checks.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="493" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\profiles\cpp11.h" open="0" top="0" tabpos="79" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1888" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\optional.h" open="0" top="0" tabpos="60" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4686" topLine="111" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\unordered_multiset.h" open="0" top="0" tabpos="67" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="25789" topLine="730" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\murmur3.h" open="0" top="0" tabpos="47" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2487" topLine="52" />
-		</Cursor>
-	</File>
-	<File name="..\test_array_view.cpp" open="0" top="0" tabpos="91" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="17474" topLine="550" />
+			<Cursor1 position="1891" topLine="0" />
 		</Cursor>
 	</File>
 	<File name="..\test_flat_set.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -582,4 +232,354 @@
 			<Cursor1 position="4549" topLine="98" />
 		</Cursor>
 	</File>
+	<File name="..\..\src\message_timer.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="14673" topLine="484" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\flat_multimap.h" open="0" top="0" tabpos="30" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="24090" topLine="583" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\unordered_multiset.h" open="0" top="0" tabpos="67" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="25789" topLine="730" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\basic_string.h" open="0" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="66388" topLine="1848" />
+		</Cursor>
+	</File>
+	<File name="..\test_fsm.cpp" open="0" top="0" tabpos="40" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="7419" topLine="228" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\map.h" open="0" top="0" tabpos="59" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="7462" topLine="200" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\forward_list.h" open="0" top="0" tabpos="37" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="10238" topLine="270" />
+		</Cursor>
+	</File>
+	<File name="..\test_vector_non_trivial.cpp" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4068" topLine="48" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\frame_check_sequence.h" open="0" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4943" topLine="79" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\stack.h" open="0" top="0" tabpos="50" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="5893" topLine="104" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\optional.h" open="0" top="0" tabpos="60" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4686" topLine="111" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\flat_multiset.h" open="0" top="0" tabpos="33" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="11498" topLine="256" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\profiles\armv6.h" open="0" top="0" tabpos="77" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1890" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\etl_profile.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="853" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\function.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="13069" topLine="359" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\user_type.h" open="0" top="0" tabpos="70" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="5459" topLine="68" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\reference_flat_multimap.h" open="0" top="0" tabpos="29" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="5897" topLine="182" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\vector.h" open="0" top="0" tabpos="83" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="832" topLine="7" />
+		</Cursor>
+	</File>
+	<File name="..\test_string_wchar_t.cpp" open="0" top="0" tabpos="57" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="21101" topLine="685" />
+		</Cursor>
+	</File>
+	<File name="..\test_list.cpp" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4552" topLine="80" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\profiles\ticc.h" open="0" top="0" tabpos="84" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1902" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\test_error_handler.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2281" topLine="4" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\enum_type.h" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3810" topLine="60" />
+		</Cursor>
+	</File>
+	<File name="..\test_intrusive_stack.cpp" open="0" top="0" tabpos="58" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1641" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\test_algorithm.cpp" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2243" topLine="43" />
+		</Cursor>
+	</File>
+	<File name="..\test_string_u16.cpp" open="0" top="0" tabpos="52" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="21098" topLine="685" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\private\ivectorpointer.h" open="0" top="0" tabpos="26" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="18646" topLine="415" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\array_wrapper.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4244" topLine="93" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\flat_set.h" open="0" top="0" tabpos="34" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="18892" topLine="471" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\profiles\gcc_windows_x86.h" open="0" top="0" tabpos="74" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1761" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\deque.h" open="1" top="1" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="65224" topLine="1935" />
+		</Cursor>
+	</File>
+	<File name="..\test_binary.cpp" open="0" top="0" tabpos="89" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="47560" topLine="1228" />
+		</Cursor>
+	</File>
+	<File name="..\test_variant.cpp" open="0" top="0" tabpos="71" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="7555" topLine="221" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\type_traits.h" open="0" top="0" tabpos="72" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="12" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\profiles\cpp11.h" open="0" top="0" tabpos="79" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1888" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\test_endian.cpp" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1392" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\binary.h" open="0" top="0" tabpos="90" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="14862" topLine="310" />
+		</Cursor>
+	</File>
+	<File name="..\test_flat_map.cpp" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="7577" topLine="189" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\exception.h" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3744" topLine="51" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\reference_flat_set.h" open="0" top="0" tabpos="35" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="6404" topLine="199" />
+		</Cursor>
+	</File>
+	<File name="..\test_packet.cpp" open="0" top="0" tabpos="53" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1942" topLine="39" />
+		</Cursor>
+	</File>
+	<File name="..\..\unittest-cpp\UnitTest++\CheckMacros.h" open="1" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="23525" topLine="159" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\pearson.h" open="0" top="0" tabpos="49" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4500" topLine="94" />
+		</Cursor>
+	</File>
+	<File name="..\test_message_bus.cpp" open="0" top="0" tabpos="87" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4035" topLine="143" />
+		</Cursor>
+	</File>
+	<File name="..\test_intrusive_links.cpp" open="0" top="0" tabpos="39" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="39889" topLine="1110" />
+		</Cursor>
+	</File>
+	<File name="..\test_task_scheduler.cpp" open="0" top="0" tabpos="65" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2139" topLine="52" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\u32string.h" open="0" top="0" tabpos="54" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="6674" topLine="103" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\profiles\armv5.h" open="0" top="0" tabpos="76" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1889" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\murmur3.h" open="0" top="0" tabpos="47" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2487" topLine="52" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\bitset.h" open="0" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="19345" topLine="665" />
+		</Cursor>
+	</File>
+	<File name="..\test_intrusive_queue.cpp" open="0" top="0" tabpos="63" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1641" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\fsm.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="9501" topLine="262" />
+		</Cursor>
+	</File>
+	<File name="..\..\unittest-cpp\UnitTest++\Checks.cpp" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\profiles\gcc_linux_x86.h" open="0" top="0" tabpos="82" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1735" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\test_flat_multiset.cpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4714" topLine="134" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\memory.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2221" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\flat_map.h" open="0" top="0" tabpos="28" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="10984" topLine="246" />
+		</Cursor>
+	</File>
+	<File name="..\..\unittest-cpp\UnitTest++\HelperMacros.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="35" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\string_view.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="20498" topLine="537" />
+		</Cursor>
+	</File>
+	<File name="..\test_flat_multimap.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="6646" topLine="148" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\message_bus.h" open="0" top="0" tabpos="86" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="9567" topLine="248" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\reference_flat_multiset.h" open="0" top="0" tabpos="32" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="6534" topLine="199" />
+		</Cursor>
+	</File>
+	<File name="..\test_callback_timer.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="5922" topLine="109" />
+		</Cursor>
+	</File>
+	<File name="..\test_array_view.cpp" open="0" top="0" tabpos="91" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="17474" topLine="550" />
+		</Cursor>
+	</File>
+	<File name="..\..\unittest-cpp\UnitTest++\Checks.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="493" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\unordered_multimap.h" open="0" top="0" tabpos="66" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="33847" topLine="959" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\set.h" open="0" top="0" tabpos="64" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="18154" topLine="461" />
+		</Cursor>
+	</File>
+	<File name="..\test_pearson.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1707" topLine="29" />
+		</Cursor>
+	</File>
+	<File name="..\test_instance_count.cpp" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1957" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\multiset.h" open="0" top="0" tabpos="45" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="7599" topLine="193" />
+		</Cursor>
+	</File>
 </CodeBlocks_layout_file>
diff --git a/test/vs2017/etl.vcxproj b/test/vs2017/etl.vcxproj
index 49eab9a4..46b66b98 100644
--- a/test/vs2017/etl.vcxproj
+++ b/test/vs2017/etl.vcxproj
@@ -171,6 +171,7 @@
     <ClInclude Include="..\..\src\type_lookup_generator.h" />
     <ClInclude Include="..\..\src\type_traits_generator.h" />
     <ClInclude Include="..\..\src\variant_pool.h" />
+    <ClInclude Include="..\..\src\variant_pool_generator.h" />
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\AssertException.h" />
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\CheckMacros.h" />
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\Checks.h" />
@@ -478,6 +479,7 @@
     <None Include="..\..\src\generate_smallest.bat" />
     <None Include="..\..\src\generate_type_lookup.bat" />
     <None Include="..\..\src\generate_type_traits.bat" />
+    <None Include="..\..\src\generate_variant_pool.bat" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\src\file_error_numbers.txt" />
diff --git a/test/vs2017/etl.vcxproj.filters b/test/vs2017/etl.vcxproj.filters
index dea71e14..77db216e 100644
--- a/test/vs2017/etl.vcxproj.filters
+++ b/test/vs2017/etl.vcxproj.filters
@@ -58,6 +58,9 @@
     <Filter Include="ECL">
       <UniqueIdentifier>{4ac80fd1-3eca-4775-8695-eb1ea39c93f1}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ETL\Containers\Generators">
+      <UniqueIdentifier>{e4a699ae-e7f3-418e-bf9f-211c21f7f4b2}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\doxygen.h">
@@ -570,6 +573,9 @@
     <ClInclude Include="..\..\src\array_wrapper.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\variant_pool_generator.h">
+      <Filter>ETL\Containers\Generators</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\main.cpp">
@@ -985,6 +991,9 @@
     <None Include="..\..\src\generate_type_lookup.bat">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="..\..\src\generate_variant_pool.bat">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\src\file_error_numbers.txt">