Changeset 8316 in orxonox.OLD for trunk/src/lib/util/loading

Timestamp:

Jun 11, 2006, 1:57:27 PM (18 years ago)

Author:

bensch

Message:

trunk: fixed most -Wall warnings… but there are still many missing :/

Location:

trunk/src/lib/util/loading

Files:

• dynamic_loader.cc (modified) (3 diffs)
• load_param.cc (modified) (1 diff)
• load_param_description.cc (modified) (1 diff)
• resource_manager.cc (modified) (5 diffs)

trunk/src/lib/util/loading/dynamic_loader.cc

@@ -60 +60 @@
   }
   void *mkr = dlsym( this->handle, "maker");
+  return (mkr != NULL);
 }
 
@@ -72 +73 @@
   }
 //  void *mkr = dlsym("maker");
-
+  return true;
 }
 
@@ -78 +79 @@
 BaseObject* DynamicLoader::fabricateObject(const TiXmlElement* root) const
 {
+  /// FIXME
+  return NULL;
 }
 #endif

trunk/src/lib/util/loading/load_param.cc

@@ -29 +29 @@
  */
 CLoadParam::CLoadParam(const TiXmlElement* root, const std::string& paramName, BaseObject* object, Executor* executor, bool inLoadCycle)
-  :  paramName(paramName), object(object)
+  :  object(object), paramName(paramName)
 {
   this->object = object;

trunk/src/lib/util/loading/load_param_description.cc

@@ -275 +275 @@
 
   return retVal;*/
-}
+  std::list<std::string> a;
+  return a;
+}

trunk/src/lib/util/loading/resource_manager.cc

@@ -557 +557 @@
 bool ResourceManager::unloadAllByPriority(ResourcePriority prio)
 {
+  bool removedAll = true;
   unsigned int removeCount;
   for (unsigned int round = 0; round < 3; round++)
@@ -571 +572 @@
         {
           if (round == 3)
+          {
             PRINTF(2)("unable to unload %s because there are still %d references to it\n",
                       this->resourceList[index]->name.c_str(), this->resourceList[index]->count);
+            removedAll = false;
+          }
           removeCount++;
         }
@@ -580 +584 @@
     if (removeCount == 0) break;
   }
+  return removedAll;
 }
 
@@ -711 +716 @@
   }
   return tmp;*/
+  return "";
 }
 
@@ -733 +739 @@
     return this->cache(splits[1], ResourceManager::stringToResourceType(splits[0]),
                 RP_LEVEL, splits[2], splits[3], splits[4]);*/
+  return false;
 }