From 4812d621c713449cade8f980ee12357b5e8e515d Mon Sep 17 00:00:00 2001
From: jwellbelove <github@wellbelove.co.uk>
Date: Mon, 16 Mar 2015 20:03:09 +0000
Subject: [PATCH] Updated project files

---
 test/codeblocks/ETL.depend  |  38 ++---
 test/codeblocks/ETL.layout  | 298 ++++++++++++++++++------------------
 test/iar/etl.dep            | 218 +++++++++++++-------------
 test/iar/etl.ewp            |   9 +-
 test/iar/etl.ewt            |   9 +-
 test/iar/settings/etl.wsdt  |  14 +-
 test/keil/Test1.uvguix.John | 155 +++----------------
 test/keil/Test1.uvoptx      |  13 ++
 test/keil/Test1.uvprojx     |   9 +-
 9 files changed, 336 insertions(+), 427 deletions(-)

diff --git a/test/codeblocks/ETL.depend b/test/codeblocks/ETL.depend
index a2976d9e..448fbc7b 100644
--- a/test/codeblocks/ETL.depend
+++ b/test/codeblocks/ETL.depend
@@ -277,7 +277,7 @@
 	<iostream>
 	<numeric>
 
-1426200441 u:\users\john\documents\programming\github\etl\deque.h
+1426446210 u:\users\john\documents\programming\github\etl\deque.h
 	<stddef.h>
 	<stdint.h>
 	<iterator>
@@ -384,7 +384,7 @@
 	"container.h"
 	"pool.h"
 
-1425213266 u:\users\john\documents\programming\github\etl\map.h
+1426446210 u:\users\john\documents\programming\github\etl\map.h
 	<stddef.h>
 	<iterator>
 	<functional>
@@ -392,7 +392,7 @@
 	"container.h"
 	"pool.h"
 
-1425218865 u:\users\john\documents\programming\github\etl\ilist.h
+1426446210 u:\users\john\documents\programming\github\etl\ilist.h
 	<iterator>
 	<algorithm>
 	<functional>
@@ -454,7 +454,7 @@
 	"exception.h"
 	"error_handler.h"
 
-1426199961 u:\users\john\documents\programming\github\etl\vector.h
+1426446211 u:\users\john\documents\programming\github\etl\vector.h
 	<stddef.h>
 	<stdint.h>
 	<iterator>
@@ -463,7 +463,7 @@
 	"alignment.h"
 	"array.h"
 
-1426332084 u:\users\john\documents\programming\github\etl\ivector.h
+1426446210 u:\users\john\documents\programming\github\etl\ivector.h
 	<iterator>
 	<algorithm>
 	<functional>
@@ -488,7 +488,7 @@
 
 1415139315 h"
 
-1426200110 u:\users\john\documents\programming\github\etl\queue.h
+1426446211 u:\users\john\documents\programming\github\etl\queue.h
 	<stddef.h>
 	<stdint.h>
 	"iqueue.h"
@@ -513,7 +513,7 @@
 	"data.h"
 	"../stack.h"
 
-1426200110 u:\users\john\documents\programming\github\etl\stack.h
+1426446211 u:\users\john\documents\programming\github\etl\stack.h
 	<stddef.h>
 	<stdint.h>
 	<algorithm>
@@ -1068,7 +1068,7 @@
 	<bitset>
 	"../bitset.h"
 
-1425209567 u:\users\john\documents\programming\github\etl\bitset.h
+1426446210 u:\users\john\documents\programming\github\etl\bitset.h
 	<algorithm>
 	<iterator>
 	<string.h>
@@ -1108,7 +1108,7 @@
 	"iforward_list.h"
 	"container.h"
 
-1425218933 u:\users\john\documents\programming\github\etl\iforward_list.h
+1426446210 u:\users\john\documents\programming\github\etl\iforward_list.h
 	<iterator>
 	<algorithm>
 	<functional>
@@ -1135,7 +1135,7 @@
 	<string>
 	<ostream>
 
-1426431014 u:\users\john\documents\programming\github\etl\alignment.h
+1426531794 u:\users\john\documents\programming\github\etl\alignment.h
 	<stdint.h>
 	"type_traits.h"
 	"static_assert.h"
@@ -1168,7 +1168,7 @@
 	<vector>
 	"../pool.h"
 
-1426200242 u:\users\john\documents\programming\github\etl\pool.h
+1426446210 u:\users\john\documents\programming\github\etl\pool.h
 	"alignment.h"
 	"array.h"
 	"bitset.h"
@@ -1187,7 +1187,7 @@
 	<vector>
 	<algorithm>
 
-1426330322 u:\users\john\documents\programming\github\etl\variant.h
+1426535511 u:\users\john\documents\programming\github\etl\variant.h
 	<stdint.h>
 	"array.h"
 	"largest.h"
@@ -1307,7 +1307,7 @@
 	"fnv_1.h"
 	"type_traits.h"
 
-1426376202 u:\users\john\documents\programming\github\etl\ibitset.h
+1426446210 u:\users\john\documents\programming\github\etl\ibitset.h
 	"integral_limits.h"
 
 1423387319 source:u:\users\john\documents\programming\github\etl\test\test_lookup.cpp
@@ -1346,7 +1346,7 @@
 	"ivector.h"
 	"error_handler.h"
 
-1425217244 u:\users\john\documents\programming\github\etl\ipool.h
+1426446210 u:\users\john\documents\programming\github\etl\ipool.h
 	<iterator>
 	"pool_base.h"
 	"nullptr.h"
@@ -1406,7 +1406,7 @@
 	"../fnv_1.h"
 	"../integral_limits.h"
 
-1426331677 u:\users\john\documents\programming\github\etl\binary.h
+1426446210 u:\users\john\documents\programming\github\etl\binary.h
 	"type_traits.h"
 	"integral_limits.h"
 	"static_assert.h"
@@ -1423,14 +1423,14 @@
 	"data.h"
 	"../flat_map.h"
 
-1425322641 u:\users\john\documents\programming\github\etl\flat_map.h
+1426446210 u:\users\john\documents\programming\github\etl\flat_map.h
 	<stddef.h>
 	<iterator>
 	<functional>
 	"iflat_map.h"
 	"vector.h"
 
-1426332084 u:\users\john\documents\programming\github\etl\iflat_map.h
+1426446210 u:\users\john\documents\programming\github\etl\iflat_map.h
 	<iterator>
 	<algorithm>
 	<functional>
@@ -1460,14 +1460,14 @@
 	"data.h"
 	"../flat_set.h"
 
-1425213485 u:\users\john\documents\programming\github\etl\flat_set.h
+1426446210 u:\users\john\documents\programming\github\etl\flat_set.h
 	<stddef.h>
 	<iterator>
 	<functional>
 	"iflat_set.h"
 	"vector.h"
 
