From 0525191ebe984c3dbbd88f4ec08dff217d4c1673 Mon Sep 17 00:00:00 2001
From: jez <>
Date: Mon, 10 Sep 2007 17:32:43 +0000
Subject: [PATCH] move convert_adaptor.hpp and convertstream.hpp into io
 subdirectory

---
 examples/Utils/transcode.cpp              |  2 +-
 include/SAX/SAXParseException.hpp         |  2 +-
 include/Utils/StringAdaptor.hpp           |  2 +-
 include/{Utils => io}/convert_adaptor.hpp |  0
 include/{Utils => io}/convertstream.hpp   |  0
 tests/silly_string/silly_string.cpp       |  2 +-
 vs8/lib_arabica.vcproj                    | 20 ++++++++------------
 7 files changed, 12 insertions(+), 16 deletions(-)
 rename include/{Utils => io}/convert_adaptor.hpp (100%)
 rename include/{Utils => io}/convertstream.hpp (100%)

diff --git a/examples/Utils/transcode.cpp b/examples/Utils/transcode.cpp
index 0267f4c8..751a834d 100644
--- a/examples/Utils/transcode.cpp
+++ b/examples/Utils/transcode.cpp
@@ -9,7 +9,7 @@
 #endif
 
 #include <iostream>
-#include <Utils/convert_adaptor.hpp>
+#include <io/convert_adaptor.hpp>
 #include <convert/utf8iso88591codecvt.hpp>
 #include <convert/iso88591utf8codecvt.hpp>
 #include <convert/rot13codecvt.hpp>
diff --git a/include/SAX/SAXParseException.hpp b/include/SAX/SAXParseException.hpp
index ccbd40c1..04767289 100644
--- a/include/SAX/SAXParseException.hpp
+++ b/include/SAX/SAXParseException.hpp
@@ -7,7 +7,7 @@
 #include <SAX/SAXException.hpp>
 #include <SAX/Locator.hpp>
 #include <sstream>
-#include <Utils/convertstream.hpp>
+#include <io/convertstream.hpp>
 #include <Utils/StringAdaptor.hpp>
 
 namespace Arabica
diff --git a/include/Utils/StringAdaptor.hpp b/include/Utils/StringAdaptor.hpp
index 519287dd..aff1b127 100644
--- a/include/Utils/StringAdaptor.hpp
+++ b/include/Utils/StringAdaptor.hpp
@@ -6,7 +6,7 @@
 
 #include <SAX/ArabicaConfig.hpp>
 #include <string>
-#include <Utils/convertstream.hpp>
+#include <io/convertstream.hpp>
 #include <convert/utf8ucs2codecvt.hpp>
 #include <Utils/stringadaptortag.hpp>
 
diff --git a/include/Utils/convert_adaptor.hpp b/include/io/convert_adaptor.hpp
similarity index 100%
rename from include/Utils/convert_adaptor.hpp
rename to include/io/convert_adaptor.hpp
diff --git a/include/Utils/convertstream.hpp b/include/io/convertstream.hpp
similarity index 100%
rename from include/Utils/convertstream.hpp
rename to include/io/convertstream.hpp
diff --git a/tests/silly_string/silly_string.cpp b/tests/silly_string/silly_string.cpp
index 5655a90a..737397c3 100644
--- a/tests/silly_string/silly_string.cpp
+++ b/tests/silly_string/silly_string.cpp
@@ -1,6 +1,6 @@
 #include "silly_string.hpp"
 
-#include <Utils/convertstream.hpp>
+#include <io/convertstream.hpp>
 #include <convert/utf8ucs2codecvt.hpp>
 #include <convert/ucs2utf8codecvt.hpp>
 
diff --git a/vs8/lib_arabica.vcproj b/vs8/lib_arabica.vcproj
index cb4ed64f..8096d22d 100644
--- a/vs8/lib_arabica.vcproj
+++ b/vs8/lib_arabica.vcproj
@@ -774,18 +774,6 @@
 			<Filter
 				Name="Utils"
 				>
-				<File
-					RelativePath="..\include\Utils\impl\codecvt_specialisations.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\convert_adaptor.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\convertstream.hpp"
-					>
-				</File>
 				<File
 					RelativePath="..\include\Utils\getparam.hpp"
 					>
@@ -818,6 +806,14 @@
 			<Filter
 				Name="io"
 				>
+				<File
+					RelativePath="..\include\io\convert_adaptor.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\io\convertstream.hpp"
+					>
+				</File>
 				<File
 					RelativePath="..\include\io\socket_stream.hpp"
 					>