Fix a problem with MATCH_MASK handling in Regex

Explicitly cast both arguments to pow to the same type so mingw doesn't get confused

diff --git a/source/lexicalcast.cpp b/source/lexicalcast.cpp
index cdd55780b5f612ee86cce7db6beee8c64d80502f..9ba642f2ae48bebe826c226ef98b8604e4c49114 100644 (file)
--- a/source/lexicalcast.cpp
+++ b/source/lexicalcast.cpp
@@ -305,7 +305,7 @@ string flt_to_str(T v, const Fmt &f)
        }
 
        // Apply rounding
-       w+=5.0l/pow(10.0l, digits);
+       w+=5.0l/pow(10.0l, static_cast<long double>(digits));
        if(w>10)
        {
                // Rounding bumped us to the next exponent, deal with it

diff --git a/source/regex.cpp b/source/regex.cpp
index 9ba089d09008c7fd1c23a9d700051984eab11362..7e9c8b0c713c11965f9d5f6b7c8afad4cc696926 100644 (file)
--- a/source/regex.cpp
+++ b/source/regex.cpp
@@ -472,9 +472,9 @@ bool Regex::run(const string &str, const string::const_iterator &begin, RegMatch
                                                {
                                                        unsigned char m=*(j->citer+(c>>3));
                                                        match_result=m&(1<<(c&7));
-                                                       input_consumed=true;
-                                                       j->citer+=32;
                                                }
+                                               input_consumed=true;
+                                               j->citer+=32;
                                        }
                                        else if(instr==MATCH_ANY)
                                        {