-1425218933 u:\users\john\documents\programming\github\etl\iflat_set.h
+1426446210 u:\users\john\documents\programming\github\etl\iflat_set.h
 	<iterator>
 	<algorithm>
 	<functional>
diff --git a/test/codeblocks/ETL.layout b/test/codeblocks/ETL.layout
index b2265b6c..416090a8 100644
--- a/test/codeblocks/ETL.layout
+++ b/test/codeblocks/ETL.layout
@@ -1,24 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="Windows" />
-	<File name="..\..\queue.h" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_queue.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="2984" topLine="48" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\Config.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="773" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\test_type_traits.cpp" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="34843" topLine="428" />
-		</Cursor>
-	</File>
-	<File name="..\..\Doxyfile" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="56760" topLine="1251" />
+			<Cursor1 position="1603" topLine="28" />
 		</Cursor>
 	</File>
 	<File name="..\..\type_traits.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -26,141 +11,46 @@
 			<Cursor1 position="5782" topLine="136" />
 		</Cursor>
 	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\Posix\SignalTranslator.h" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_array.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="616" topLine="0" />
+			<Cursor1 position="2123" topLine="55" />
 		</Cursor>
 	</File>
-	<File name="..\test_bitset.cpp" open="1" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_bitset.cpp" open="1" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="17510" topLine="588" />
 		</Cursor>
 	</File>
-	<File name="..\..\io_port.h" open="1" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="7715" topLine="301" />
-		</Cursor>
-	</File>
-	<File name="..\main.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="277" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\function.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="3693" topLine="67" />
-		</Cursor>
-	</File>
-	<File name="..\..\array.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1998" topLine="258" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\Test.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="200" topLine="0" />
-		</Cursor>
-	</File>
 	<File name="..\..\ideque.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="39747" topLine="1281" />
 		</Cursor>
 	</File>
+	<File name="..\main.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="277" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\binary.h" open="1" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="12327" topLine="338" />
+		</Cursor>
+	</File>
 	<File name="..\test_deque.cpp" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="21475" topLine="641" />
 		</Cursor>
 	</File>
-	<File name="..\..\ilist.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="17660" topLine="539" />
-		</Cursor>
-	</File>
-	<File name="..\..\bitset.h" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4838" topLine="145" />
-		</Cursor>
-	</File>
-	<File name="..\..\container.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2523" topLine="42" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\TestMacros.h" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1865" topLine="28" />
-		</Cursor>
-	</File>
-	<File name="..\..\list.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5955" topLine="137" />
-		</Cursor>
-	</File>
-	<File name="..\test_hash.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4733" topLine="114" />
-		</Cursor>
-	</File>
-	<File name="..\test_integral_limits.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1416" topLine="13" />
-		</Cursor>
-	</File>
-	<File name="..\..\deque.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4670" topLine="110" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="245" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\test_queue.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1603" topLine="28" />
-		</Cursor>
-	</File>
-	<File name="..\..\stack.h" open="1" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="3203" topLine="57" />
-		</Cursor>
-	</File>
-	<File name="..\..\static_assert.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1356" topLine="10" />
-		</Cursor>
-	</File>
-	<File name="..\test_io_port.cpp" open="1" top="1" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="3282" topLine="58" />
-		</Cursor>
-	</File>
-	<File name="..\test_bloom_filter.cpp" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="6035" topLine="180" />
-		</Cursor>
-	</File>
-	<File name="..\test_cyclic_value.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1365" topLine="12" />
-		</Cursor>
-	</File>
-	<File name="..\..\binary.h" open="1" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="12327" topLine="338" />
-		</Cursor>
-	</File>
-	<File name="..\test_array.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2123" topLine="55" />
-		</Cursor>
-	</File>
 	<File name="..\..\imap.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="60526" topLine="1694" />
 		</Cursor>
 	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="257" topLine="0" />
+		</Cursor>
+	</File>
 	<File name="..\..\bloom_filter.h" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="3055" topLine="57" />
@@ -171,6 +61,126 @@
 			<Cursor1 position="2272" topLine="36" />
 		</Cursor>
 	</File>
+	<File name="..\..\Doxyfile" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="56760" topLine="1251" />
+		</Cursor>
+	</File>
+	<File name="..\..\list.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="5955" topLine="137" />
+		</Cursor>
+	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\Posix\SignalTranslator.h" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="616" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\test_hash.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4733" topLine="114" />
+		</Cursor>
+	</File>
+	<File name="..\test_integral_limits.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1416" topLine="13" />
+		</Cursor>
+	</File>
+	<File name="..\..\cyclic_value.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3578" topLine="85" />
+		</Cursor>
+	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\Test.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="200" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\test_map.cpp" open="1" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4433" topLine="84" />
+		</Cursor>
+	</File>
+	<File name="..\..\endian.h" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2235" topLine="37" />
+		</Cursor>
+	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\TestMacros.h" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1865" topLine="28" />
+		</Cursor>
+	</File>
+	<File name="..\..\stack.h" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3203" topLine="57" />
+		</Cursor>
+	</File>
+	<File name="..\test_type_traits.cpp" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="34843" topLine="428" />
+		</Cursor>
+	</File>
+	<File name="..\..\static_assert.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1356" topLine="10" />
+		</Cursor>
+	</File>
+	<File name="..\test_bloom_filter.cpp" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="6035" topLine="180" />
+		</Cursor>
+	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\Config.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="773" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\function.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3693" topLine="67" />
+		</Cursor>
+	</File>
+	<File name="..\..\array.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1998" topLine="258" />
+		</Cursor>
+	</File>
+	<File name="..\test_cyclic_value.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1365" topLine="12" />
+		</Cursor>
+	</File>
+	<File name="..\..\ilist.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="17660" topLine="539" />
+		</Cursor>
+	</File>
+	<File name="..\..\bitset.h" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4838" topLine="145" />
+		</Cursor>
+	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="245" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\container.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2523" topLine="42" />
+		</Cursor>
+	</File>
+	<File name="..\..\io_port.h" open="1" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="7715" topLine="301" />
+		</Cursor>
+	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\ExecuteTest.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="355" topLine="0" />
+		</Cursor>
+	</File>
 	<File name="..\..\lookup.h" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="3734" topLine="55" />
@@ -181,24 +191,19 @@
 			<Cursor1 position="5955" topLine="137" />
 		</Cursor>
 	</File>
+	<File name="..\test_io_port.cpp" open="1" top="1" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3282" topLine="58" />
+		</Cursor>
+	</File>
 	<File name="..\..\nullptr.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="560" topLine="78" />
 		</Cursor>
 	</File>
-	<File name="..\..\cyclic_value.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\deque.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="3578" topLine="85" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\ExecuteTest.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="355" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\test_map.cpp" open="1" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4433" topLine="84" />
+			<Cursor1 position="4670" topLine="110" />
 		</Cursor>
 	</File>
 	<File name="..\..\observer.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -211,14 +216,9 @@
 			<Cursor1 position="2334" topLine="35" />
 		</Cursor>
 	</File>
