char.hpp: or -> or_

diff --git a/roast/include/roast/lexical/rule/char.hpp b/roast/include/roast/lexical/rule/char.hpp
index 4fe0595..8ff16ed 100644 (file)
--- a/roast/include/roast/lexical/rule/char.hpp
+++ b/roast/include/roast/lexical/rule/char.hpp
@@ -91,9 +91,9 @@ namespace roast
                                typedef unichar< '\r' > cr;
                                typedef unichar< '\n' > lf;
 
-                               typedef or<cr,lf> crlf;
+                               typedef or_<cr,lf> crlf;
                                
-                               typedef or<lf, seq<cr,lf> > newline;
+                               typedef or_<lf, seq<cr,lf> > newline;
 
                                typedef line_countable<crlf> line_countable_crlf;
                        }
@@ -119,7 +119,7 @@ namespace roast
 
                        ///////////////////////////////////////////////////
                        
-                       typedef or<
+                       typedef or_<
                                unichar<' '>,
                                unichar<'\t'>,
                                unichar<'\r'>,
@@ -130,7 +130,7 @@ namespace roast
                        typedef optional_repeat_nogen<whitespace>
                                no_requre_whitespace, _nrqws, _noreqws, nrqws, noreqws, optws;
 
-                       typedef or<
+                       typedef or_<
                                unichar<' '>,
                                unichar<'\t'>,
                                chars::line_countable_crlf