diff --git a/addons/naming.py b/addons/naming.py index faaf5327e..948f158b6 100755 --- a/addons/naming.py +++ b/addons/naming.py @@ -81,7 +81,7 @@ for arg in sys.argv[1:]: for scope in cfg.scopes: if scope.type == 'Function': function = scope.function - if function is not None and function.type in ('Constructor', 'Destructor'): + if function is not None and function.type in ('Constructor', 'Destructor', 'CopyConstructor', 'MoveConstructor'): continue res = re.match(RE_FUNCTIONNAME, scope.className) if not res: diff --git a/addons/namingng.py b/addons/namingng.py index 84f5ed31b..73f1b08ec 100755 --- a/addons/namingng.py +++ b/addons/namingng.py @@ -182,7 +182,7 @@ def process(dumpfiles, configfile, debugprint=False): if "RE_FUNCTIONNAME" in conf and conf["RE_FUNCTIONNAME"]: for token in cfg.tokenlist: if token.function: - if token.function.type == 'Constructor' or token.function.type == 'Destructor': + if token.function.type in ('Constructor', 'Destructor', 'CopyConstructor', 'MoveConstructor'): continue retval = token.previous.str prev = token.previous diff --git a/addons/test/naming_test.cpp b/addons/test/naming_test.cpp index 1c5bf3826..155b0caa5 100644 --- a/addons/test/naming_test.cpp +++ b/addons/test/naming_test.cpp @@ -6,4 +6,6 @@ class TestClass1 { TestClass1() {} ~TestClass1() {} + TestClass1(const TestClass1 &) {} + TestClass1(TestClass1 &&) {} };