-	<File name="..\..\endian.h" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\queue.h" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="2235" topLine="37" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="257" topLine="0" />
+			<Cursor1 position="2984" topLine="48" />
 		</Cursor>
 	</File>
 </CodeBlocks_layout_file>
diff --git a/test/iar/etl.dep b/test/iar/etl.dep
index c2cc6d44..33e36c98 100644
--- a/test/iar/etl.dep
+++ b/test/iar/etl.dep
@@ -2,13 +2,13 @@
 
 <project>
   <fileVersion>2</fileVersion>
-  <fileChecksum>4054523468</fileChecksum>
+  <fileChecksum>4196203668</fileChecksum>
   <configuration>
     <name>Debug</name>
     <outputs>
+      <file>$PROJ_DIR$\..\..\bitset.h</file>
       <file>$PROJ_DIR$\..\..\alignment.h</file>
       <file>$PROJ_DIR$\..\..\algorithm.h</file>
-      <file>$PROJ_DIR$\..\..\bitset.h</file>
       <file>$PROJ_DIR$\..\..\array.h</file>
       <file>$PROJ_DIR$\..\..\crc16.cpp</file>
       <file>$PROJ_DIR$\..\..\container.h</file>
@@ -16,18 +16,75 @@
       <file>$PROJ_DIR$\..\..\crc16.h</file>
       <file>$PROJ_DIR$\..\..\crc16_ccitt.cpp</file>
       <file>$PROJ_DIR$\..\..\crc16_kermit.cpp</file>
-      <file>$PROJ_DIR$\Debug\Exe\cpp.out</file>
-      <file>$PROJ_DIR$\Debug\Obj\crc16.pbi</file>
+      <file>$PROJ_DIR$\..\..\crc32.cpp</file>
+      <file>$PROJ_DIR$\..\..\crc16_kermit.h</file>
+      <file>$PROJ_DIR$\..\..\crc64_ecma.h</file>
+      <file>$PROJ_DIR$\..\..\crc32.h</file>
+      <file>$PROJ_DIR$\..\..\crc64_ecma.cpp</file>
+      <file>$PROJ_DIR$\..\..\crc8_ccitt.cpp</file>
+      <file>$PROJ_DIR$\..\..\crc8_ccitt.h</file>
+      <file>$PROJ_DIR$\..\..\cyclic_value.h</file>
+      <file>$PROJ_DIR$\..\..\doxygen.h</file>
+      <file>$PROJ_DIR$\..\..\deque.h</file>
+      <file>$PROJ_DIR$\..\..\deque_base.h</file>
+      <file>$PROJ_DIR$\..\..\exception.h</file>
+      <file>$PROJ_DIR$\..\..\endian.h</file>
+      <file>$PROJ_DIR$\..\..\enum_type.h</file>
+      <file>$PROJ_DIR$\..\..\error_handler.cpp</file>
+      <file>$PROJ_DIR$\..\..\error_handler.h</file>
+      <file>$PROJ_DIR$\..\..\factorial.h</file>
+      <file>$PROJ_DIR$\..\..\fibonacci.h</file>
+      <file>$PROJ_DIR$\..\..\forward_list.h</file>
+      <file>$PROJ_DIR$\..\..\functional.h</file>
+      <file>$PROJ_DIR$\..\..\forward_list_base.h</file>
+      <file>$PROJ_DIR$\..\..\function.h</file>
+      <file>$TOOLKIT_DIR$\inc\c\xmtx.h</file>
+      <file>$PROJ_DIR$\..\..\ideque.h</file>
+      <file>$PROJ_DIR$\..\..\iforward_list.h</file>
+      <file>$PROJ_DIR$\..\..\ilist.h</file>
+      <file>$PROJ_DIR$\..\..\integral_limits.h</file>
+      <file>$PROJ_DIR$\..\..\imap.h</file>
+      <file>$PROJ_DIR$\..\..\ipool.h</file>
+      <file>$PROJ_DIR$\..\..\iqueue.h</file>
+      <file>$PROJ_DIR$\..\..\istack.h</file>
+      <file>$PROJ_DIR$\..\..\largest.h</file>
+      <file>$PROJ_DIR$\..\..\ivector.h</file>
+      <file>$PROJ_DIR$\..\..\numeric.h</file>
+      <file>$PROJ_DIR$\..\..\list.h</file>
+      <file>$PROJ_DIR$\..\..\list_base.h</file>
+      <file>$PROJ_DIR$\..\..\map.h</file>
+      <file>$PROJ_DIR$\..\..\map_base.h</file>
+      <file>$PROJ_DIR$\..\..\log.h</file>
+      <file>$PROJ_DIR$\..\..\nullptr.h</file>
+      <file>$PROJ_DIR$\..\..\observer.h</file>
+      <file>$PROJ_DIR$\..\..\parameter_type.h</file>
+      <file>$PROJ_DIR$\..\..\power.h</file>
+      <file>$PROJ_DIR$\..\..\pool.h</file>
+      <file>$PROJ_DIR$\..\..\queue.h</file>
+      <file>$PROJ_DIR$\..\..\smallest.h</file>
+      <file>$PROJ_DIR$\..\..\queue_base.h</file>
+      <file>$PROJ_DIR$\..\..\static_assert.h</file>
+      <file>$PROJ_DIR$\..\..\stack.h</file>
+      <file>$PROJ_DIR$\..\..\stack_base.h</file>
+      <file>$PROJ_DIR$\..\..\type_traits.h</file>
+      <file>$PROJ_DIR$\..\..\variant.h</file>
+      <file>$TOOLKIT_DIR$\inc\cpp\memory</file>
+      <file>$PROJ_DIR$\..\..\vector.h</file>
+      <file>$PROJ_DIR$\..\..\vector_base.h</file>
+      <file>$PROJ_DIR$\..\..\visitor.h</file>
+      <file>$PROJ_DIR$\..\test_compile.cpp</file>
       <file>$PROJ_DIR$\Debug\Obj\crc16_kermit.pbi</file>
-      <file>$PROJ_DIR$\Debug\Obj\crc32.pbi</file>
-      <file>$PROJ_DIR$\Debug\Obj\crc64_ecma.pbi</file>
-      <file>$PROJ_DIR$\Debug\Obj\crc8_ccitt.pbi</file>
-      <file>$TOOLKIT_DIR$\inc\c\yvals.h</file>
+      <file>$PROJ_DIR$\Debug\Obj\crc16.pbi</file>
+      <file>$PROJ_DIR$\Debug\Exe\cpp.out</file>
       <file>$TOOLKIT_DIR$\inc\c\ycheck.h</file>
-      <file>$TOOLKIT_DIR$\inc\c\DLib_Defaults.h</file>
       <file>$TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h</file>
