Changeset 11071 for code/trunk/test/core/command

Timestamp:

Jan 17, 2016, 10:29:21 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• test/core/command/CommandTest.cc (modified) (2 diffs)
• test/core/command/ExecutorPtrTest.cc (copied) (copied from code/branches/cpp11_v3/test/core/command/ExecutorPtrTest.cc)
• test/core/command/FunctorPtrTest.cc (copied) (copied from code/branches/cpp11_v3/test/core/command/FunctorPtrTest.cc)
• test/core/command/FunctorTest.cc (copied) (copied from code/branches/cpp11_v3/test/core/command/FunctorTest.cc)

code/trunk/test/core/command/CommandTest.cc

@@ -129 +129 @@
                 ModifyConsoleCommand("test").popObject();
             else if (a == 1)
-                ModifyConsoleCommand("test").setFunction(FunctorPtr(0));
+                ModifyConsoleCommand("test").setFunction(FunctorPtr(nullptr));
             else if (a == -1)
                 ModifyConsoleCommand("test").popFunction();
@@ -138 +138 @@
         {
             public:
-                virtual void SetUp()
+                virtual void SetUp() override
                 {
                     new IdentifierManager();
                     new ConsoleCommandManager();
                     ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::CONSOLE_COMMAND);
-                    Context::setRootContext(new Context(NULL));
+                    Context::setRootContext(new Context(nullptr));
                     Identifier::initConfigValues_s = false; // TODO: hack!
                     IdentifierManager::getInstance().createClassHierarchy();
                 }
 
-                virtual void TearDown()
+                virtual void TearDown() override
                 {
                     IdentifierManager::getInstance().destroyClassHierarchy();