Changeset 11065 for code/branches/cpp11_v3/src/orxonox/weaponsystem

Timestamp:

Jan 17, 2016, 1:59:00 PM (9 years ago)

Author:

landauf

Message:

added c++11 features to code that was added in presentationHS15

Location:

code/branches/cpp11_v3/src/orxonox/weaponsystem

Files:

• Munition.cc (modified) (1 diff)
• ReplenishingMunition.h (modified) (1 diff)

code/branches/cpp11_v3/src/orxonox/weaponsystem/Munition.cc

@@ -345 +345 @@
             std::map<WeaponMode*, Magazine*>::iterator it;
 
-            // If the pointer to the weapon mode whose magazine got munition added to is NULL, then set the iterator to the beginning of the map
+            // If the pointer to the weapon mode whose magazine got munition added to is nullptr, then set the iterator to the beginning of the map
             // Otherwise set it to the next weapon mode
             if (lastFilledWeaponMode_ == nullptr)

code/branches/cpp11_v3/src/orxonox/weaponsystem/ReplenishingMunition.h

@@ -52 +52 @@
         public:
             ReplenishingMunition(Context* context);
-            virtual ~ReplenishingMunition() {}
+            virtual ~ReplenishingMunition() = default;
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             
             float getProgress();