-      <file>$TOOLKIT_DIR$\inc\c\DLib_Product.h</file>
+      <file>$TOOLKIT_DIR$\inc\c\DLib_Defaults.h</file>
       <file>$TOOLKIT_DIR$\inc\c\stdint.h</file>
+      <file>$TOOLKIT_DIR$\inc\c\DLib_Product.h</file>
+      <file>$TOOLKIT_DIR$\inc\c\yvals.h</file>
+      <file>$PROJ_DIR$\Debug\Obj\crc8_ccitt.pbi</file>
+      <file>$PROJ_DIR$\Debug\Obj\crc64_ecma.pbi</file>
+      <file>$PROJ_DIR$\Debug\Obj\crc32.pbi</file>
       <file>$TOOLKIT_DIR$\inc\c\stdlib.h</file>
       <file>$TOOLKIT_DIR$\inc\c\cstring</file>
       <file>$TOOLKIT_DIR$\inc\c\cstdlib</file>
@@ -67,8 +124,6 @@
       <file>$TOOLKIT_DIR$\inc\cpp\xmemory</file>
       <file>$TOOLKIT_DIR$\inc\c\xlocale.h</file>
       <file>$TOOLKIT_DIR$\inc\c\xtls.h</file>
-      <file>$TOOLKIT_DIR$\inc\c\xmtx.h</file>
-      <file>$TOOLKIT_DIR$\inc\cpp\memory</file>
       <file>$TOOLKIT_DIR$\inc\cpp\algorithm</file>
       <file>$TOOLKIT_DIR$\inc\cpp\xstddef</file>
       <file>$TOOLKIT_DIR$\inc\cpp\new</file>
@@ -93,61 +148,6 @@
       <file>$PROJ_DIR$\Debug\Obj\error_handler.o</file>
       <file>$PROJ_DIR$\..\..\ibitset.h</file>
       <file>$PROJ_DIR$\Debug\List\cpp.map</file>
-      <file>$PROJ_DIR$\..\..\crc32.cpp</file>
-      <file>$PROJ_DIR$\..\..\crc16_kermit.h</file>
-      <file>$PROJ_DIR$\..\..\crc64_ecma.h</file>
-      <file>$PROJ_DIR$\..\..\crc32.h</file>
-      <file>$PROJ_DIR$\..\..\crc64_ecma.cpp</file>
-      <file>$PROJ_DIR$\..\..\crc8_ccitt.h</file>
-      <file>$PROJ_DIR$\..\..\crc8_ccitt.cpp</file>
-      <file>$PROJ_DIR$\..\..\cyclic_value.h</file>
-      <file>$PROJ_DIR$\..\..\doxygen.h</file>
-      <file>$PROJ_DIR$\..\..\deque.h</file>
-      <file>$PROJ_DIR$\..\..\deque_base.h</file>
-      <file>$PROJ_DIR$\..\..\exception.h</file>
-      <file>$PROJ_DIR$\..\..\endian.h</file>
-      <file>$PROJ_DIR$\..\..\enum_type.h</file>
-      <file>$PROJ_DIR$\..\..\error_handler.cpp</file>
-      <file>$PROJ_DIR$\..\..\error_handler.h</file>
-      <file>$PROJ_DIR$\..\..\factorial.h</file>
-      <file>$PROJ_DIR$\..\..\forward_list.h</file>
-      <file>$PROJ_DIR$\..\..\fibonacci.h</file>
-      <file>$PROJ_DIR$\..\..\functional.h</file>
-      <file>$PROJ_DIR$\..\..\forward_list_base.h</file>
-      <file>$PROJ_DIR$\..\..\function.h</file>
-      <file>$PROJ_DIR$\..\..\imap.h</file>
-      <file>$PROJ_DIR$\..\..\ideque.h</file>
-      <file>$PROJ_DIR$\..\..\iforward_list.h</file>
-      <file>$PROJ_DIR$\..\..\ilist.h</file>
-      <file>$PROJ_DIR$\..\..\integral_limits.h</file>
-      <file>$PROJ_DIR$\..\..\ipool.h</file>
-      <file>$PROJ_DIR$\..\..\iqueue.h</file>
-      <file>$PROJ_DIR$\..\..\istack.h</file>
-      <file>$PROJ_DIR$\..\..\largest.h</file>
-      <file>$PROJ_DIR$\..\..\ivector.h</file>
-      <file>$PROJ_DIR$\..\..\list.h</file>
-      <file>$PROJ_DIR$\..\..\list_base.h</file>
-      <file>$PROJ_DIR$\..\..\map.h</file>
-      <file>$PROJ_DIR$\..\..\map_base.h</file>
-      <file>$PROJ_DIR$\..\..\log.h</file>
-      <file>$PROJ_DIR$\..\..\nullptr.h</file>
-      <file>$PROJ_DIR$\..\..\observer.h</file>
-      <file>$PROJ_DIR$\..\..\numeric.h</file>
-      <file>$PROJ_DIR$\..\..\parameter_type.h</file>
-      <file>$PROJ_DIR$\..\..\power.h</file>
-      <file>$PROJ_DIR$\..\..\pool.h</file>
-      <file>$PROJ_DIR$\..\..\queue.h</file>
-      <file>$PROJ_DIR$\..\..\smallest.h</file>
-      <file>$PROJ_DIR$\..\..\queue_base.h</file>
-      <file>$PROJ_DIR$\..\..\static_assert.h</file>
-      <file>$PROJ_DIR$\..\..\stack.h</file>
-      <file>$PROJ_DIR$\..\..\stack_base.h</file>
-      <file>$PROJ_DIR$\..\..\type_traits.h</file>
-      <file>$PROJ_DIR$\..\..\variant.h</file>
-      <file>$PROJ_DIR$\..\..\vector.h</file>
-      <file>$PROJ_DIR$\..\..\vector_base.h</file>
-      <file>$PROJ_DIR$\..\..\visitor.h</file>
-      <file>$PROJ_DIR$\..\test_compile.cpp</file>
       <file>$TOOLKIT_DIR$\inc\c\ymath.h</file>
       <file>$TOOLKIT_DIR$\inc\c\xtgmath.h</file>
       <file>$TOOLKIT_DIR$\inc\c\xencoding_limits.h</file>
@@ -160,6 +160,8 @@
       <file>$PROJ_DIR$\Debug\Obj\crc16_kermit.o</file>
       <file>$PROJ_DIR$\Debug\Obj\crc8_ccitt.o</file>
       <file>$PROJ_DIR$\..\..\ihash.h</file>
+      <file>$PROJ_DIR$\..\..\binary.h</file>
+      <file>$PROJ_DIR$\..\..\io_port.h</file>
     </outputs>
     <file>
       <name>$PROJ_DIR$\..\..\crc16.cpp</name>
@@ -170,17 +172,17 @@
         </tool>
         <tool>
           <name>BICOMP</name>
