Changeset 10771 for code/branches/cpp11_v2/src/libraries/core/input

Timestamp:

Nov 7, 2015, 5:24:58 PM (9 years ago)

Author:

landauf

Message:

using std::shared_ptr instead of boost::shared_ptr (same for weak_ptr)

Location:

code/branches/cpp11_v2/src/libraries/core/input

Files:

• KeyBinder.cc (modified) (1 diff)
• KeyBinder.h (modified) (3 diffs)

code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc

@@ -188 +188 @@
     {
         while (joyStickAxes_.size() < joySticks_.size())
-            joyStickAxes_.push_back(shared_ptr<JoyStickAxisVector>(new JoyStickAxisVector()));
+            joyStickAxes_.push_back(std::shared_ptr<JoyStickAxisVector>(new JoyStickAxisVector()));
         while (joyStickButtons_.size() < joySticks_.size())
-            joyStickButtons_.push_back(shared_ptr<JoyStickButtonVector>(new JoyStickButtonVector()));
+            joyStickButtons_.push_back(std::shared_ptr<JoyStickButtonVector>(new JoyStickButtonVector()));
         // For the case the new size is smaller
         this->joyStickAxes_.resize(joySticks_.size());

code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h

@@ -36 +36 @@
 #include <vector>
 #include <map>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include "InputHandler.h"
@@ -127 +127 @@
         };
         //! Actual key bindings for joy stick buttons
-        std::vector<shared_ptr<JoyStickButtonVector>> joyStickButtons_;
+        std::vector<std::shared_ptr<JoyStickButtonVector>> joyStickButtons_;
         //! Helper class to use something like std:vector<HalfAxis[48]>
         struct JoyStickAxisVector
@@ -135 +135 @@
         };
         //! Actual key bindings for joy stick axes (and sliders)
-        std::vector<shared_ptr<JoyStickAxisVector>> joyStickAxes_;
+        std::vector<std::shared_ptr<JoyStickAxisVector>> joyStickAxes_;
 
         //! Pointer map with all Buttons, including half axes