Changeset 6414

Timestamp:

Dec 25, 2009, 2:07:44 PM (14 years ago)

Author:

dafrick

Message:

Added changes to presentation2 here as well.

Location:

code/branches/pickup2/src

Files:

• libraries/core/DynLib.cc (modified) (1 diff)
• orxonox/sound/SoundManager.cc (modified) (1 diff)

code/branches/pickup2/src/libraries/core/DynLib.cc

@@ -70 +70 @@
         COUT(2) << "Loading module " << mName << std::endl;
 
-        const std::string& name = mName;
+        std::string& name = mName;
 #ifdef ORXONOX_PLATFORM_LINUX
         // dlopen() does not add .so to the filename, like windows does for .dll

code/branches/pickup2/src/orxonox/sound/SoundManager.cc

@@ -608 +608 @@
             }
         }
-        int used = std::max(this->usedSoundSources_.size(), this->minSources_);
+        int used = std::max((unsigned int)(this->usedSoundSources_.size()), this->minSources_);
         // Subtract those we added in the statement above trough std::max
         int available = (int)this->availableSoundSources_.size() - (used - (int)this->usedSoundSources_.size());