-          <file> 11</file>
+          <file> 68</file>
         </tool>
       </outputs>
       <inputs>
         <tool>
           <name>ICCARM</name>
-          <file> 21 17 16 18 19 20 144 83</file>
+          <file> 73 70 75 72 71 74 144 138</file>
         </tool>
         <tool>
           <name>BICOMP</name>
-          <file> 17 16 21 144 18 83 19 20</file>
+          <file> 70 75 73 144 72 138 71 74</file>
         </tool>
       </inputs>
     </file>
@@ -199,11 +201,11 @@
       <inputs>
         <tool>
           <name>ICCARM</name>
-          <file> 21 17 16 18 19 20 144 83</file>
+          <file> 73 70 75 72 71 74 144 138</file>
         </tool>
         <tool>
           <name>BICOMP</name>
-          <file> 17 16 21 144 18 83 19 20</file>
+          <file> 70 75 73 144 72 138 71 74</file>
         </tool>
       </inputs>
     </file>
@@ -216,17 +218,17 @@
         </tool>
         <tool>
           <name>BICOMP</name>
-          <file> 12</file>
+          <file> 67</file>
         </tool>
       </outputs>
       <inputs>
         <tool>
           <name>ICCARM</name>
-          <file> 21 17 16 18 19 20 144 83</file>
+          <file> 73 70 75 72 71 74 144 138</file>
         </tool>
         <tool>
           <name>BICOMP</name>
-          <file> 17 16 21 144 18 83 19 20</file>
+          <file> 70 75 73 144 72 138 71 74</file>
         </tool>
       </inputs>
     </file>
@@ -235,25 +237,10 @@
       <outputs>
         <tool>
           <name>ILINK</name>
-          <file> 10 86</file>
+          <file> 69 141</file>
         </tool>
       </outputs>
     </file>
-    <file>
-      <name>$PROJ_DIR$\Debug\Exe\cpp.out</name>
-      <outputs>
-        <tool>
-          <name>ILINK</name>
-          <file> 86</file>
-        </tool>
-      </outputs>
-      <inputs>
-        <tool>
-          <name>ILINK</name>
-          <file> 50 147 148 151 146 145 152 84 26 53 55 56 52 51</file>
-        </tool>
-      </inputs>
-    </file>
     <file>
       <name>$PROJ_DIR$\..\..\crc32.cpp</name>
       <outputs>
@@ -263,17 +250,17 @@
         </tool>
         <tool>
           <name>BICOMP</name>
-          <file> 13</file>
+          <file> 78</file>
         </tool>
       </outputs>
       <inputs>
         <tool>
           <name>ICCARM</name>
-          <file> 21 17 16 18 19 20 144 83</file>
+          <file> 73 70 75 72 71 74 144 138</file>
         </tool>
         <tool>
           <name>BICOMP</name>
-          <file> 17 16 21 144 18 83 19 20</file>
+          <file> 70 75 73 144 72 138 71 74</file>
         </tool>
       </inputs>
     </file>
@@ -286,17 +273,17 @@
         </tool>
         <tool>
           <name>BICOMP</name>
-          <file> 14</file>
+          <file> 77</file>
         </tool>
       </outputs>
       <inputs>
         <tool>
           <name>ICCARM</name>
-          <file> 21 17 16 18 19 20 144 83</file>
+          <file> 73 70 75 72 71 74 144 138</file>
         </tool>
         <tool>
           <name>BICOMP</name>
-          <file> 17 16 21 144 18 83 19 20</file>
+          <file> 70 75 73 144 72 138 71 74</file>
         </tool>
       </inputs>
     </file>
@@ -309,17 +296,17 @@
         </tool>
         <tool>
           <name>BICOMP</name>
-          <file> 15</file>
+          <file> 76</file>
         </tool>
       </outputs>
       <inputs>
         <tool>
           <name>ICCARM</name>
-          <file> 21 17 16 18 19 20 144 83</file>
+          <file> 73 70 75 72 71 74 144 138</file>
         </tool>
         <tool>
           <name>BICOMP</name>
-          <file> 17 16 21 144 18 83 19 20</file>
+          <file> 70 75 73 144 72 138 71 74</file>
         </tool>
       </inputs>
     </file>
@@ -328,21 +315,21 @@
       <outputs>
         <tool>
           <name>ICCARM</name>
-          <file> 84</file>
+          <file> 139</file>
         </tool>
         <tool>
           <name>BICOMP</name>
-          <file> 82</file>
+          <file> 137</file>
         </tool>
       </outputs>
       <inputs>
         <tool>
           <name>ICCARM</name>
-          <file> 102 98 108 124</file>
+          <file> 25 21 31 49</file>
         </tool>
         <tool>
           <name>BICOMP</name>
-          <file> 108 124 98 102</file>
+          <file> 31 49 21 25</file>
         </tool>
       </inputs>
     </file>
@@ -351,21 +338,36 @@
       <outputs>
         <tool>
           <name>ICCARM</name>
-          <file> 26</file>
+          <file> 83</file>
         </tool>
         <tool>
           <name>BICOMP</name>
-          <file> 27</file>
+          <file> 84</file>
         </tool>
       </outputs>
       <inputs>
         <tool>
           <name>ICCARM</name>
-          <file> 1 63 62 58 24 17 16 18 19 20 144 83 22 29 65 34 64 66 43 42 33 67 45 68 69 35 46 23 70 32 31 40 30 71 36 47 72 28 54 142 143 73 74 75 48 41 37 49 25 76 38 59 60 61 39 78 57 79 80 77 81 44 136 124 0 3 98 127 133 102 108 2 21 113 131 123 85 5 92 99 100 153 7 6 88 90 89 94 96 110 97</file>
+          <file> 2 118 62 115 81 70 75 72 71 74 144 138 79 86 120 91 119 121 100 99 90 122 102 123 124 92 103 80 125 89 88 97 87 126 93 104 127 85 111 142 143 128 129 130 105 98 94 106 82 131 95 116 117 32 96 133 114 134 135 132 136 101 60 49 1 73 57 3 21 51 25 31 0 36 55 48 140 154 5 16 22 23 153 7 6 11 13 12 17 19 33 20 155 63 42 64 61 41</file>
         </tool>
         <tool>
           <name>BICOMP</name>
