Changeset 11071 for code/trunk/src/libraries/tools/ResourceCollection.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)
• src/libraries/tools/ResourceCollection.cc (modified) (2 diffs)

code/trunk/src/libraries/tools/ResourceCollection.cc

@@ -48 +48 @@
     }
 
-    ResourceCollection::~ResourceCollection()
-    {
-    }
-
     void ResourceCollection::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
@@ -93 +89 @@
     {
         if (index >= resourceLocations_.size())
-            return NULL;
+            return nullptr;
         else
             return resourceLocations_[index];