socket_test へのリネーム

diff --git a/roast/test/lexical2_test/source/xml_test.cpp b/roast/test/lexical2_test/source/xml_test.cpp
index a442e21..e90f6cc 100644 (file)
--- a/roast/test/lexical2_test/source/xml_test.cpp
+++ b/roast/test/lexical2_test/source/xml_test.cpp
@@ -1,7 +1,5 @@
 //#include "roast/xml.hpp"
-#include "roast/xml.hpp"
-#include "roast/lexical/rule/chars.hpp"
-#include "roast/lexical.hpp"
+#include "roast/xml/sgml/sgml.hpp"
 
 using namespace roast;
 using namespace roast::lexical;

diff --git a/roast/test/roast_test_socket/http_proxy.cpp b/roast/test/socket_test/http_proxy.cpp
similarity index 100%
rename from roast/test/roast_test_socket/http_proxy.cpp
rename to roast/test/socket_test/http_proxy.cpp

diff --git a/roast/test/roast_test_socket/socket_server_test.cpp b/roast/test/socket_test/socket_server_test.cpp
similarity index 100%
rename from roast/test/roast_test_socket/socket_server_test.cpp
rename to roast/test/socket_test/socket_server_test.cpp

diff --git a/roast/test/roast_test_socket/roast_test_2nc.sln b/roast/test/socket_test/socket_test.sln
similarity index 84%
rename from roast/test/roast_test_socket/roast_test_2nc.sln
rename to roast/test/socket_test/socket_test.sln
index da9ea35..fed1d59 100644 (file)
--- a/roast/test/roast_test_socket/roast_test_2nc.sln
+++ b/roast/test/socket_test/socket_test.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "roast_test_2nc", "roast_test_2nc.vcproj", "{75F2DCA9-E904-47A9-A62E-FE8659548B0D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "socket_test", "socket_test.vcproj", "{75F2DCA9-E904-47A9-A62E-FE8659548B0D}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/roast/test/roast_test_socket/roast_test_2nc.vcproj b/roast/test/socket_test/socket_test.vcproj
similarity index 98%
rename from roast/test/roast_test_socket/roast_test_2nc.vcproj
rename to roast/test/socket_test/socket_test.vcproj
index ab1fdc7..3a42206 100644 (file)
--- a/roast/test/roast_test_socket/roast_test_2nc.vcproj
+++ b/roast/test/socket_test/socket_test.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9.00"
-       Name="roast_test_2nc"
+       Name="socket_test"
        ProjectGUID="{75F2DCA9-E904-47A9-A62E-FE8659548B0D}"
-       RootNamespace="roast_test_2nc"
+       RootNamespace="socket_test"
        Keyword="Win32Proj"
        TargetFrameworkVersion="196613"
        >

diff --git a/roast/test/sql_test/sql_test.cpp b/roast/test/sql_test/sql_test.cpp
index e08a0ee..e1ce475 100644 (file)
--- a/roast/test/sql_test/sql_test.cpp
+++ b/roast/test/sql_test/sql_test.cpp
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include "roast/db/sql.hpp"
-#include "roast/db/sqlite3.hpp"
 #include "roast/tp/tuple/tuple3.hpp"
 #include "roast/tp/tuple/tuple4/tuple4.hpp"
 

diff --git a/roast/test/sql_test/sql_test.vcproj b/roast/test/sql_test/sql_test.vcproj
index 9257183..d22fd39 100644 (file)
--- a/roast/test/sql_test/sql_test.vcproj
+++ b/roast/test/sql_test/sql_test.vcproj
@@ -176,6 +176,10 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
+                       <File
+                               RelativePath=".\sql_test.cpp"
+                               >
+                       </File>
                </Filter>
                <Filter
                        Name="\83w\83b\83_\81[ \83t\83@\83C\83\8b"