-          <file> 41 153 98 65 66 17 36 23 88 63 35 76 44 43 133 136 5 96 58 18 29 34 45 16 81 21 3 7 89 64 67 68 69 28 77 99 127 0 2 92 6 90 94 30 62 24 42 22 144 83 19 20 33 31 46 40 47 54 142 74 75 78 79 80 124 70 123 85 113 1 32 71 72 73 143 48 37 49 25 57 38 59 60 39 61 102 108 131 100 110 97</file>
+          <file> 60 72 123 36 70 86 81 3 75 122 21 100 11 101 115 119 102 90 91 153 57 118 5 19 120 82 48 73 64 7 12 63 124 99 94 80 95 96 97 98 22 87 1 0 16 6 13 17 155 61 62 79 144 138 71 74 121 125 89 126 127 128 143 105 106 114 88 116 117 32 51 25 2 92 103 93 104 85 111 142 129 130 131 132 133 134 135 136 49 31 55 140 154 23 33 20 42 41</file>
+        </tool>
+      </inputs>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\Debug\Exe\cpp.out</name>
+      <outputs>
+        <tool>
+          <name>ILINK</name>
+          <file> 141</file>
+        </tool>
+      </outputs>
+      <inputs>
+        <tool>
+          <name>ILINK</name>
+          <file> 107 147 148 151 146 145 152 139 83 110 112 113 109 108</file>
         </tool>
       </inputs>
     </file>
diff --git a/test/iar/etl.ewp b/test/iar/etl.ewp
index 7113198b..390712fd 100644
--- a/test/iar/etl.ewp
+++ b/test/iar/etl.ewp
@@ -2000,6 +2000,9 @@
     <file>
       <name>$PROJ_DIR$\..\..\integral_limits.h</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\io_port.h</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\ipool.h</name>
     </file>
@@ -2021,15 +2024,15 @@
     <file>
       <name>$PROJ_DIR$\..\..\list_base.h</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\log.h</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\map.h</name>
     </file>
     <file>
       <name>$PROJ_DIR$\..\..\map_base.h</name>
     </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\log.h</name>
-    </file>
     <file>
       <name>$PROJ_DIR$\..\..\nullptr.h</name>
     </file>
diff --git a/test/iar/etl.ewt b/test/iar/etl.ewt
index 3feeaf98..29b07890 100644
--- a/test/iar/etl.ewt
+++ b/test/iar/etl.ewt
@@ -283,6 +283,9 @@
     <file>
       <name>$PROJ_DIR$\..\..\integral_limits.h</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\io_port.h</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\ipool.h</name>
     </file>
@@ -304,15 +307,15 @@
     <file>
       <name>$PROJ_DIR$\..\..\list_base.h</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\log.h</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\map.h</name>
     </file>
     <file>
       <name>$PROJ_DIR$\..\..\map_base.h</name>
     </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\log.h</name>
-    </file>
     <file>
       <name>$PROJ_DIR$\..\..\nullptr.h</name>
     </file>
diff --git a/test/iar/settings/etl.wsdt b/test/iar/settings/etl.wsdt
index 6295675c..94ceb9cb 100644
--- a/test/iar/settings/etl.wsdt
+++ b/test/iar/settings/etl.wsdt
@@ -12,7 +12,7 @@
           
           
           
-        <Column0>242</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
+        <Column0>259</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
       </Workspace>
       <Build>
         
@@ -24,7 +24,7 @@
     <Windows>
       
       
-    <Wnd0>
+    <Wnd1>
         <Tabs>
           <Tab>
             <Identity>TabID-10727-29778</Identity>
@@ -32,11 +32,11 @@
             <Factory>Workspace</Factory>
             <Session>
               
-            <NodeDict><ExpandedNode>etl</ExpandedNode><ExpandedNode>etl/ETL</ExpandedNode><ExpandedNode>etl/Output</ExpandedNode><ExpandedNode>etl/Test</ExpandedNode><ExpandedNode>etl/main.cpp</ExpandedNode></NodeDict></Session>
+            <NodeDict><ExpandedNode>etl</ExpandedNode><ExpandedNode>etl/Output</ExpandedNode><ExpandedNode>etl/Test</ExpandedNode><ExpandedNode>etl/main.cpp</ExpandedNode></NodeDict></Session>
           </Tab>
         </Tabs>
         
-      <SelectedTab>0</SelectedTab></Wnd0><Wnd2>
+      <SelectedTab>0</SelectedTab></Wnd1><Wnd3>
         <Tabs>
           <Tab>
             <Identity>TabID-15390-31123</Identity>
@@ -46,20 +46,20 @@
           </Tab>
         </Tabs>
         
-      <SelectedTab>0</SelectedTab></Wnd2></Windows>
+      <SelectedTab>0</SelectedTab></Wnd3></Windows>
     <Editor>
       
       
       
       
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\algorithm.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>255</YPos2><SelStart2>2932</SelStart2><SelEnd2>2932</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\test_compile.cpp</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>68</YPos2><SelStart2>3284</SelStart2><SelEnd2>3284</SelEnd2></Tab><ActiveTab>1</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\Program Files (x86)\IAR Systems\Embedded Workbench 7.0\arm\inc\cpp\xlocnum</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>647</YPos2><SelStart2>22438</SelStart2><SelEnd2>22438</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\alignment.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>96</YPos2><SelStart2>3503</SelStart2><SelEnd2>3503</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\type_traits.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>183</YPos2><SelStart2>8753</SelStart2><SelEnd2>8753</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\log.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>29</YPos2><SelStart2>2196</SelStart2><SelEnd2>2196</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\nullptr.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>0</YPos2><SelStart2>1327</SelStart2><SelEnd2>1327</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\variant.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>939</YPos2><SelStart2>39362</SelStart2><SelEnd2>39362</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\crc16.cpp</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>0</YPos2><SelStart2>645</SelStart2><SelEnd2>645</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\ideque.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>954</YPos2><SelStart2>31011</SelStart2><SelEnd2>31011</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\deque.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>79</YPos2><SelStart2>4728</SelStart2><SelEnd2>4736</SelEnd2></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
+    <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\test_compile.cpp</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>0</YPos2><SelStart2>516</SelStart2><SelEnd2>516</SelEnd2></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\variant.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>753</YPos2><SelStart2>31086</SelStart2><SelEnd2>31086</SelEnd2></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
     <Positions>
       
       
       
       
       
-    <Top><Row0><Sizes><Toolbar-027B8198><key>iaridepm.enu1</key></Toolbar-027B8198></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>953</Bottom><Right>333</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>104167</sizeHorzCX><sizeHorzCY>200401</sizeHorzCY><sizeVertCX>174479</sizeVertCX><sizeVertCY>956914</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes/></Row0></Bottom><Float><Sizes><Wnd2><Rect><Top>0</Top><Left>0</Left><Bottom>0</Bottom><Right>0</Right><x>-2</x><y>-2</y><FloatX>1938</FloatX><FloatY>25</FloatY><FloatWidth>1240</FloatWidth><FloatHeight>968</FloatHeight><xscreen>1924</xscreen><yscreen>200</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>200401</sizeHorzCY><sizeVertCX>104167</sizeVertCX><sizeVertCY>200401</sizeVertCY></Rect></Wnd2></Sizes></Float></Positions>
+    <Top><Row0><Sizes><Toolbar-00DE39B0><key>iaridepm.enu1</key></Toolbar-00DE39B0></Sizes></Row0></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>953</Bottom><Right>333</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>104167</sizeHorzCX><sizeHorzCY>200401</sizeHorzCY><sizeVertCX>174479</sizeVertCX><sizeVertCY>956914</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes/></Row0></Bottom><Float><Sizes><Wnd3><Rect><Top>0</Top><Left>0</Left><Bottom>0</Bottom><Right>0</Right><x>-2</x><y>-2</y><FloatX>1938</FloatX><FloatY>25</FloatY><FloatWidth>1240</FloatWidth><FloatHeight>968</FloatHeight><xscreen>1924</xscreen><yscreen>200</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>200401</sizeHorzCY><sizeVertCX>104167</sizeVertCX><sizeVertCY>200401</sizeVertCY></Rect></Wnd3></Sizes></Float></Positions>
   </Desktop>
 </Workspace>
 
