[Orxonox-commit 6113] r10771 - in code/branches/cpp11_v2/src: . external/cpptcl libraries/core libraries/core/input orxonox/sound
landauf at orxonox.net
landauf at orxonox.net
Sat Nov 7 17:24:59 CET 2015
Author: landauf
Date: 2015-11-07 17:24:58 +0100 (Sat, 07 Nov 2015)
New Revision: 10771
Modified:
code/branches/cpp11_v2/src/OrxonoxConfig.h.in
code/branches/cpp11_v2/src/external/cpptcl/cpptcl.cc
code/branches/cpp11_v2/src/external/cpptcl/cpptcl.h
code/branches/cpp11_v2/src/libraries/core/CorePrecompiledHeaders.h
code/branches/cpp11_v2/src/libraries/core/GUIManager.h
code/branches/cpp11_v2/src/libraries/core/Game.cc
code/branches/cpp11_v2/src/libraries/core/Game.h
code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc
code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h
code/branches/cpp11_v2/src/libraries/core/Loader.cc
code/branches/cpp11_v2/src/libraries/core/LuaState.cc
code/branches/cpp11_v2/src/libraries/core/LuaState.h
code/branches/cpp11_v2/src/libraries/core/Resource.cc
code/branches/cpp11_v2/src/libraries/core/Resource.h
code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc
code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h
code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.cc
code/branches/cpp11_v2/src/orxonox/sound/BaseSound.h
code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.cc
code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.h
code/branches/cpp11_v2/src/orxonox/sound/SoundManager.cc
code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h
Log:
using std::shared_ptr instead of boost::shared_ptr (same for weak_ptr)
Modified: code/branches/cpp11_v2/src/OrxonoxConfig.h.in
===================================================================
--- code/branches/cpp11_v2/src/OrxonoxConfig.h.in 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/OrxonoxConfig.h.in 2015-11-07 16:24:58 UTC (rev 10771)
@@ -215,26 +215,6 @@
typedef basic_string<char, char_traits<char>, allocator<char>> string;
}
-// Import general purpose smart pointers
-namespace boost
-{
- template<class T> class scoped_ptr;
- template<class T> class shared_ptr;
- template<class T> class weak_ptr;
- template<class T> class intrusive_ptr;
- template<class T> class shared_array;
- template<class T> class scoped_array;
-}
-namespace orxonox
-{
- using boost::scoped_ptr;
- using boost::shared_ptr;
- using boost::weak_ptr;
- using boost::intrusive_ptr;
- using boost::shared_array;
- using boost::scoped_array;
-}
-
// Define Boost Filesystem version
#include <boost/version.hpp>
#ifndef BOOST_FILESYSTEM_VERSION
Modified: code/branches/cpp11_v2/src/external/cpptcl/cpptcl.cc
===================================================================
--- code/branches/cpp11_v2/src/external/cpptcl/cpptcl.cc 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/external/cpptcl/cpptcl.cc 2015-11-07 16:24:58 UTC (rev 10771)
@@ -16,10 +16,7 @@
using namespace Tcl;
using namespace Tcl::details;
using namespace std;
-// boost::shared_ptr conflicts with the new std::shared_ptr
-//using namespace boost;
-
result::result(Tcl_Interp *interp) : interp_(interp) {}
result::operator bool() const
@@ -167,7 +164,7 @@
{
// map of polymorphic callbacks
-typedef map<string, boost::shared_ptr<callback_base> > callback_interp_map;
+typedef map<string, std::shared_ptr<callback_base> > callback_interp_map;
typedef map<Tcl_Interp *, callback_interp_map> callback_map;
callback_map callbacks;
@@ -180,7 +177,7 @@
policies_map call_policies;
// map of object handlers
-typedef map<string, boost::shared_ptr<class_handler_base> > class_interp_map;
+typedef map<string, std::shared_ptr<class_handler_base> > class_interp_map;
typedef map<Tcl_Interp *, class_interp_map> class_handlers_map;
class_handlers_map class_handlers;
@@ -491,7 +488,7 @@
}
void class_handler_base::register_method(string const &name,
- boost::shared_ptr<object_cmd_base> ocb, policies const &p)
+ std::shared_ptr<object_cmd_base> ocb, policies const &p)
{
methods_[name] = ocb;
policies_[name] = p;
@@ -990,7 +987,7 @@
}
void interpreter::add_function(string const &name,
- boost::shared_ptr<callback_base> cb, policies const &p)
+ std::shared_ptr<callback_base> cb, policies const &p)
{
Tcl_CreateObjCommand(interp_, name.c_str(),
callback_handler, 0, 0);
@@ -1000,13 +997,13 @@
}
void interpreter::add_class(string const &name,
- boost::shared_ptr<class_handler_base> chb)
+ std::shared_ptr<class_handler_base> chb)
{
class_handlers[interp_][name] = chb;
}
void interpreter::add_constructor(string const &name,
- boost::shared_ptr<class_handler_base> chb, boost::shared_ptr<callback_base> cb,
+ std::shared_ptr<class_handler_base> chb, std::shared_ptr<callback_base> cb,
policies const &p)
{
Tcl_CreateObjCommand(interp_, name.c_str(),
Modified: code/branches/cpp11_v2/src/external/cpptcl/cpptcl.h
===================================================================
--- code/branches/cpp11_v2/src/external/cpptcl/cpptcl.h 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/external/cpptcl/cpptcl.h 2015-11-07 16:24:58 UTC (rev 10771)
@@ -16,7 +16,6 @@
#include <sstream>
#include <map>
#include <vector>
-#include <boost/shared_ptr.hpp>
#include <boost/bind.hpp>
@@ -140,14 +139,14 @@
class_handler_base();
void register_method(std::string const &name,
- boost::shared_ptr<object_cmd_base> ocb, policies const &p);
+ std::shared_ptr<object_cmd_base> ocb, policies const &p);
policies & get_policies(std::string const &name);
protected:
typedef std::map<
std::string,
- boost::shared_ptr<object_cmd_base>
+ std::shared_ptr<object_cmd_base>
> method_map_type;
// a map of methods for the given class
@@ -213,14 +212,14 @@
class class_definer
{
public:
- class_definer(boost::shared_ptr<class_handler<C> > ch) : ch_(ch) {}
+ class_definer(std::shared_ptr<class_handler<C> > ch) : ch_(ch) {}
template <typename R>
class_definer & def(std::string const &name, R (C::*f)(),
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method0<C, R>(f)), p);
return *this;
}
@@ -230,7 +229,7 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method0<C, R>(f)), p);
return *this;
}
@@ -240,7 +239,7 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method1<C, R, T1>(f)), p);
return *this;
}
@@ -250,7 +249,7 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method1<C, R, T1>(f)), p);
return *this;
}
@@ -260,7 +259,7 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method2<C, R, T1, T2>(f)), p);
return *this;
}
@@ -270,7 +269,7 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method2<C, R, T1, T2>(f)), p);
return *this;
}
@@ -280,7 +279,7 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method3<C, R, T1, T2, T3>(f)), p);
return *this;
}
@@ -290,7 +289,7 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method3<C, R, T1, T2, T3>(f)), p);
return *this;
}
@@ -300,7 +299,7 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method4<C, R, T1, T2, T3, T4>(f)), p);
return *this;
}
@@ -311,7 +310,7 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method4<C, R, T1, T2, T3, T4>(f)), p);
return *this;
}
@@ -322,7 +321,7 @@
R (C::*f)(T1, T2, T3, T4, T5), policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method5<C, R, T1, T2, T3, T4, T5>(f)), p);
return *this;
}
@@ -333,7 +332,7 @@
R (C::*f)(T1, T2, T3, T4, T5) const, policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method5<C, R, T1, T2, T3, T4, T5>(f)), p);
return *this;
}
@@ -344,7 +343,7 @@
R (C::*f)(T1, T2, T3, T4, T5, T6), policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method6<C, R, T1, T2, T3, T4, T5, T6>(f)),
p);
return *this;
@@ -357,7 +356,7 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method6<C, R, T1, T2, T3, T4, T5, T6>(f)),
p);
return *this;
@@ -370,7 +369,7 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method7<C, R,
T1, T2, T3, T4, T5, T6, T7>(f)), p);
return *this;
@@ -383,7 +382,7 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method7<C, R,
T1, T2, T3, T4, T5, T6, T7>(f)), p);
return *this;
@@ -396,7 +395,7 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method8<C, R,
T1, T2, T3, T4, T5, T6, T7, T8>(f)), p);
return *this;
@@ -409,7 +408,7 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method8<C, R,
T1, T2, T3, T4, T5, T6, T7, T8>(f)), p);
return *this;
@@ -422,7 +421,7 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method9<C, R,
T1, T2, T3, T4, T5, T6, T7, T8, T9>(f)), p);
return *this;
@@ -435,14 +434,14 @@
policies const &p = policies())
{
ch_->register_method(name,
- boost::shared_ptr<details::object_cmd_base>(
+ std::shared_ptr<details::object_cmd_base>(
new details::method9<C, R,
T1, T2, T3, T4, T5, T6, T7, T8, T9>(f)), p);
return *this;
}
private:
- boost::shared_ptr<class_handler<C> > ch_;
+ std::shared_ptr<class_handler<C> > ch_;
};
} // namespace details
@@ -481,7 +480,7 @@
policies const &p = policies())
{
add_function(name,
- boost::shared_ptr<details::callback_base>(
+ std::shared_ptr<details::callback_base>(
new details::callback0<R>(f)), p);
}
@@ -490,7 +489,7 @@
policies const &p = policies())
{
add_function(name,
- boost::shared_ptr<details::callback_base>(
+ std::shared_ptr<details::callback_base>(
new details::callback1<R, T1>(f)), p);
}
@@ -499,7 +498,7 @@
policies const &p = policies())
{
add_function(name,
- boost::shared_ptr<details::callback_base>(
+ std::shared_ptr<details::callback_base>(
new details::callback2<R, T1, T2>(f)), p);
}
@@ -508,7 +507,7 @@
policies const &p = policies())
{
add_function(name,
- boost::shared_ptr<details::callback_base>(
+ std::shared_ptr<details::callback_base>(
new details::callback3<R, T1, T2, T3>(f)), p);
}
@@ -517,7 +516,7 @@
policies const &p = policies())
{
add_function(name,
- boost::shared_ptr<details::callback_base>(
+ std::shared_ptr<details::callback_base>(
new details::callback4<R, T1, T2, T3, T4>(f)), p);
}
@@ -527,7 +526,7 @@
policies const &p = policies())
{
add_function(name,
- boost::shared_ptr<details::callback_base>(
+ std::shared_ptr<details::callback_base>(
new details::callback5<R, T1, T2, T3, T4, T5>(f)), p);
}
@@ -537,7 +536,7 @@
policies const &p = policies())
{
add_function(name,
- boost::shared_ptr<details::callback_base>(
+ std::shared_ptr<details::callback_base>(
new details::callback6<R, T1, T2, T3, T4, T5, T6>(f)), p);
}
@@ -547,7 +546,7 @@
policies const &p = policies())
{
add_function(name,
- boost::shared_ptr<details::callback_base>(
+ std::shared_ptr<details::callback_base>(
new details::callback7<R,
T1, T2, T3, T4, T5, T6, T7>(f)), p);
}
@@ -558,7 +557,7 @@
policies const &p = policies())
{
add_function(name,
- boost::shared_ptr<details::callback_base>(
+ std::shared_ptr<details::callback_base>(
new details::callback8<R,
T1, T2, T3, T4, T5, T6, T7, T8>(f)), p);
}
@@ -571,7 +570,7 @@
policies const &p = policies())
{
add_function(name,
- boost::shared_ptr<details::callback_base>(
+ std::shared_ptr<details::callback_base>(
new details::callback9<R,
T1, T2, T3, T4, T5, T6, T7, T8, T9>(f)), p);
}
@@ -582,13 +581,13 @@
template <class C>
details::class_definer<C> class_(std::string const &name)
{
- boost::shared_ptr<details::class_handler<C> > ch(
+ std::shared_ptr<details::class_handler<C> > ch(
new details::class_handler<C>());
add_class(name, ch);
add_constructor(name, ch,
- boost::shared_ptr<details::callback_base>(
+ std::shared_ptr<details::callback_base>(
new details::callback0<C*>(&details::construct<
C, void, void, void, void, void, void, void,
void, void>::doit)));
@@ -607,13 +606,13 @@
C, T1, T2, T3, T4, T5, T6, T7, T8, T9>::type
callback_type;
- boost::shared_ptr<details::class_handler<C> > ch(
+ std::shared_ptr<details::class_handler<C> > ch(
new details::class_handler<C>());
add_class(name, ch);
add_constructor(name, ch,
- boost::shared_ptr<details::callback_base>(
+ std::shared_ptr<details::callback_base>(
new callback_type(&details::construct<
C, T1, T2, T3, T4, T5, T6, T7, T8, T9>::doit)), p);
@@ -624,7 +623,7 @@
details::class_definer<C> class_(
std::string const &name, details::no_init_type const &)
{
- boost::shared_ptr<details::class_handler<C> > ch(
+ std::shared_ptr<details::class_handler<C> > ch(
new details::class_handler<C>());
add_class(name, ch);
@@ -659,15 +658,15 @@
void operator=(const interpreter &);
void add_function(std::string const &name,
- boost::shared_ptr<details::callback_base> cb,
+ std::shared_ptr<details::callback_base> cb,
policies const &p = policies());
void add_class(std::string const &name,
- boost::shared_ptr<details::class_handler_base> chb);
+ std::shared_ptr<details::class_handler_base> chb);
void add_constructor(std::string const &name,
- boost::shared_ptr<details::class_handler_base> chb,
- boost::shared_ptr<details::callback_base> cb,
+ std::shared_ptr<details::class_handler_base> chb,
+ std::shared_ptr<details::callback_base> cb,
policies const &p = policies());
Tcl_Interp *interp_;
Modified: code/branches/cpp11_v2/src/libraries/core/CorePrecompiledHeaders.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/CorePrecompiledHeaders.h 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/libraries/core/CorePrecompiledHeaders.h 2015-11-07 16:24:58 UTC (rev 10771)
@@ -49,6 +49,7 @@
#include <map> // 53
#include <sstream> // 53
#include <set> // 50
+#include <memory>
#include "util/Output.h" // 48
@@ -65,7 +66,6 @@
#include <OgreQuaternion.h> // 36
#include <OgreColourValue.h> // 36
#include <boost/preprocessor/cat.hpp> // 27
-#include <boost/shared_ptr.hpp> // 21
#ifdef ORXONOX_COMPILER_MSVC
@@ -75,7 +75,6 @@
#include "util/SubString.h" // 14
-#include <boost/scoped_ptr.hpp> // 13
#include <stack> // 12
#endif /*ORXONOX_COMPILER_MSVC */
Modified: code/branches/cpp11_v2/src/libraries/core/GUIManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GUIManager.h 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/libraries/core/GUIManager.h 2015-11-07 16:24:58 UTC (rev 10771)
@@ -39,6 +39,7 @@
#include <map>
#include <string>
+#include <memory>
#if CEGUI_VERSION >= 0x000800
# include <CEGUI/ForwardRefs.h>
@@ -48,8 +49,6 @@
# include <CEGUIVersion.h>
#endif
-#include <boost/shared_ptr.hpp>
-
#include "util/DestructionHelper.h"
#include "util/OgreForwardRefs.h"
#include "util/tribool.h"
@@ -195,7 +194,7 @@
LuaState* luaState_; //!< LuaState, access point to the Lua engine
CEGUI::LuaScriptModule* scriptModule_; //!< CEGUI's script module to use Lua
CEGUI::System* guiSystem_; //!< CEGUI's main system
- shared_ptr<ResourceInfo> rootFileInfo_; //!< Resource information about the root script
+ std::shared_ptr<ResourceInfo> rootFileInfo_; //!< Resource information about the root script
CEGUI::Logger* ceguiLogger_; //!< CEGUI's logger to be able to log CEGUI errors in our log
int outputLevelCeguiLog_; //!< CEGUI's log level
CEGUI::Window* rootWindow_; //!< Root node for all windows
Modified: code/branches/cpp11_v2/src/libraries/core/Game.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Game.cc 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/libraries/core/Game.cc 2015-11-07 16:24:58 UTC (rev 10771)
@@ -35,7 +35,6 @@
#include "Game.h"
#include <exception>
-#include <boost/weak_ptr.hpp>
#include <loki/ScopeGuard.h>
#include "util/Clock.h"
@@ -71,8 +70,8 @@
struct GameStateTreeNode
{
std::string name_;
- weak_ptr<GameStateTreeNode> parent_;
- std::vector<shared_ptr<GameStateTreeNode>> children_;
+ std::weak_ptr<GameStateTreeNode> parent_;
+ std::vector<std::shared_ptr<GameStateTreeNode>> children_;
};
Game::Game(const std::string& cmdLine)
@@ -123,7 +122,7 @@
}
// The empty root state is ALWAYS loaded!
- this->rootStateNode_ = shared_ptr<GameStateTreeNode>(new GameStateTreeNode());
+ this->rootStateNode_ = std::shared_ptr<GameStateTreeNode>(new GameStateTreeNode());
this->rootStateNode_->name_ = "emptyRootGameState";
this->loadedTopStateNode_ = this->rootStateNode_;
this->loadedStates_.push_back(this->getState(rootStateNode_->name_));
@@ -136,7 +135,7 @@
orxout(internal_status) << "destroying Game object..." << endl;
assert(loadedStates_.size() <= 1); // Just empty root GameState
- // Destroy all GameStates (shared_ptrs take care of actual destruction)
+ // Destroy all GameStates (std::shared_ptrs take care of actual destruction)
constructedStates_.clear();
GameStateFactory::getFactories().clear();
@@ -234,7 +233,7 @@
{
while (this->requestedStateNodes_.size() > 0)
{
- shared_ptr<GameStateTreeNode> requestedStateNode = this->requestedStateNodes_.front();
+ std::shared_ptr<GameStateTreeNode> requestedStateNode = this->requestedStateNodes_.front();
assert(this->loadedTopStateNode_);
if (!this->loadedTopStateNode_->parent_.expired() && requestedStateNode == this->loadedTopStateNode_->parent_.lock())
this->unloadState(loadedTopStateNode_->name_);
@@ -280,7 +279,7 @@
orxout(user_error) << "An exception occurred while updating '" << (*it)->getName() << "': " << Exception::handleMessage() << endl;
orxout(user_error) << "This should really never happen!" << endl;
orxout(user_error) << "Unloading all GameStates depending on the one that crashed." << endl;
- shared_ptr<GameStateTreeNode> current = this->loadedTopStateNode_;
+ std::shared_ptr<GameStateTreeNode> current = this->loadedTopStateNode_;
while (current->name_ != (*it)->getName() && current)
current = current->parent_.lock();
if (current && current->parent_.lock())
@@ -371,7 +370,7 @@
return;
}
- shared_ptr<GameStateTreeNode> lastRequestedNode;
+ std::shared_ptr<GameStateTreeNode> lastRequestedNode;
if (this->requestedStateNodes_.empty())
lastRequestedNode = this->loadedTopStateNode_;
else
@@ -383,7 +382,7 @@
}
// Check children first
- std::vector<shared_ptr<GameStateTreeNode>> requestedNodes;
+ std::vector<std::shared_ptr<GameStateTreeNode>> requestedNodes;
for (unsigned int i = 0; i < lastRequestedNode->children_.size(); ++i)
{
if (lastRequestedNode->children_[i]->name_ == name)
@@ -396,7 +395,7 @@
if (requestedNodes.empty())
{
// Check parent and all its grand parents
- shared_ptr<GameStateTreeNode> currentNode = lastRequestedNode;
+ std::shared_ptr<GameStateTreeNode> currentNode = lastRequestedNode;
while (currentNode != nullptr)
{
if (currentNode->name_ == name)
@@ -423,7 +422,7 @@
void Game::popState()
{
- shared_ptr<GameStateTreeNode> lastRequestedNode;
+ std::shared_ptr<GameStateTreeNode> lastRequestedNode;
if (this->requestedStateNodes_.empty())
lastRequestedNode = this->loadedTopStateNode_;
else
@@ -434,7 +433,7 @@
orxout(internal_warning) << "Can't pop the internal dummy root GameState" << endl;
}
- shared_ptr<GameState> Game::getState(const std::string& name)
+ std::shared_ptr<GameState> Game::getState(const std::string& name)
{
GameStateMap::const_iterator it = constructedStates_.find(name);
if (it != constructedStates_.end())
@@ -446,7 +445,7 @@
orxout(internal_error) << "GameState '" << name << "' has not yet been loaded." << endl;
else
orxout(internal_error) << "Could not find GameState '" << name << "'." << endl;
- return shared_ptr<GameState>();
+ return std::shared_ptr<GameState>();
}
}
@@ -478,7 +477,7 @@
/*** Internal ***/
- void Game::parseStates(std::vector<std::pair<std::string, int>>::const_iterator& it, shared_ptr<GameStateTreeNode> currentNode)
+ void Game::parseStates(std::vector<std::pair<std::string, int>>::const_iterator& it, std::shared_ptr<GameStateTreeNode> currentNode)
{
SubString tokens(it->first, ",");
std::vector<std::pair<std::string, int>>::const_iterator startIt = it;
@@ -490,7 +489,7 @@
ThrowException(GameState, "GameState with name '" << tokens[i] << "' not found!");
if (tokens[i] == this->rootStateNode_->name_)
ThrowException(GameState, "You shouldn't use 'emptyRootGameState' in the hierarchy...");
- shared_ptr<GameStateTreeNode> node(new GameStateTreeNode());
+ std::shared_ptr<GameStateTreeNode> node(new GameStateTreeNode());
node->name_ = tokens[i];
node->parent_ = currentNode;
currentNode->children_.push_back(node);
@@ -526,7 +525,7 @@
if (it->second.bGraphicsMode)
{
// Game state loading failure is serious --> don't catch
- shared_ptr<GameState> gameState = GameStateFactory::fabricate(it->second);
+ std::shared_ptr<GameState> gameState = GameStateFactory::fabricate(it->second);
if (!constructedStates_.insert(std::make_pair(
it->second.stateName, gameState)).second)
assert(false); // GameState was already created!
@@ -581,7 +580,7 @@
else
graphicsUnloader.Dismiss();
- shared_ptr<GameState> state = this->getState(name);
+ std::shared_ptr<GameState> state = this->getState(name);
state->activateInternal();
if (!this->loadedStates_.empty())
this->loadedStates_.back()->activity_.topState = false;
@@ -598,7 +597,7 @@
this->bChangingState_ = true;
try
{
- shared_ptr<GameState> state = this->getState(name);
+ std::shared_ptr<GameState> state = this->getState(name);
state->activity_.topState = false;
this->loadedStates_.pop_back();
if (!this->loadedStates_.empty())
@@ -619,15 +618,15 @@
this->bChangingState_ = false;
}
- /*static*/ std::map<std::string, shared_ptr<Game::GameStateFactory>>& Game::GameStateFactory::getFactories()
+ /*static*/ std::map<std::string, std::shared_ptr<Game::GameStateFactory>>& Game::GameStateFactory::getFactories()
{
- static std::map<std::string, shared_ptr<GameStateFactory>> factories;
+ static std::map<std::string, std::shared_ptr<GameStateFactory>> factories;
return factories;
}
- /*static*/ shared_ptr<GameState> Game::GameStateFactory::fabricate(const GameStateInfo& info)
+ /*static*/ std::shared_ptr<GameState> Game::GameStateFactory::fabricate(const GameStateInfo& info)
{
- std::map<std::string, shared_ptr<Game::GameStateFactory>>::const_iterator it = getFactories().find(info.className);
+ std::map<std::string, std::shared_ptr<Game::GameStateFactory>>::const_iterator it = getFactories().find(info.className);
assert(it != getFactories().end());
return it->second->fabricateInternal(info);
}
Modified: code/branches/cpp11_v2/src/libraries/core/Game.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Game.h 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/libraries/core/Game.h 2015-11-07 16:24:58 UTC (rev 10771)
@@ -43,7 +43,7 @@
#include <map>
#include <string>
#include <vector>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <boost/preprocessor/cat.hpp>
#include "util/Output.h"
@@ -83,9 +83,9 @@
: public Singleton<Game>
{ // tolua_export
friend class Singleton<Game>;
- typedef std::vector<shared_ptr<GameState>> GameStateVector;
- typedef std::map<std::string, shared_ptr<GameState>> GameStateMap;
- typedef shared_ptr<GameStateTreeNode> GameStateTreeNodePtr;
+ typedef std::vector<std::shared_ptr<GameState>> GameStateVector;
+ typedef std::map<std::string, std::shared_ptr<GameState>> GameStateMap;
+ typedef std::shared_ptr<GameStateTreeNode> GameStateTreeNodePtr;
public:
Game(const std::string& cmdLine);
@@ -96,7 +96,7 @@
void destroy();
void setStateHierarchy(const std::string& str);
- shared_ptr<GameState> getState(const std::string& name);
+ std::shared_ptr<GameState> getState(const std::string& name);
void run();
void stop();
@@ -122,20 +122,20 @@
{
public:
virtual ~GameStateFactory() { }
- static shared_ptr<GameState> fabricate(const GameStateInfo& info);
+ static std::shared_ptr<GameState> fabricate(const GameStateInfo& info);
template <class T>
static void createFactory(const std::string& className)
{ getFactories()[className].reset(new TemplateGameStateFactory<T>()); }
- virtual shared_ptr<GameState> fabricateInternal(const GameStateInfo& info) = 0;
- static std::map<std::string, shared_ptr<GameStateFactory>>& getFactories();
+ virtual std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info) = 0;
+ static std::map<std::string, std::shared_ptr<GameStateFactory>>& getFactories();
};
template <class T>
class TemplateGameStateFactory : public GameStateFactory
{
public:
- shared_ptr<GameState> fabricateInternal(const GameStateInfo& info)
- { return shared_ptr<GameState>(new T(info)); }
+ std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info)
+ { return std::shared_ptr<GameState>(new T(info)); }
};
struct StatisticsTickInfo
@@ -149,7 +149,7 @@
void loadGraphics();
void unloadGraphics(bool loadGraphicsManagerWithoutRenderer = true);
- void parseStates(std::vector<std::pair<std::string, int>>::const_iterator& it, shared_ptr<GameStateTreeNode> currentNode);
+ void parseStates(std::vector<std::pair<std::string, int>>::const_iterator& it, std::shared_ptr<GameStateTreeNode> currentNode);
bool checkState(const std::string& name) const;
void loadState(const std::string& name);
void unloadState(const std::string& name);
Modified: code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc 2015-11-07 16:24:58 UTC (rev 10771)
@@ -33,7 +33,6 @@
#include <fstream>
#include <sstream>
#include <boost/filesystem.hpp>
-#include <boost/shared_array.hpp>
#include <OgreFrameListener.h>
#include <OgreRoot.h>
Modified: code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h 2015-11-07 16:24:58 UTC (rev 10771)
@@ -46,8 +46,9 @@
#include <cassert>
#include <string>
+#include <memory>
+
#include <OgreLog.h>
-#include <boost/shared_ptr.hpp>
#include "util/DestructionHelper.h"
#include "util/Singleton.h"
@@ -129,9 +130,9 @@
float lastFrameEndTime_; //!< Time stamp of the end of the last frame
// XML files for the resources and the debug overlay
- shared_ptr<XMLFile> resources_; //!< XML with resource locations
- shared_ptr<XMLFile> extResources_; //!< XML with resource locations in the external path (only for dev runs)
- shared_ptr<XMLFile> debugOverlay_; //!< XML with various debug overlays
+ std::shared_ptr<XMLFile> resources_; //!< XML with resource locations
+ std::shared_ptr<XMLFile> extResources_; //!< XML with resource locations in the external path (only for dev runs)
+ std::shared_ptr<XMLFile> debugOverlay_; //!< XML with various debug overlays
// config values
std::string ogreConfigFile_; //!< ogre config filename
Modified: code/branches/cpp11_v2/src/libraries/core/Loader.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Loader.cc 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/libraries/core/Loader.cc 2015-11-07 16:24:58 UTC (rev 10771)
@@ -72,14 +72,14 @@
std::string xmlInput;
- 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(new std::vector<std::vector<std::pair<std::string, size_t>>>());
lineTrace->reserve(1000); //arbitrary number
if (file->getLuaSupport() && !bRemoveLuaTags)
{
// Use the LuaState to replace the XML tags (calls our function)
- scoped_ptr<LuaState> luaState(new LuaState());
+ boost::scoped_ptr<LuaState> luaState(new LuaState());
luaState->setTraceMap(lineTrace);
luaState->setIncludeParser(&Loader::replaceLuaTags);
luaState->includeFile(file->getFilename());
@@ -87,7 +87,7 @@
}
else
{
- shared_ptr<ResourceInfo> info = Resource::getInfo(file->getFilename());
+ std::shared_ptr<ResourceInfo> info = Resource::getInfo(file->getFilename());
if (info == nullptr)
{
orxout(user_error, context::loader) << "Could not find XML file '" << file->getFilename() << "'." << endl;
Modified: code/branches/cpp11_v2/src/libraries/core/LuaState.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/LuaState.cc 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/libraries/core/LuaState.cc 2015-11-07 16:24:58 UTC (rev 10771)
@@ -78,10 +78,10 @@
lua_close(luaState_);
}
- shared_ptr<ResourceInfo> LuaState::getFileInfo(const std::string& filename)
+ std::shared_ptr<ResourceInfo> LuaState::getFileInfo(const std::string& filename)
{
// Look in the current directory first
- shared_ptr<ResourceInfo> sourceInfo = Resource::getInfo(sourceFileInfo_->path + filename);
+ std::shared_ptr<ResourceInfo> sourceInfo = Resource::getInfo(sourceFileInfo_->path + filename);
// Continue search in root directories
if (sourceInfo == nullptr && !sourceFileInfo_->path.empty())
sourceInfo = Resource::getInfo(filename);
@@ -90,7 +90,7 @@
bool LuaState::includeFile(const std::string& filename)
{
- shared_ptr<ResourceInfo> sourceInfo = this->getFileInfo(filename);
+ std::shared_ptr<ResourceInfo> sourceInfo = this->getFileInfo(filename);
if (sourceInfo != nullptr)
return this->includeString(Resource::open(sourceInfo)->getAsString(), sourceInfo);
else
@@ -100,7 +100,7 @@
}
}
- bool LuaState::includeString(const std::string& code, const shared_ptr<ResourceInfo>& sourceFileInfo)
+ bool LuaState::includeString(const std::string& code, const std::shared_ptr<ResourceInfo>& sourceFileInfo)
{
// Parse string with provided include parser (otherwise don't preparse at all)
std::string luaInput;
@@ -130,7 +130,7 @@
bool LuaState::doFile(const std::string& filename)
{
- shared_ptr<ResourceInfo> sourceInfo = this->getFileInfo(filename);
+ std::shared_ptr<ResourceInfo> sourceInfo = this->getFileInfo(filename);
if (sourceInfo != nullptr)
return this->doString(Resource::open(sourceInfo)->getAsString(), sourceInfo);
else
@@ -140,10 +140,10 @@
}
}
- bool LuaState::doString(const std::string& code, const shared_ptr<ResourceInfo>& sourceFileInfo)
+ bool LuaState::doString(const std::string& code, const std::shared_ptr<ResourceInfo>& sourceFileInfo)
{
// Save the old source file info
- shared_ptr<ResourceInfo> oldSourceFileInfo = sourceFileInfo_;
+ std::shared_ptr<ResourceInfo> oldSourceFileInfo = sourceFileInfo_;
// Only override if sourceFileInfo provides useful information
if (sourceFileInfo != nullptr)
sourceFileInfo_ = sourceFileInfo;
@@ -284,7 +284,7 @@
bool LuaState::fileExists(const std::string& filename)
{
- shared_ptr<ResourceInfo> info = this->getFileInfo(filename);
+ std::shared_ptr<ResourceInfo> info = this->getFileInfo(filename);
if (info == nullptr)
return false;
else
@@ -299,7 +299,7 @@
std::map<std::string, std::string>::const_iterator it = this->sourceCodeMap_.find(filename);
if (it != this->sourceCodeMap_.end())
return it->second;
- shared_ptr<ResourceInfo> info = Resource::getInfo(filename);
+ std::shared_ptr<ResourceInfo> info = Resource::getInfo(filename);
if (info == nullptr)
return "";
else
Modified: code/branches/cpp11_v2/src/libraries/core/LuaState.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/LuaState.h 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/libraries/core/LuaState.h 2015-11-07 16:24:58 UTC (rev 10771)
@@ -46,7 +46,7 @@
#include <sstream>
#include <string>
#include <vector>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "util/Output.h"
@@ -78,10 +78,10 @@
~LuaState();
bool doFile(const std::string& filename); // tolua_export
- bool doString(const std::string& code, const shared_ptr<ResourceInfo>& sourceFileInfo = shared_ptr<ResourceInfo>());
+ bool doString(const std::string& code, const std::shared_ptr<ResourceInfo>& sourceFileInfo = std::shared_ptr<ResourceInfo>());
bool includeFile(const std::string& filename); // tolua_export
- bool includeString(const std::string& code, const shared_ptr<ResourceInfo>& sourceFileInfo = shared_ptr<ResourceInfo>());
+ bool includeString(const std::string& code, const std::shared_ptr<ResourceInfo>& sourceFileInfo = std::shared_ptr<ResourceInfo>());
void luaPrint(const std::string& str); // tolua_export
void luaOutput(orxonox::level::OutputLevel level, const std::string& context, const std::string& message); // tolua_export
@@ -93,14 +93,14 @@
const std::stringstream& getOutput() const { return output_; }
void clearOutput() { output_.clear(); } // tolua_export
- void setTraceMap(shared_ptr<std::vector<std::vector<std::pair<std::string, size_t>>>> map)
+ void setTraceMap(std::shared_ptr<std::vector<std::vector<std::pair<std::string, size_t>>>> map)
{ map->push_back(std::vector<std::pair<std::string, size_t>>()); lineTrace_ = map; }
void setIncludeParser(std::string (*function)(const std::string&)) { includeParseFunction_ = function; }
lua_State* getInternalLuaState() { return luaState_; }
- void setDefaultResourceInfo(const shared_ptr<ResourceInfo>& sourceFileInfo) { this->sourceFileInfo_ = sourceFileInfo; }
- const shared_ptr<ResourceInfo>& getDefaultResourceInfo() { return this->sourceFileInfo_; }
+ void setDefaultResourceInfo(const std::shared_ptr<ResourceInfo>& sourceFileInfo) { this->sourceFileInfo_ = sourceFileInfo; }
+ const std::shared_ptr<ResourceInfo>& getDefaultResourceInfo() { return this->sourceFileInfo_; }
LuaFunctor* createLuaFunctor(const std::string& code) { return new LuaFunctor(code, this); } // tolua_export
//! Tells about whether IOConsole was activated. The Lua debugger only works with a normal console.
@@ -114,13 +114,13 @@
static const std::string ERROR_HANDLER_NAME;
private:
- shared_ptr<ResourceInfo> getFileInfo(const std::string& filename);
- shared_ptr<std::vector<std::vector<std::pair<std::string, size_t>>>> lineTrace_;
+ std::shared_ptr<ResourceInfo> getFileInfo(const std::string& filename);
+ std::shared_ptr<std::vector<std::vector<std::pair<std::string, size_t>>>> lineTrace_;
std::stringstream output_;
lua_State* luaState_;
bool bIsRunning_;
- shared_ptr<ResourceInfo> sourceFileInfo_;
+ std::shared_ptr<ResourceInfo> sourceFileInfo_;
std::map<std::string, std::string> sourceCodeMap_;
std::string (*includeParseFunction_)(const std::string&);
Modified: code/branches/cpp11_v2/src/libraries/core/Resource.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Resource.cc 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/libraries/core/Resource.cc 2015-11-07 16:24:58 UTC (rev 10771)
@@ -78,7 +78,7 @@
}
}
- shared_ptr<ResourceInfo> Resource::getInfo(const std::string& name)
+ std::shared_ptr<ResourceInfo> Resource::getInfo(const std::string& name)
{
std::string group;
try
@@ -87,14 +87,14 @@
}
catch (const Ogre::Exception&)
{
- return shared_ptr<ResourceInfo>();
+ return std::shared_ptr<ResourceInfo>();
}
Ogre::FileInfoListPtr infos = Ogre::ResourceGroupManager::getSingleton().findResourceFileInfo(group, name);
for (Ogre::FileInfoList::const_iterator it = infos->begin(); it != infos->end(); ++it)
{
if (it->filename == name)
{
- shared_ptr<ResourceInfo> ptr(new ResourceInfo());
+ std::shared_ptr<ResourceInfo> ptr(new ResourceInfo());
ptr->filename = name;
ptr->path = it->path;
ptr->basename = it->basename;
@@ -113,7 +113,7 @@
return ptr;
}
}
- return shared_ptr<ResourceInfo>();
+ return std::shared_ptr<ResourceInfo>();
}
StringVectorPtr Resource::findResourceNames(const std::string& pattern)
Modified: code/branches/cpp11_v2/src/libraries/core/Resource.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Resource.h 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/libraries/core/Resource.h 2015-11-07 16:24:58 UTC (rev 10771)
@@ -41,7 +41,8 @@
#include "CorePrereqs.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
#include <OgreDataStream.h>
#include <OgreStringVector.h>
@@ -92,7 +93,7 @@
static DataStreamPtr open(const std::string& name);
//! Similar to open(string, string, bool), but with a fileInfo struct
- static DataStreamPtr open(shared_ptr<ResourceInfo> fileInfo)
+ static DataStreamPtr open(std::shared_ptr<ResourceInfo> fileInfo)
{
return open(fileInfo->filename);
}
@@ -124,7 +125,7 @@
@param name
Fully qualified name of the file to test for
*/
- static shared_ptr<ResourceInfo> getInfo(const std::string& name);
+ static std::shared_ptr<ResourceInfo> getInfo(const std::string& name);
/**
Retrieves a list with all resources matching a certain pattern.
Modified: code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc 2015-11-07 16:24:58 UTC (rev 10771)
@@ -187,9 +187,9 @@
void KeyBinder::initialiseJoyStickBindings()
{
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());
this->joyStickButtons_.resize(joySticks_.size());
Modified: code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h 2015-11-07 16:24:58 UTC (rev 10771)
@@ -35,7 +35,7 @@
#include <string>
#include <vector>
#include <map>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "InputHandler.h"
#include "Button.h"
@@ -126,7 +126,7 @@
Button buttons[JoyStickButtonCode::numberOfButtons];
};
//! 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
{
@@ -134,7 +134,7 @@
HalfAxis halfAxes[JoyStickAxisCode::numberOfAxes * 2];
};
//! 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
std::map<std::string, Button*> allButtons_;
Modified: code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.cc 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.cc 2015-11-07 16:24:58 UTC (rev 10771)
@@ -91,7 +91,7 @@
if (GameMode::playsSound())
{
const std::string& path = "ambient/" + mood + '/' + this->ambientSource_;
- shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(path);
+ std::shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(path);
if (fileInfo != nullptr)
{
orxout(user_info) << "Loading ambient sound " << path << "..." << endl; // TODO: make this output internal if we implement sound streaming
Modified: code/branches/cpp11_v2/src/orxonox/sound/BaseSound.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/BaseSound.h 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/orxonox/sound/BaseSound.h 2015-11-07 16:24:58 UTC (rev 10771)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include <string>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <OgreDataStream.h>
#include "core/object/Listable.h"
@@ -106,7 +106,7 @@
ALuint audioSource_;
bool bPooling_;
- shared_ptr<SoundBuffer> soundBuffer_;
+ std::shared_ptr<SoundBuffer> soundBuffer_;
std::string source_;
float volume_;
bool bLooping_;
Modified: code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.cc 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.cc 2015-11-07 16:24:58 UTC (rev 10771)
@@ -38,7 +38,7 @@
namespace orxonox
{
- SoundBuffer::SoundBuffer(const std::string& filename, std::list<shared_ptr<SoundBuffer>>::iterator poolIterator)
+ SoundBuffer::SoundBuffer(const std::string& filename, std::list<std::shared_ptr<SoundBuffer>>::iterator poolIterator)
: filename_(filename)
, audioBuffer_(AL_NONE)
, poolIterator_(poolIterator)
@@ -47,7 +47,7 @@
ThrowException(General, "SoundBuffer construction: fileInfo was nullptr");
// Get resource info
- shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(filename);
+ std::shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(filename);
if (fileInfo == nullptr)
{
orxout(internal_error, context::sound) << "Sound file '" << filename << "' not found" << endl;
@@ -82,7 +82,7 @@
return alGetError() ? 0 : size;
}
- void SoundBuffer::loadStandard(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream)
+ void SoundBuffer::loadStandard(const std::shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream)
{
// Read everything into a temporary buffer
char* buffer = new char[fileInfo->size];
@@ -126,7 +126,7 @@
return static_cast<long>(static_cast<Ogre::DataStream*>(datasource)->tell());
}
- void SoundBuffer::loadOgg(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream)
+ void SoundBuffer::loadOgg(const std::shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream)
{
char inbuffer[256*1024];
std::vector<char> outbuffer;
Modified: code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.h 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.h 2015-11-07 16:24:58 UTC (rev 10771)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include <list>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "core/Resource.h"
namespace orxonox
@@ -44,16 +44,9 @@
class _OrxonoxExport SoundBuffer
{
friend class SoundManager;
-#if !defined(_MSC_VER) || _MSC_VER >= 1500
- // Make sure nobody deletes an instance (using strong pointers)
- template <class T>
- friend void boost::checked_delete(T*);
-#endif
public:
-#if defined(_MSC_VER) && _MSC_VER < 1500
~SoundBuffer();
-#endif
inline ALuint getBuffer()
{ return this->audioBuffer_; }
@@ -63,16 +56,13 @@
{ return this->filename_; }
private:
- SoundBuffer(const std::string& filename, std::list<shared_ptr<SoundBuffer>>::iterator poolIterator);
-#if !defined(_MSC_VER) || _MSC_VER >= 1500
- ~SoundBuffer();
-#endif
- void loadStandard(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream);
- void loadOgg(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream);
+ SoundBuffer(const std::string& filename, std::list<std::shared_ptr<SoundBuffer>>::iterator poolIterator);
+ void loadStandard(const std::shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream);
+ void loadOgg(const std::shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream);
std::string filename_;
ALuint audioBuffer_;
- std::list<shared_ptr<SoundBuffer>>::iterator poolIterator_;
+ std::list<std::shared_ptr<SoundBuffer>>::iterator poolIterator_;
};
}
Modified: code/branches/cpp11_v2/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/SoundManager.cc 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/orxonox/sound/SoundManager.cc 2015-11-07 16:24:58 UTC (rev 10771)
@@ -504,9 +504,9 @@
}
}
- shared_ptr<SoundBuffer> SoundManager::getSoundBuffer(const std::string& filename)
+ std::shared_ptr<SoundBuffer> SoundManager::getSoundBuffer(const std::string& filename)
{
- shared_ptr<SoundBuffer> buffer;
+ std::shared_ptr<SoundBuffer> buffer;
// Check active or pooled buffers
SoundBufferMap::const_iterator it = this->soundBuffers_.find(filename);
if (it != this->soundBuffers_.end())
@@ -537,7 +537,7 @@
return buffer;
}
- void SoundManager::releaseSoundBuffer(const shared_ptr<SoundBuffer>& buffer, bool bPoolBuffer)
+ void SoundManager::releaseSoundBuffer(const std::shared_ptr<SoundBuffer>& buffer, bool bPoolBuffer)
{
// Check if others are still using the buffer
if (buffer.use_count() != 2)
@@ -550,7 +550,7 @@
// Pool already too large?
while (this->effectsPoolSize_ + it->second->getSize() > this->maxEffectsPoolSize_s && !this->effectsPool_.empty())
{
- shared_ptr<SoundBuffer> bufferDel = this->effectsPool_.back();
+ std::shared_ptr<SoundBuffer> bufferDel = this->effectsPool_.back();
this->effectsPoolSize_ -= bufferDel->getSize();
bufferDel->poolIterator_ = this->effectsPool_.end();
this->effectsPool_.pop_back();
Modified: code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h 2015-11-07 13:42:14 UTC (rev 10770)
+++ code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h 2015-11-07 16:24:58 UTC (rev 10771)
@@ -35,7 +35,7 @@
#include <list>
#include <map>
#include <string>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "util/Singleton.h"
#include "core/config/Configurable.h"
@@ -95,8 +95,8 @@
bool getMute(SoundType::Value type);
// tolua_end
- shared_ptr<SoundBuffer> getSoundBuffer(const std::string& filename);
- void releaseSoundBuffer(const shared_ptr<SoundBuffer>& buffer, bool bPoolBuffer);
+ std::shared_ptr<SoundBuffer> getSoundBuffer(const std::string& filename);
+ void releaseSoundBuffer(const std::shared_ptr<SoundBuffer>& buffer, bool bPoolBuffer);
ALuint getSoundSource(BaseSound* object);
void releaseSoundSource(ALuint source);
@@ -138,9 +138,9 @@
// Sound buffer related
static const unsigned int maxEffectsPoolSize_s = 40 * 1024 * 1024;
unsigned int effectsPoolSize_;
- typedef std::list<shared_ptr<SoundBuffer>> EffectsPoolList;
+ typedef std::list<std::shared_ptr<SoundBuffer>> EffectsPoolList;
EffectsPoolList effectsPool_;
- typedef std::map<std::string, shared_ptr<SoundBuffer>> SoundBufferMap;
+ typedef std::map<std::string, std::shared_ptr<SoundBuffer>> SoundBufferMap;
SoundBufferMap soundBuffers_;
// Sound source related
More information about the Orxonox-commit
mailing list