Linux の修正ちゃんとコミットされてなかったじゃねぇか…！！！

diff --git a/roast/include/roast/io/basic_io_base.hpp b/roast/include/roast/io/basic_io_base.hpp
index ab60b2c..ee1c20b 100644 (file)
--- a/roast/include/roast/io/basic_io_base.hpp
+++ b/roast/include/roast/io/basic_io_base.hpp
@@ -6,6 +6,7 @@
 #define __SFJP_ROAST__io__basic_io_base_HPP__
 
 #include "roast/io/io_base.hpp"
+#include <string.h>
 
 namespace roast
 {
@@ -101,7 +102,7 @@ namespace roast
                        return _Impl::write(m_handle, buf,size);
                }
                int write(const char* str){
-                       return write(str, strlen(str));
+                       return write(str, ::strlen(str));
                }
                int write(char c){
                        return write(&c, 1);

diff --git a/roast/include/roast/lexical/rule/string.hpp b/roast/include/roast/lexical/rule/string.hpp
index 2825377..da050ca 100644 (file)
--- a/roast/include/roast/lexical/rule/string.hpp
+++ b/roast/include/roast/lexical/rule/string.hpp
@@ -37,7 +37,7 @@ namespace roast
                                                if ( checker.analyze(it_work, param) == false )
                                                        break;
 
-                                               m_str.append(1,*p)
+                                               m_str.append(1,*p);
                                        }
                                        return true;
                                }

diff --git a/roast/test/linux_test2/Makefile b/roast/test/linux_test2/Makefile
index ea491f6..9876a1c 100755 (executable)
--- a/roast/test/linux_test2/Makefile
+++ b/roast/test/linux_test2/Makefile
@@ -10,6 +10,8 @@ COMP = $(CC) $(COPTS)
 #=========================
 
 all: test
+lex:
+       $(COMP) lex_test.cpp
 lex_test:
        $(COMP) lex_test.cpp
 thread_test:

diff --git a/roast/test/linux_test2/lex_test.cpp b/roast/test/linux_test2/lex_test.cpp
index bda51dd..ec9a1b5 100644 (file)
--- a/roast/test/linux_test2/lex_test.cpp
+++ b/roast/test/linux_test2/lex_test.cpp
@@ -1,4 +1,5 @@
-#include "roast/lexical.hpp"
+//#include "roast/lexical/rule/rule.hpp"
+#include "roast/lexical/rule/lengthable.hpp"
 
 using namespace roast;
 

diff --git a/roast/test/linux_test2/test.cpp b/roast/test/linux_test2/test.cpp
index 8cd4141..539f345 100644 (file)
--- a/roast/test/linux_test2/test.cpp
+++ b/roast/test/linux_test2/test.cpp
@@ -1,6 +1,7 @@
 #include "roast/type_traits.hpp"
+#include "roast/io/stdio.hpp"
 #include "roast/time.hpp"
-#include "roast/tuple.hpp"
+//#include "roast/tuple.hpp"
 #include "roast/shared_ptr.hpp"
 #include "roast/memory/sized_ptr.hpp"