diff --git a/test/keil/Test1.uvguix.John b/test/keil/Test1.uvguix.John
index 40763414..62cc1ac4 100644
--- a/test/keil/Test1.uvguix.John
+++ b/test/keil/Test1.uvguix.John
@@ -73,8 +73,8 @@
       <flags>2</flags>
       <showCmd>3</showCmd>
       <MinPosition>
-        <xPos>-1</xPos>
-        <yPos>-1</yPos>
+        <xPos>-32000</xPos>
+        <yPos>-32000</yPos>
       </MinPosition>
       <MaxPosition>
         <xPos>-1</xPos>
@@ -90,8 +90,8 @@
     <MDIClientArea>
       <RegID>0</RegID>
       <MDITabState>
-        <Len>1549</Len>
-        <Data>010000000400000001000000010000000000000001000000000000000200000000000000010000000100000000000000280000002800000001000000100000000C000000010000003B553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C63726336345F65636D612E68000000000C63726336345F65636D612E6800000000FFFFFFFFFFFFFFFF36553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C63726333322E68000000000763726333322E6800000000FFFFFFFFFFFFFFFF3D553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C63726331365F6B65726D69742E68000000000E63726331365F6B65726D69742E6800000000FFFFFFFFFFFFFFFF3C553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C63726331365F63636974742E68000000000D63726331365F63636974742E6800000000FFFFFFFFFFFFFFFF36553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C63726331362E68000000000763726331362E6800000000FFFFFFFFFFFFFFFF36553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C69686173682E68000000000769686173682E6800000000FFFFFFFFFFFFFFFF38553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C696269747365742E680000000009696269747365742E6800000000FFFFFFFFFFFFFFFF37553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C6964657175652E6800000000086964657175652E6800000000FFFFFFFFFFFFFFFF36553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C64657175652E68000000000764657175652E6800000000FFFFFFFFFFFFFFFF3A553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C6669626F6E616363692E68000000000B6669626F6E616363692E6800000000FFFFFFFFFFFFFFFF3A553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C666163746F7269616C2E68000000000B666163746F7269616C2E6800000000FFFFFFFFFFFFFFFF3D553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C6379636C69635F76616C75652E68000000000E6379636C69635F76616C75652E6800000000FFFFFFFFFFFFFFFF44553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C746573745C746573745F636F6D70696C652E6370700000000010746573745F636F6D70696C652E63707000000000FFFFFFFFFFFFFFFF39553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C66756E6374696F6E2E68000000000A66756E6374696F6E2E6800000000FFFFFFFFFFFFFFFF37553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C6269747365742E6800000000086269747365742E6800000000FFFFFFFFFFFFFFFF3B553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C637263385F63636974742E68000000000C637263385F63636974742E6800000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000940100006500000080070000FD030000</Data>
+        <Len>441</Len>
+        <Data>01000000040000000100000001000000000000000100000000000000020000000000000001000000010000000000000028000000280000000100000003000000000000000100000044553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C746573745C746573745F636F6D70696C652E6370700000000011746573745F636F6D70696C652E6370702A00000000FFFFFFFFFFFFFFFF38553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C69766563746F722E68000000000969766563746F722E6800000000FFFFFFFFFFFFFFFF38553A5C55736572735C4A6F686E5C446F63756D656E74735C50726F6772616D6D696E675C4769744875625C65746C5C76617269616E742E68000000000976617269616E742E6800000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000940100006500000080070000FD030000</Data>
       </MDITabState>
     </MDIClientArea>
     <ViewEx>
@@ -1285,8 +1285,8 @@
         <RegID>59392</RegID>
         <Name>File</Name>
         <Buttons>
-          <Len>2261</Len>
-          <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000010766F6964206F70657261746F72202829960000000000000010000373657410766F6964206F70657261746F72202829096966756E6374696F6E086F70657261746F7208456E756D547970650A5374727563744E616D65077479706564656608547970654E616D65114445434C4152455F454E554D5F545950451A72657475726E2028544261736526292A2854426173652A29303B0C504C4154464F524D5F41524D09696E745F6C65617374057374643A3A09434F4D50494C45525F0A53797374656D496E69740641737369676E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F50726F6A6563742057696E646F7773000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data>
+          <Len>2266</Len>
+          <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000002000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000003736574960000000000000011000D6572726F725F68616E646C65720373657410766F6964206F70657261746F72202829096966756E6374696F6E086F70657261746F7208456E756D547970650A5374727563744E616D65077479706564656608547970654E616D65114445434C4152455F454E554D5F545950451A72657475726E2028544261736526292A2854426173652A29303B0C504C4154464F524D5F41524D09696E745F6C65617374057374643A3A09434F4D50494C45525F0A53797374656D496E69740641737369676E0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F50726F6A6563742057696E646F7773000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data>
         </Buttons>
         <OriginalItems>
           <Len>1423</Len>
@@ -1318,7 +1318,7 @@
         <Name>Debug</Name>
         <Buttons>
           <Len>2220</Len>
-          <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000002001380D88B000000000000310000000757617463682031000000000000000000000000010000000100000000000000000000000100000000001380D98B0000000000003100000007576174636820320000000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000084D656D6F72792031000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000084D656D6F72792032000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000084D656D6F72792033000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000084D656D6F727920340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000755415254202331000000000000000000000000010000000100000000000000000000000100000000001380940700000000000033000000075541525420233200000000000000000000000001000000010000000000000000000000010000000000138095070000000000003300000007554152542023330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000000E49544D2F525441205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380658A000000000000340000000E4C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E00000014506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000D436F646520436F76657261676500000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138001890000000000003600000007546F6F6C626F7800000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
+          <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000002001380D88B000000000000310000000757617463682031000000000000000000000000010000000100000000000000000000000100000000001380D98B0000000000003100000007576174636820320000000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000084D656D6F72792031000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000084D656D6F72792032000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000084D656D6F72792033000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000084D656D6F727920340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000755415254202331000000000000000000000000010000000100000000000000000000000100000000001380940700000000000033000000075541525420233200000000000000000000000001000000010000000000000000000000010000000000138095070000000000003300000007554152542023330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000000E49544D2F525441205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380658A000000000000340000000E4C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E00000014506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000D436F646520436F76657261676500000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138001890000000000003600000007546F6F6C626F7800000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
         </Buttons>
         <OriginalItems>
           <Len>898</Len>
