diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 1e102937b..08bdc8c4a 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -7411,11 +7411,15 @@ public:
         start(nullptr),
         end(nullptr) {
     }
-    EnumValue(const EnumValue &ev) :
-        name(ev.name),
-        value(ev.value),
-        start(ev.start),
-        end(ev.end) {
+    EnumValue(const EnumValue &ev) {
+        *this = ev;
+    }
+    EnumValue& operator=(const EnumValue& ev) {
+        name=ev.name;
+        value=ev.value;
+        start=ev.start;
+        end=ev.end;
+        return *this;
     }
     EnumValue(Token *name_, Token *value_, Token *start_, Token *end_) :
         name(name_),
diff --git a/test/testclass.cpp b/test/testclass.cpp
index 2a05eb455..56a9b7274 100644
--- a/test/testclass.cpp
+++ b/test/testclass.cpp
@@ -2583,7 +2583,7 @@ private:
                       "void f() {\n"
                       "  st s;\n"
                       "  std::memset(&s, 0, sizeof(st));\n"
-                      "}", "std.cfg");
+                      "}", true);
         ASSERT_EQUALS("", errout.str());
     }