From: Myun2 <myun2@nwhite.info>
Date: Thu, 13 Jan 2011 12:45:01 +0000 (+0900)
Subject: lexical_test/dom_test.cpp: コンパイルが通るように。そしてデバッグ…
X-Git-Tag: 20111130_shapeup_prev^2~53
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c3e6ab895c23feb4e5fbcdde4420b78a42258f3d;p=roast%2Froast.git

lexical_test/dom_test.cpp: コンパイルが通るように。そしてデバッグ…
---

diff --git a/roast/include/roast/lexical/exception.hpp b/roast/include/roast/lexical/exception.hpp
index a61c7406..afc9c77b 100644
--- a/roast/include/roast/lexical/exception.hpp
+++ b/roast/include/roast/lexical/exception.hpp
@@ -4,6 +4,8 @@
 #ifndef __SFJP_ROAST__lexical__exception_HPP__
 #define __SFJP_ROAST__lexical__exception_HPP__
 
+#include <string>
+
 namespace roast
 {
 	namespace lexical
diff --git a/roast/include/roast/xml/roast_xml/sax.hpp b/roast/include/roast/xml/roast_xml/sax.hpp
index 5bc025c3..b63cbc7a 100644
--- a/roast/include/roast/xml/roast_xml/sax.hpp
+++ b/roast/include/roast/xml/roast_xml/sax.hpp
@@ -6,7 +6,7 @@
 #define __SFJP_ROAST__xml__roast_xml__sax_HPP__
 
 #include "roast/xml/roast_xml/rule_xml.hpp"
-//#include "roast/lexical/string_parser_base.hpp"
+#include "roast/debug/console_monitor.hpp"
 #include <stack>
 
 namespace roast
diff --git a/roast/test/lexical_test/dom_test.cpp b/roast/test/lexical_test/dom_test.cpp
index 36b66c2a..ec4f0461 100644
--- a/roast/test/lexical_test/dom_test.cpp
+++ b/roast/test/lexical_test/dom_test.cpp
@@ -10,6 +10,9 @@ using namespace std;
 using namespace roast;
 using namespace roast::roast_xml;
 
+#pragma warning(disable:4996)
+#pragma warning(disable:4102)
+
 ///////////////////////////////////////////////////////////
 const bool g_detail = false;
 
@@ -115,7 +118,7 @@ int main()
 
 		using namespace roast::roast_xml::rule;
 
-		goto POINT;
+		goto LABEL1;
 
 		//	root_cant_have_text
 		sax_error_test("<", illegal_term_exception().c_str() );
@@ -124,7 +127,7 @@ int main()
 		sax_error_test("<?a", illegal_term_in_xmldecl_exception().c_str() );
 		sax_error_test("<!", illegal_term_in_xmldecl_exception().c_str() );
 		sax_error_test("<! ", illegal_term_in_xmldecl_exception().c_str() );
-POINT:
+LABEL1:
 		sax_error_test("<!----><!", invalid_comment_start_exception().c_str() );
 
 		sax_error_test("   a", root_cant_have_text_exception().c_str() );
@@ -133,7 +136,7 @@ POINT:
 		sax_error_test("   <!-> ", invalid_comment_start_exception().c_str() );
 		sax_error_test("   <!--> ", illegal_term_in_comment_exception().c_str() );
 		sax_error_test("   <!-- ddd", illegal_term_in_comment_exception().c_str() );
-POINT2:
+LABEL2:
 		sax_error_test("   <!-- ddddd --> ", no_root_element_exception().c_str() );// X
 		//goto END;
 		sax_error_test("   <!-- ddddd -->", no_root_element_exception().c_str() );// X