- Fix a warning (parameters hide members)

diff --git a/actions.cc b/actions.cc
index c38da90106b7f59173cf57475c1c934339b2e119..ef4f296bd038fd991e77c06821386856b53acda9 100644 (file)
--- a/actions.cc
+++ b/actions.cc
@@ -695,23 +695,23 @@ uint Scanner::unescape(SubStr &s) const
        }
 }
 
-std::string& Scanner::unescape(SubStr & in, std::string & out) const
+std::string& Scanner::unescape(SubStr& str_in, std::string& str_out) const
 {
-       out.clear();
+       str_out.clear();
 
-       while(in.len)
+       while(str_in.len)
        {
-               uint c = unescape(in);
+               uint c = unescape(str_in);
                
                if (c > 0xFF)
                {
-                       fatal(in.ofs(), "Illegal character");
+                       fatal(str_in.ofs(), "Illegal character");
                }
 
-               out += static_cast<char>(c);
+               str_out += static_cast<char>(c);
        }
 
-       return out;
+       return str_out;
 }
 
 Range * Scanner::getRange(SubStr &s) const

diff --git a/scanner.h b/scanner.h
index 5644eb7fcaf899277f0a04e5be5a433424b9e430..9f7fb95892a0b028e8ab73fd875d3b4fe532f8fc 100644 (file)
--- a/scanner.h
+++ b/scanner.h
@@ -41,7 +41,7 @@ public:
        uint xlat(uint c) const;
 
        uint unescape(SubStr &s) const;
-       std::string& unescape(SubStr & in, std::string & out) const;
+       std::string& unescape(SubStr& str_in, std::string& str_out) const;
 
        Range * getRange(SubStr &s) const;
        RegExp * matchChar(uint c) const;