From ec191782d427068b86bc8596c1aaeab58207e136 Mon Sep 17 00:00:00 2001 From: Robert Carlsen Date: Tue, 7 May 2019 13:41:11 -0600 Subject: [PATCH] fix registerKnownLabelMacro typo The typo caused the generated static var for the macro to not be unique resulting in name clashes if more than one call exists in the same file. ref #10952 --- framework/include/base/Registry.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/include/base/Registry.h b/framework/include/base/Registry.h index cab9181e2bf8..228e3c0bfffb 100644 --- a/framework/include/base/Registry.h +++ b/framework/include/base/Registry.h @@ -22,7 +22,7 @@ /// when your app/module code may be compiled with other apps without your objects being /// registered. Calling this multiple times with the same argument is safe. #define registerKnownLabel(X) \ - static char combineNames1(dummy_var_for_known_label, __LINE__) = Registry::addKnownLabel(X) + static char combineNames(dummy_var_for_known_label, __LINE__) = Registry::addKnownLabel(X) /// add an Action to the registry with the given app name/label as being associated with the given /// task (quoted string). classname is the (unquoted) c++ class.