Changeset 7206 in orxonox.OLD for branches/std/src/lib/util

Timestamp:

Mar 9, 2006, 10:12:18 PM (18 years ago)

Author:

rennerc

Message:

fixed some bugs

Location:

branches/std/src/lib/util/loading

Files:

• load_param.cc (modified) (2 diffs)
• resource_manager.cc (modified) (2 diffs)

branches/std/src/lib/util/loading/load_param.cc

@@ -234 +234 @@
 
   if (root == NULL)
-    return NULL;
+    return "";
 
   element = root->FirstChildElement( parameterName);
-  if( element == NULL) return NULL;
+  if( element == NULL) return "";
 
   node = element->FirstChild();
@@ -245 +245 @@
     node = node->NextSibling();
   }
-  return NULL;
+  return "";
 }
 

branches/std/src/lib/util/loading/resource_manager.cc

@@ -888 +888 @@
 {
   if (fileName.empty() || ResourceManager::getInstance()->getDataDir().empty())
-    return NULL;
+    return "";
 
   std::string retName = ResourceManager::getInstance()->getDataDir() +fileName;
@@ -894 +894 @@
     return retName;
   else
-    return NULL;
+    return "";
 }