Use default member initializers and constructor delegation

[libs/core.git] / source / strings / regmatch.h

diff --git a/source/strings/regmatch.h b/source/strings/regmatch.h
index c5116cdc5408ec7238c65f6a250feb9bc23f8308..0858e5a8dfc5cec44afba0d308ca45ef3c8d3206 100644 (file)
--- a/source/strings/regmatch.h
+++ b/source/strings/regmatch.h
@@ -26,20 +26,17 @@ public:
        {
                typedef std::string::size_type size_type;
 
-               bool match;        //< Whether or not this group matched
-               size_type begin;   //< First offset of the match
-               size_type end;     //< One-past-last offset
-               size_type length;  //< Length of the match (end-begin)
-               std::string str;   //< The part of the string that matched
+               bool match = false;  //< Whether or not this group matched
+               size_type begin;     //< First offset of the match
+               size_type end;       //< One-past-last offset
+               size_type length;    //< Length of the match (end-begin)
+               std::string str;     //< The part of the string that matched
 
-               Group(): match(false) { }
                operator bool() const { return match; }
        };
 
-       typedef std::vector<Group> GroupArray;
-
 private:
-       GroupArray groups;
+       std::vector<Group> groups;
 
 public:
        /** Constructs a RegMatch representing a non-match. */