- Be more explicit in Str/SubStr and drop unused constructor.

- Fixed #2088583 Compile problemon AIX.

diff --git a/re2c/CHANGELOG b/re2c/CHANGELOG
index 301c8af3b8ce9b45167f1b32cadb70b58584a0ab..f4011dad0dcfff60cae16cd4406a3640bf66ccbd 100644 (file)
--- a/re2c/CHANGELOG
+++ b/re2c/CHANGELOG
@@ -1,5 +1,6 @@
 Version 0.13.6 (2008-??-??)
 ---------------------------
+- Fixed #2088583 Compile problemon AIX.
 
 Version 0.13.5 (2008-05-25)
 ---------------------------

diff --git a/re2c/htdocs/index.html b/re2c/htdocs/index.html
index 28b7e55720c67f7224ddc5ab50f88862a904ca97..109c93fc4f29dbdd7ba2fc11b59b9bab8ae5f4af 100755 (executable)
--- a/re2c/htdocs/index.html
+++ b/re2c/htdocs/index.html
@@ -81,6 +81,10 @@ fixes which were incorporated. <a href=
 </ul>
 <hr />
 <h1>Changelog</h1>
+<h2>2008-??-??: 0.13.6</h2>
+<ul>
+<li>Fixed #2088583 Compile problemon AIX.</li>
+</ul>
 <h2>2008-05-25: 0.13.5</h2>
 <ul>
 <li>Fixed #1952896 Segfault in re2c::Scanner::scan.</li>

diff --git a/re2c/substr.cc b/re2c/substr.cc
index 1b6f5d7bf8b1ec17d588e132698c2ddcf886a902..9ac32bd59cedb10bd56358f62064882ee5d67fa8 100644 (file)
--- a/re2c/substr.cc
+++ b/re2c/substr.cc
@@ -36,13 +36,6 @@ Str::Str(const SubStr& s)
        ;
 }
 
-Str::Str(Str& s)
-       : SubStr(s.str, s.len)
-{
-       s.str = NULL;
-       s.len = 0;
-}
-
 Str::Str(const char *s)
        : SubStr(strdup(s), strlen(s))
 {

diff --git a/re2c/substr.h b/re2c/substr.h
index e65231802f067ac526e7b128bc62935e948babe2..32e48c3d8b20e9532f61b7bef5001929da31daa3 100644 (file)
--- a/re2c/substr.h
+++ b/re2c/substr.h
@@ -20,7 +20,7 @@ public:
        friend bool operator==(const SubStr &, const SubStr &);
        SubStr(const uchar*, uint);
        SubStr(const char*, uint);
-       SubStr(const char*);
+       explicit SubStr(const char*);
        SubStr(const SubStr&);
        virtual ~SubStr();
        void out(std::ostream&) const;
@@ -36,11 +36,10 @@ protected:
 class Str: public SubStr
 {
 public:
+       explicit Str(const char*);
        Str(const SubStr&);
-       Str(Str&);
-       Str(const char*);
        Str();
-       ~Str();
+       virtual ~Str();
 };
 
 inline std::ostream& operator<<(std::ostream& o, const SubStr &s)