Changeset 10772

Timestamp:

Nov 7, 2015, 5:38:21 PM (8 years ago)

Author:

landauf

Message:

use std::make_shared for better performance with shared_ptr

Location:

code/branches/cpp11_v2/src/libraries/core

Files:

• Game.cc (modified) (2 diffs)
• Game.h (modified) (1 diff)
• Loader.cc (modified) (1 diff)
• Resource.cc (modified) (1 diff)
• input/KeyBinder.cc (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/core/Game.cc

@@ -123 +123 @@
 
         // The empty root state is ALWAYS loaded!
-        this->rootStateNode_ = std::shared_ptr<GameStateTreeNode>(new GameStateTreeNode());
+        this->rootStateNode_ = std::shared_ptr<GameStateTreeNode>(std::make_shared<GameStateTreeNode>());
         this->rootStateNode_->name_ = "emptyRootGameState";
         this->loadedTopStateNode_ = this->rootStateNode_;
@@ -490 +490 @@
             if (tokens[i] == this->rootStateNode_->name_)
                 ThrowException(GameState, "You shouldn't use 'emptyRootGameState' in the hierarchy...");
-            std::shared_ptr<GameStateTreeNode> node(new GameStateTreeNode());
+            std::shared_ptr<GameStateTreeNode> node(std::make_shared<GameStateTreeNode>());
             node->name_ = tokens[i];
             node->parent_ = currentNode;

code/branches/cpp11_v2/src/libraries/core/Game.h

@@ -136 +136 @@
         public:
             std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info)
-                { return std::shared_ptr<GameState>(new T(info)); }
+                { return std::shared_ptr<GameState>(std::make_shared<T>(info)); }
         };
 

code/branches/cpp11_v2/src/libraries/core/Loader.cc

@@ -73 +73 @@
         std::string xmlInput;
 
-        std::shared_ptr<std::vector<std::vector<std::pair<std::string, size_t>>>> lineTrace(new std::vector<std::vector<std::pair<std::string, size_t>>>());
+        std::shared_ptr<std::vector<std::vector<std::pair<std::string, size_t>>>> lineTrace(std::make_shared<std::vector<std::vector<std::pair<std::string, size_t>>>>());
         lineTrace->reserve(1000); //arbitrary number
 

code/branches/cpp11_v2/src/libraries/core/Resource.cc

@@ -95 +95 @@
             if (it->filename == name)
             {
-                std::shared_ptr<ResourceInfo> ptr(new ResourceInfo());
+                std::shared_ptr<ResourceInfo> ptr(std::make_shared<ResourceInfo>());
                 ptr->filename = name;
                 ptr->path = it->path;

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

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