Changeset 11071 for code/trunk/test/core/class/SuperTest.cc

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/class/SuperTest.cc (modified) (5 diffs)

code/trunk/test/core/class/SuperTest.cc

@@ -14 +14 @@
         {
             public:
-                TestClass(Context* context = NULL) : BaseObject(context), changedNameBase_(false), xmlPortBase_(false), modeBase_(XMLPort::NOP)
+                TestClass(Context* context = nullptr) : BaseObject(context), changedNameBase_(false), xmlPortBase_(false), modeBase_(XMLPort::NOP)
                 {
                     RegisterObject(TestClass);
                 }
 
-                virtual void changedName()
+                virtual void changedName() override
                 {
                     this->changedNameBase_ = true;
                 }
 
-                virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode)
+                virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override
                 {
                     this->xmlPortBase_ = true;
@@ -38 +38 @@
         {
             public:
-                TestSubclass(Context* context = NULL) : TestClass(context), changedNameSubclass_(false), xmlPortSubclass_(false), modeSubclass_(XMLPort::NOP)
+                TestSubclass(Context* context = nullptr) : TestClass(context), changedNameSubclass_(false), xmlPortSubclass_(false), modeSubclass_(XMLPort::NOP)
                 {
                     RegisterObject(TestSubclass);
                 }
 
-                virtual void changedName()
+                virtual void changedName() override
                 {
                     this->changedNameSubclass_ = true;
@@ -50 +50 @@
                 }
 
-                virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode)
+                virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override
                 {
                     this->xmlPortSubclass_ = true;
@@ -70 +70 @@
         {
             public:
-                virtual void SetUp()
+                virtual void SetUp() override
                 {
                     new IdentifierManager();
                     ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
-                    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();
@@ -132 +132 @@
         EXPECT_EQ(XMLPort::NOP, test.modeSubclass_);
 
-        Element* element = NULL;
+        Element* element = nullptr;
         test.XMLPort(*element, XMLPort::SaveObject);