From b88d61dcb4afb3ef29dc6e39ad68d57783886b79 Mon Sep 17 00:00:00 2001
From: Richard Quirk <richard.quirk@gmail.com>
Date: Fri, 28 Oct 2011 22:06:57 +0200
Subject: [PATCH] Make single-argument test constructors explicit

---
 test/testclass.cpp        | 18 +++++++++---------
 test/testconstructors.cpp | 24 ++++++++++++------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/test/testclass.cpp b/test/testclass.cpp
index 6b53fc10d..d2d7c8817 100644
--- a/test/testclass.cpp
+++ b/test/testclass.cpp
@@ -1683,7 +1683,7 @@ private:
                        "    FILE *fp;\n"
                        "\n"
                        "public:\n"
-                       "    C(FILE *fp);\n"
+                       "    explicit C(FILE *fp);\n"
                        "};\n"
                        "\n"
                        "C::C(FILE *fp) {\n"
@@ -1761,7 +1761,7 @@ private:
         checkUninitVar("class Foo : public Bar\n"
                        "{\n"
                        "public:\n"
-                       "    Foo(int i) : Bar(mi=i) { }\n"
+                       "    explicit Foo(int i) : Bar(mi=i) { }\n"
                        "private:\n"
                        "    int mi;\n"
                        "};\n");
@@ -1811,7 +1811,7 @@ private:
                        "private:\n"
                        "    int xasd;\n"
                        "public:\n"
-                       "    Prefs(wxSize size);\n"
+                       "    explicit Prefs(wxSize size);\n"
                        "};\n"
                        "Prefs::Prefs(wxSize size)\n"
                        "{\n"
@@ -1835,7 +1835,7 @@ private:
     void uninitVar11() {
         checkUninitVar("class A {\n"
                        "public:\n"
-                       "        A(int a = 0);\n"
+                       "        explicit A(int a = 0);\n"
                        "private:\n"
                        "        int var;\n"
                        "};\n"
@@ -2138,7 +2138,7 @@ private:
     void uninitVar18() { // ticket #2465
         checkUninitVar("struct Altren\n"
                        "{\n"
-                       "    Altren(int _a = 0) : value(0) { }\n"
+                       "    explicit Altren(int _a = 0) : value(0) { }\n"
                        "    int value;\n"
                        "};\n"
                        "class A\n"
@@ -2152,7 +2152,7 @@ private:
 
         checkUninitVar("struct Altren\n"
                        "{\n"
-                       "    Altren(int _a) : value(0) { }\n"
+                       "    explicit Altren(int _a) : value(0) { }\n"
                        "    int value;\n"
                        "};\n"
                        "class A\n"
@@ -2171,7 +2171,7 @@ private:
                        "    char* m_str;\n"
                        "    int m_len;\n"
                        "public:\n"
-                       "    mystring(const char* str)\n"
+                       "    explicit mystring(const char* str)\n"
                        "    {\n"
                        "        m_len = strlen(str);\n"
                        "        m_str = (char*) malloc(m_len+1);\n"
@@ -2602,7 +2602,7 @@ private:
                        "private:\n"
                        "    int foo;\n"
                        "public:\n"
-                       "    Foo(std::istream &in)\n"
+                       "    explicit Foo(std::istream &in)\n"
                        "    {\n"
                        "        if(!(in >> foo))\n"
                        "            throw 0;\n"
@@ -2659,7 +2659,7 @@ private:
                        "    int foo;\n"
                        "    Foo() { }\n"
                        "public:\n"
-                       "    Foo(int _i) { }\n"
+                       "    explicit Foo(int _i) { }\n"
                        "};\n");
 
         ASSERT_EQUALS("[test.cpp:7]: (warning) Member variable 'Foo::foo' is not initialized in the constructor.\n", errout.str());
diff --git a/test/testconstructors.cpp b/test/testconstructors.cpp
index 1c20bcd36..49d485349 100644
--- a/test/testconstructors.cpp
+++ b/test/testconstructors.cpp
@@ -227,7 +227,7 @@ private:
               "{\n"
               "public:\n"
               "    Fred();\n"
-              "    Fred(int _i);\n"
+              "    explicit Fred(int _i);\n"
               "    int i;\n"
               "};\n"
               "Fred::Fred()\n"
@@ -241,7 +241,7 @@ private:
         check("struct Fred\n"
               "{\n"
               "    Fred();\n"
-              "    Fred(int _i);\n"
+              "    explicit Fred(int _i);\n"
               "    int i;\n"
               "};\n"
               "Fred::Fred()\n"
@@ -647,7 +647,7 @@ private:
         check("class c\n"
               "{\n"
               "    c();\n"
-              "    c(bool b);"
+              "    explicit c(bool b);"
               "\n"
               "    void InitInt();\n"
               "\n"
@@ -677,7 +677,7 @@ private:
         check("struct c\n"
               "{\n"
               "    c();\n"
-              "    c(bool b);"
+              "    explicit c(bool b);"
               "\n"
               "    void InitInt();\n"
               "\n"
@@ -850,12 +850,12 @@ private:
               "public:\n"
               "    A();\n"
               "    struct B {\n"
-              "        B(int x);\n"
+              "        explicit B(int x);\n"
               "        struct C {\n"
-              "            C(int y);\n"
+              "            explicit C(int y);\n"
               "            struct D {\n"
               "                int d;\n"
-              "                D(int z);\n"
+              "                explicit D(int z);\n"
               "            };\n"
               "            int c;\n"
               "        };\n"
@@ -879,9 +879,9 @@ private:
               "public:\n"
               "    A();\n"
               "    struct B {\n"
-              "        B(int x);\n"
+              "        explicit B(int x);\n"
               "        struct C {\n"
-              "            C(int y);\n"
+              "            explicit C(int y);\n"
               "            struct D {\n"
               "                D(const D &);\n"
               "                int d;\n"
@@ -908,13 +908,13 @@ private:
               "public:\n"
               "    A();\n"
               "    struct B {\n"
-              "        B(int x);\n"
+              "        explicit B(int x);\n"
               "        struct C {\n"
-              "            C(int y);\n"
+              "            explicit C(int y);\n"
               "            struct D {\n"
               "                struct E { int e; };\n"
               "                struct E d;\n"
-              "                D(const E &);\n"
+              "                explicit D(const E &);\n"
               "            };\n"
               "            int c;\n"
               "        };\n"