[Boost-commit] svn:boost r57411 - trunk/boost/wave/util

Subject: [Boost-commit] svn:boost r57411 - trunk/boost/wave/util
From: hartmut.kaiser_at_[hidden]
Date: 2009-11-05 12:30:45

Author: hkaiser
Date: 2009-11-05 12:30:44 EST (Thu, 05 Nov 2009)
New Revision: 57411
URL: http://svn.boost.org/trac/boost/changeset/57411

Log:
Wave: fixing spurious test errors introduced while silencing warnings
Text files modified: 
   trunk/boost/wave/util/pattern_parser.hpp |    20 ++++++++++----------                    
   1 files changed, 10 insertions(+), 10 deletions(-)

Modified: trunk/boost/wave/util/pattern_parser.hpp
==============================================================================
--- trunk/boost/wave/util/pattern_parser.hpp	(original)
+++ trunk/boost/wave/util/pattern_parser.hpp	2009-11-05 12:30:44 EST (Thu, 05 Nov 2009)
@@ -31,27 +31,27 @@
     //  pattern_and class
     //
     ///////////////////////////////////////////////////////////////////////////
-    template <typename CharT = char, typename Pattern = unsigned long>
+    template <typename CharT = char>
     struct pattern_and 
       : public boost::spirit::classic::char_parser<pattern_and<CharT> >
     {
-        pattern_and(CharT pattern_, Pattern pattern_mask_ = Pattern())
+        pattern_and(CharT pattern_, unsigned long pattern_mask_ = 0UL)
         :   pattern(pattern_), 
-            pattern_mask((Pattern() != pattern_mask_) ? pattern_mask_ : Pattern(pattern_))
+            pattern_mask((0UL != pattern_mask_) ? pattern_mask_ : pattern_)
         {}
 
         template <typename T>
         bool test(T pattern_) const
-        { return ((Pattern)pattern_ & pattern_mask) == (Pattern)pattern; }
+        { return ((unsigned long)pattern_ & pattern_mask) == (unsigned long)pattern; }
 
-        CharT   pattern;
-        Pattern pattern_mask;
+        CharT         pattern;
+        unsigned long pattern_mask;
     };
 
-    template <typename CharT, typename Pattern>
-    inline pattern_and<CharT, Pattern>
-    pattern_p(CharT pattern, Pattern pattern_mask = Pattern())
-    { return pattern_and<CharT, Pattern>(pattern, pattern_mask); }
+    template <typename CharT>
+    inline pattern_and<CharT>
+    pattern_p(CharT pattern, unsigned long pattern_mask = 0UL)
+    { return pattern_and<CharT>(pattern, pattern_mask); }
 
 ///////////////////////////////////////////////////////////////////////////////
 }   // namespace util