Changeset 10765 for code/branches/cpp11_v2/test/core/class/SuperTest.cc
- Timestamp:
- Nov 4, 2015, 10:25:42 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/test/core/class/SuperTest.cc
r10624 r10765 14 14 { 15 15 public: 16 TestClass(Context* context = NULL) : BaseObject(context), changedNameBase_(false), xmlPortBase_(false), modeBase_(XMLPort::NOP)16 TestClass(Context* context = nullptr) : BaseObject(context), changedNameBase_(false), xmlPortBase_(false), modeBase_(XMLPort::NOP) 17 17 { 18 18 RegisterObject(TestClass); … … 38 38 { 39 39 public: 40 TestSubclass(Context* context = NULL) : TestClass(context), changedNameSubclass_(false), xmlPortSubclass_(false), modeSubclass_(XMLPort::NOP)40 TestSubclass(Context* context = nullptr) : TestClass(context), changedNameSubclass_(false), xmlPortSubclass_(false), modeSubclass_(XMLPort::NOP) 41 41 { 42 42 RegisterObject(TestSubclass); … … 74 74 new IdentifierManager(); 75 75 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 76 Context::setRootContext(new Context( NULL));76 Context::setRootContext(new Context(nullptr)); 77 77 Identifier::initConfigValues_s = false; // TODO: hack! 78 78 IdentifierManager::getInstance().createClassHierarchy(); … … 132 132 EXPECT_EQ(XMLPort::NOP, test.modeSubclass_); 133 133 134 Element* element = NULL;134 Element* element = nullptr; 135 135 test.XMLPort(*element, XMLPort::SaveObject); 136 136
Note: See TracChangeset
for help on using the changeset viewer.