diff --git a/autowiring/CoreContext.h b/autowiring/CoreContext.h index f49c1b7e2..c13aa6a5d 100644 --- a/autowiring/CoreContext.h +++ b/autowiring/CoreContext.h @@ -542,7 +542,7 @@ class CoreContext: static_assert(std::is_base_of::value, "Constructive type does not implement Object as expected"); static_assert( std::is_base_of::value || !has_static_new::value, - "If type T provides a static new method, then the constructed type MUST directly inherit Object" + "If type T provides a static New method, then the constructed type MUST directly inherit Object" ); // First see if the object has already been injected: diff --git a/autowiring/CreationRules.h b/autowiring/CreationRules.h index d92751657..d1dffb97e 100644 --- a/autowiring/CreationRules.h +++ b/autowiring/CreationRules.h @@ -24,7 +24,7 @@ struct CreationRules { auto retVal = U::New(std::forward(args)...); static_assert( std::is_convertible::value, - "Attempted to create T using T::New, but the return value of T::New is not derived from T" + "Attempted to create T using T::New, but the type of T::New() is not derived from T" ); return retVal; } @@ -32,7 +32,7 @@ struct CreationRules { template static typename std::enable_if::value, U*>::type New(Args&&... args) { static_assert(!std::is_abstract::value, "Cannot create a type which is abstract"); - static_assert(!has_static_new::value, "Can't inject member with arguments if it has a static new"); + static_assert(!has_static_new::value, "Can't inject member with arguments if it has a static New"); // Allocate slot first before registration auto* pSpace = Allocate(nullptr); diff --git a/src/autowiring/test/FactoryTest.cpp b/src/autowiring/test/FactoryTest.cpp index 51e3c176c..c1e295f06 100644 --- a/src/autowiring/test/FactoryTest.cpp +++ b/src/autowiring/test/FactoryTest.cpp @@ -37,7 +37,7 @@ class ClassWithStaticNew: static_assert(has_simple_constructor::value, "Class with default-argument constructor was not correctly detected as such "); static_assert(has_static_new::value, "Class with static allocator was not correctly detected as having one"); -static_assert(!has_static_new::value, "Static new detected on a class that does not have a static new"); +static_assert(!has_static_new::value, "Static New detected on a class that does not have a static New"); TEST_F(FactoryTest, VerifyFactoryCall) { // Try to create the static new type: