From f16ff8eaac5168e0239878b261f51fc263d829ba Mon Sep 17 00:00:00 2001 From: myun2 Date: Mon, 9 Jul 2012 02:29:57 +0900 Subject: [PATCH] =?utf8?q?socket=5Ftest=20=E3=81=B8=E3=81=AE=E3=83=AA?= =?utf8?q?=E3=83=8D=E3=83=BC=E3=83=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- roast/test/lexical2_test/source/xml_test.cpp | 4 +--- roast/test/{roast_test_socket => socket_test}/http_proxy.cpp | 0 roast/test/{roast_test_socket => socket_test}/socket_server_test.cpp | 0 .../roast_test_2nc.sln => socket_test/socket_test.sln} | 2 +- .../roast_test_2nc.vcproj => socket_test/socket_test.vcproj} | 4 ++-- roast/test/sql_test/sql_test.cpp | 1 - roast/test/sql_test/sql_test.vcproj | 4 ++++ 7 files changed, 8 insertions(+), 7 deletions(-) rename roast/test/{roast_test_socket => socket_test}/http_proxy.cpp (100%) rename roast/test/{roast_test_socket => socket_test}/socket_server_test.cpp (100%) rename roast/test/{roast_test_socket/roast_test_2nc.sln => socket_test/socket_test.sln} (84%) rename roast/test/{roast_test_socket/roast_test_2nc.vcproj => socket_test/socket_test.vcproj} (98%) diff --git a/roast/test/lexical2_test/source/xml_test.cpp b/roast/test/lexical2_test/source/xml_test.cpp index a442e21e..e90f6cc7 100644 --- 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 da9ea354..fed1d59b 100644 --- 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 ab1fdc7d..3a422063 100644 --- a/roast/test/roast_test_socket/roast_test_2nc.vcproj +++ b/roast/test/socket_test/socket_test.vcproj @@ -2,9 +2,9 @@ diff --git a/roast/test/sql_test/sql_test.cpp b/roast/test/sql_test/sql_test.cpp index e08a0ee9..e1ce4756 100644 --- a/roast/test/sql_test/sql_test.cpp +++ b/roast/test/sql_test/sql_test.cpp @@ -1,6 +1,5 @@ #include #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 92571838..d22fd396 100644 --- 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}" > + +