@@ -2583,147 +2583,30 @@
     <ActiveMDIGroup>0</ActiveMDIGroup>
     <MDIGroup>
       <Size>100</Size>
-      <ActiveTab>12</ActiveTab>
-      <Doc>
-        <Name>..\..\crc64_ecma.h</Name>
-        <ColumnNumber>26</ColumnNumber>
-        <TopLine>17</TopLine>
-        <CurrentLine>39</CurrentLine>
-        <Folding>0</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
-      <Doc>
-        <Name>..\..\crc32.h</Name>
-        <ColumnNumber>6</ColumnNumber>
-        <TopLine>1</TopLine>
-        <CurrentLine>41</CurrentLine>
-        <Folding>0</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
-      <Doc>
-        <Name>..\..\crc16_kermit.h</Name>
-        <ColumnNumber>6</ColumnNumber>
-        <TopLine>1</TopLine>
-        <CurrentLine>41</CurrentLine>
-        <Folding>0</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
-      <Doc>
-        <Name>..\..\crc16_ccitt.h</Name>
-        <ColumnNumber>6</ColumnNumber>
-        <TopLine>1</TopLine>
-        <CurrentLine>41</CurrentLine>
-        <Folding>0</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
-      <Doc>
-        <Name>..\..\crc16.h</Name>
-        <ColumnNumber>6</ColumnNumber>
-        <TopLine>1</TopLine>
-        <CurrentLine>41</CurrentLine>
-        <Folding>0</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
-      <Doc>
-        <Name>..\..\ihash.h</Name>
-        <ColumnNumber>0</ColumnNumber>
-        <TopLine>145</TopLine>
-        <CurrentLine>1</CurrentLine>
-        <Folding>0</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
-      <Doc>
-        <Name>..\..\ibitset.h</Name>
-        <ColumnNumber>36</ColumnNumber>
-        <TopLine>44</TopLine>
-        <CurrentLine>59</CurrentLine>
-        <Folding>0</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
-      <Doc>
-        <Name>..\..\ideque.h</Name>
-        <ColumnNumber>57</ColumnNumber>
-        <TopLine>510</TopLine>
-        <CurrentLine>517</CurrentLine>
-        <Folding>0</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
-      <Doc>
-        <Name>..\..\deque.h</Name>
-        <ColumnNumber>0</ColumnNumber>
-        <TopLine>1</TopLine>
-        <CurrentLine>1</CurrentLine>
-        <Folding>0</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
-      <Doc>
-        <Name>..\..\fibonacci.h</Name>
-        <ColumnNumber>0</ColumnNumber>
-        <TopLine>1</TopLine>
-        <CurrentLine>1</CurrentLine>
-        <Folding>0</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
-      <Doc>
-        <Name>..\..\factorial.h</Name>
-        <ColumnNumber>17</ColumnNumber>
-        <TopLine>9</TopLine>
-        <CurrentLine>36</CurrentLine>
-        <Folding>0</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
-      <Doc>
-        <Name>..\..\cyclic_value.h</Name>
-        <ColumnNumber>5</ColumnNumber>
-        <TopLine>174</TopLine>
-        <CurrentLine>223</CurrentLine>
-        <Folding>0</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
+      <ActiveTab>0</ActiveTab>
       <Doc>
         <Name>..\test_compile.cpp</Name>
-        <ColumnNumber>2</ColumnNumber>
-        <TopLine>184</TopLine>
-        <CurrentLine>227</CurrentLine>
+        <ColumnNumber>10</ColumnNumber>
+        <TopLine>281</TopLine>
+        <CurrentLine>332</CurrentLine>
         <Folding>0</Folding>
         <ContractedFolders></ContractedFolders>
         <PaneID>0</PaneID>
       </Doc>
       <Doc>
-        <Name>..\..\function.h</Name>
-        <ColumnNumber>79</ColumnNumber>
-        <TopLine>58</TopLine>
-        <CurrentLine>81</CurrentLine>
+        <Name>..\..\ivector.h</Name>
+        <ColumnNumber>7</ColumnNumber>
+        <TopLine>159</TopLine>
+        <CurrentLine>195</CurrentLine>
         <Folding>0</Folding>
         <ContractedFolders></ContractedFolders>
         <PaneID>0</PaneID>
       </Doc>
       <Doc>
-        <Name>..\..\bitset.h</Name>
-        <ColumnNumber>0</ColumnNumber>
-        <TopLine>8</TopLine>
-        <CurrentLine>49</CurrentLine>
-        <Folding>0</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
-      <Doc>
-        <Name>..\..\crc8_ccitt.h</Name>
-        <ColumnNumber>6</ColumnNumber>
-        <TopLine>1</TopLine>
-        <CurrentLine>41</CurrentLine>
+        <Name>..\..\variant.h</Name>
+        <ColumnNumber>28</ColumnNumber>
+        <TopLine>25</TopLine>
+        <CurrentLine>43</CurrentLine>
         <Folding>0</Folding>
         <ContractedFolders></ContractedFolders>
         <PaneID>0</PaneID>
diff --git a/test/keil/Test1.uvoptx b/test/keil/Test1.uvoptx
index a0a4b70d..1afdd940 100644
--- a/test/keil/Test1.uvoptx
+++ b/test/keil/Test1.uvoptx
@@ -1115,6 +1115,19 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>72</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <Focus>0</Focus>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\io_port.h</PathWithFileName>
+      <FilenameWithoutPath>io_port.h</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
 </ProjectOpt>
diff --git a/test/keil/Test1.uvprojx b/test/keil/Test1.uvprojx
index f7b55cb5..da1ae3a6 100644
--- a/test/keil/Test1.uvprojx
+++ b/test/keil/Test1.uvprojx
@@ -362,8 +362,8 @@
             <uC99>0</uC99>
             <useXO>0</useXO>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>PLATFORM_ARM,COMPILER_KEIL</Define>
+              <MiscControls>--exceptions</MiscControls>
+              <Define>PLATFORM_ARM,COMPILER_KEIL, ETL_THROW_EXCEPTIONS</Define>
               <Undefine></Undefine>
               <IncludePath>..\..\..\etl;..\Keil</IncludePath>
             </VariousControls>
@@ -773,6 +773,11 @@
               <FileType>5</FileType>
               <FilePath>..\..\ihash.h</FilePath>
             </File>
+            <File>
+              <FileName>io_port.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\..\io_port.h</FilePath>
+            </File>
           </Files>
         </Group>
       </Groups>