Changeset 9294 for code/branches/presentation2012merge/src/orxonox

Timestamp:

Jun 12, 2012, 11:05:15 PM (12 years ago)

Author:

landauf

Message:

removed 2 lines from ~PickupCollection() again because they don't solve the real issue
use destroy() for PickupCollectionIdentifier because it's an OrxonoxClass
calling this→destroy() should be the last thing you do in a function
details in PickupIdentifier

Location:

code/branches/presentation2012merge/src/orxonox/pickup

Files:

• PickupIdentifier.cc (modified) (1 diff)
• PickupIdentifier.h (modified) (1 diff)

code/branches/presentation2012merge/src/orxonox/pickup/PickupIdentifier.cc

@@ -113 +113 @@
         Returns false if the parameter already existed, true if not.
     */
-    bool PickupIdentifier::addParameter(std::string & name, std::string & value)
+    bool PickupIdentifier::addParameter(const std::string& name, const std::string& value)
     {
         orxout(verbose, context::pickups) << "PickupIdentifier " << name << ", " << value << endl;

code/branches/presentation2012merge/src/orxonox/pickup/PickupIdentifier.h

@@ -72 +72 @@
             virtual int compare(const PickupIdentifier* identifier) const; //!< Compares two PickupIdentifiers and returns 0 if a == b, <0 if a < b and >0 if a > b for a.compare(b).
 
-            bool addParameter(std::string & name, std::string & value); //!< Add a parameter to the PickupIdentifier.
+            bool addParameter(const std::string& name, const std::string& value); //!< Add a parameter to the PickupIdentifier.
 
         private: