[Orxonox-commit 6111] r10769 - in code/branches/cpp11_v2: src src/libraries/core src/libraries/core/class src/libraries/core/command src/libraries/core/config src/libraries/core/input src/libraries/core/module src/libraries/core/object src/libraries/core/singleton src/libraries/network src/libraries/network/packet src/libraries/network/synchronisable src/libraries/tools src/libraries/util src/modules/designtools src/modules/mini4dgame src/modules/objects src/modules/objects/triggers src/modules/overlays/hud src/modules/pickup src/modules/pickup/items src/modules/pong src/modules/tetris src/modules/towerdefense src/orxonox/controllers src/orxonox/infos src/orxonox/overlays src/orxonox/sound src/orxonox/worldentities test/util
landauf at orxonox.net
landauf at orxonox.net
Sat Nov 7 10:23:44 CET 2015
Author: landauf
Date: 2015-11-07 10:23:42 +0100 (Sat, 07 Nov 2015)
New Revision: 10769
Modified:
code/branches/cpp11_v2/src/OrxonoxConfig.h.in
code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h
code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc
code/branches/cpp11_v2/src/libraries/core/EventIncludes.h
code/branches/cpp11_v2/src/libraries/core/GUIManager.cc
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/Loader.cc
code/branches/cpp11_v2/src/libraries/core/Loader.h
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/class/Identifiable.h
code/branches/cpp11_v2/src/libraries/core/class/Identifier.h
code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.h
code/branches/cpp11_v2/src/libraries/core/command/ArgumentCompletionFunctions.cc
code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc
code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.cc
code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.h
code/branches/cpp11_v2/src/libraries/core/command/ExecutorPtr.h
code/branches/cpp11_v2/src/libraries/core/command/FunctorPtr.h
code/branches/cpp11_v2/src/libraries/core/command/Shell.h
code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h
code/branches/cpp11_v2/src/libraries/core/input/InputManager.h
code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h
code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.cc
code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.h
code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h
code/branches/cpp11_v2/src/libraries/core/object/Iterator.h
code/branches/cpp11_v2/src/libraries/core/object/ObjectListIterator.h
code/branches/cpp11_v2/src/libraries/core/singleton/ScopeManager.h
code/branches/cpp11_v2/src/libraries/network/FunctionCallManager.cc
code/branches/cpp11_v2/src/libraries/network/FunctionCallManager.h
code/branches/cpp11_v2/src/libraries/network/GamestateManager.cc
code/branches/cpp11_v2/src/libraries/network/GamestateManager.h
code/branches/cpp11_v2/src/libraries/network/TrafficControl.cc
code/branches/cpp11_v2/src/libraries/network/TrafficControl.h
code/branches/cpp11_v2/src/libraries/network/packet/ClassID.cc
code/branches/cpp11_v2/src/libraries/network/packet/FunctionIDs.cc
code/branches/cpp11_v2/src/libraries/network/synchronisable/Serialise.h
code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h
code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.cc
code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h
code/branches/cpp11_v2/src/libraries/util/SharedPtr.h
code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h
code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameAI.h
code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.cc
code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h
code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.cc
code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.h
code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.h
code/branches/cpp11_v2/src/modules/objects/triggers/Trigger.h
code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc
code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h
code/branches/cpp11_v2/src/modules/pickup/PickupManager.h
code/branches/cpp11_v2/src/modules/pickup/items/ShrinkPickup.cc
code/branches/cpp11_v2/src/modules/pong/PongAI.cc
code/branches/cpp11_v2/src/modules/pong/PongAI.h
code/branches/cpp11_v2/src/modules/tetris/Tetris.cc
code/branches/cpp11_v2/src/modules/tetris/Tetris.h
code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.cc
code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h
code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.h
code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.h
code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.cc
code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.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
code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc
code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h
code/branches/cpp11_v2/test/util/SharedPtrTest.cc
Log:
no space needed anymore between closing template brackets ('> >' -> '>>')
Modified: code/branches/cpp11_v2/src/OrxonoxConfig.h.in
===================================================================
--- code/branches/cpp11_v2/src/OrxonoxConfig.h.in 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/OrxonoxConfig.h.in 2015-11-07 09:23:42 UTC (rev 10769)
@@ -212,7 +212,7 @@
template<class _Elem> struct char_traits;
template<class _Ty> class allocator;
template<class _Elem, class _Traits, class _Ax> class basic_string;
- typedef basic_string<char, char_traits<char>, allocator<char> > string;
+ typedef basic_string<char, char_traits<char>, allocator<char>> string;
}
// Import general purpose smart pointers
Modified: code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -156,7 +156,7 @@
bool operator!=(ClassTreeMaskNode* compare) const;
private:
- std::stack<std::pair<std::list<ClassTreeMaskNode*>::iterator, std::list<ClassTreeMaskNode*>::iterator> > nodes_; ///< A stack to store list-iterators
+ std::stack<std::pair<std::list<ClassTreeMaskNode*>::iterator, std::list<ClassTreeMaskNode*>::iterator>> nodes_; ///< A stack to store list-iterators
std::list<ClassTreeMaskNode*> rootlist_; ///< A list for internal use (it only stores the root-node)
};
@@ -297,9 +297,9 @@
private:
void create(ClassTreeMaskNode* node);
- std::list<std::pair<const Identifier*, bool> > subclasses_; ///< A list of all Identifiers through which objects the iterator should iterate
- std::list<std::pair<const Identifier*, bool> >::iterator subclassIterator_; ///< The current class of the iterator
- Iterator<BaseObject> objectIterator_; ///< The current object of the iterator
+ std::list<std::pair<const Identifier*, bool>> subclasses_; ///< A list of all Identifiers through which objects the iterator should iterate
+ std::list<std::pair<const Identifier*, bool>>::iterator subclassIterator_; ///< The current class of the iterator
+ Iterator<BaseObject> objectIterator_; ///< The current object of the iterator
};
}
Modified: code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -142,11 +142,11 @@
}
// Create directories to avoid problems when opening files in non existent folders.
- std::vector<std::pair<bf::path, std::string> > directories;
+ std::vector<std::pair<bf::path, std::string>> directories;
directories.push_back(std::make_pair(bf::path(configPath_), std::string("config")));
directories.push_back(std::make_pair(bf::path(logPath_), std::string("log")));
- for (std::vector<std::pair<bf::path, std::string> >::iterator it = directories.begin();
+ for (std::vector<std::pair<bf::path, std::string>>::iterator it = directories.begin();
it != directories.end(); ++it)
{
if (bf::exists(it->first) && !bf::is_directory(it->first))
Modified: code/branches/cpp11_v2/src/libraries/core/EventIncludes.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/EventIncludes.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/EventIncludes.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -85,8 +85,8 @@
XMLPortEventStateIntern(xmlportevent##function, classname, statename, xmlelement, mode)
#define XMLPortEventStateIntern(name, classname, statename, xmlelement, mode) \
- static orxonox::ExecutorMemberPtr<classname> xmlsetfunctor##name = orxonox::createExecutor(orxonox::createFunctor(&classname::addEventSource), std::string( #classname ) + "::" + "addEventSource" + '(' + statename + ')').cast<orxonox::ExecutorMember<classname> >(); \
- static orxonox::ExecutorMemberPtr<classname> xmlgetfunctor##name = orxonox::createExecutor(orxonox::createFunctor(&classname::getEventSource), std::string( #classname ) + "::" + "getEventSource" + '(' + statename + ')').cast<orxonox::ExecutorMember<classname> >(); \
+ static orxonox::ExecutorMemberPtr<classname> xmlsetfunctor##name = orxonox::createExecutor(orxonox::createFunctor(&classname::addEventSource), std::string( #classname ) + "::" + "addEventSource" + '(' + statename + ')').cast<orxonox::ExecutorMember<classname>>(); \
+ static orxonox::ExecutorMemberPtr<classname> xmlgetfunctor##name = orxonox::createExecutor(orxonox::createFunctor(&classname::getEventSource), std::string( #classname ) + "::" + "getEventSource" + '(' + statename + ')').cast<orxonox::ExecutorMember<classname>>(); \
xmlsetfunctor##name->setDefaultValue(1, statename); \
xmlgetfunctor##name->setDefaultValue(1, statename); \
XMLPortObjectGeneric(xmlport##name, classname, orxonox::BaseObject, statename, xmlsetfunctor##name, xmlgetfunctor##name, xmlelement, mode, false, true)
Modified: code/branches/cpp11_v2/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GUIManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/GUIManager.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -164,7 +164,7 @@
{
d_caching = false;
- std::vector<std::pair<CEGUI::String, CEGUI::LoggingLevel> >::iterator it = d_cache.begin();
+ std::vector<std::pair<CEGUI::String, CEGUI::LoggingLevel>>::iterator it = d_cache.begin();
while (it != d_cache.end())
{
Modified: code/branches/cpp11_v2/src/libraries/core/Game.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Game.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/Game.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -72,7 +72,7 @@
{
std::string name_;
weak_ptr<GameStateTreeNode> parent_;
- std::vector<shared_ptr<GameStateTreeNode> > children_;
+ std::vector<shared_ptr<GameStateTreeNode>> children_;
};
Game::Game(const std::string& cmdLine)
@@ -383,7 +383,7 @@
}
// Check children first
- std::vector<shared_ptr<GameStateTreeNode> > requestedNodes;
+ std::vector<shared_ptr<GameStateTreeNode>> requestedNodes;
for (unsigned int i = 0; i < lastRequestedNode->children_.size(); ++i)
{
if (lastRequestedNode->children_[i]->name_ == name)
@@ -453,7 +453,7 @@
void Game::setStateHierarchy(const std::string& str)
{
// Split string into pieces of the form whitespacesText
- std::vector<std::pair<std::string, int> > stateStrings;
+ std::vector<std::pair<std::string, int>> stateStrings;
size_t pos = 0;
size_t startPos = 0;
while (pos < str.size())
@@ -472,16 +472,16 @@
stateStrings.push_back(std::make_pair(std::string(), -1));
// Parse elements recursively
- std::vector<std::pair<std::string, int> >::const_iterator begin = stateStrings.begin();
+ std::vector<std::pair<std::string, int>>::const_iterator begin = stateStrings.begin();
parseStates(begin, this->rootStateNode_);
}
/*** 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, shared_ptr<GameStateTreeNode> currentNode)
{
SubString tokens(it->first, ",");
- std::vector<std::pair<std::string, int> >::const_iterator startIt = it;
+ std::vector<std::pair<std::string, int>>::const_iterator startIt = it;
for (unsigned int i = 0; i < tokens.size(); ++i)
{
@@ -619,15 +619,15 @@
this->bChangingState_ = false;
}
- /*static*/ std::map<std::string, shared_ptr<Game::GameStateFactory> >& Game::GameStateFactory::getFactories()
+ /*static*/ std::map<std::string, shared_ptr<Game::GameStateFactory>>& Game::GameStateFactory::getFactories()
{
- static std::map<std::string, shared_ptr<GameStateFactory> > factories;
+ static std::map<std::string, shared_ptr<GameStateFactory>> factories;
return factories;
}
/*static*/ 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, 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-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/Game.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -83,8 +83,8 @@
: 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 std::vector<shared_ptr<GameState>> GameStateVector;
+ typedef std::map<std::string, shared_ptr<GameState>> GameStateMap;
typedef shared_ptr<GameStateTreeNode> GameStateTreeNodePtr;
public:
@@ -128,7 +128,7 @@
{ getFactories()[className].reset(new TemplateGameStateFactory<T>()); }
virtual shared_ptr<GameState> fabricateInternal(const GameStateInfo& info) = 0;
- static std::map<std::string, shared_ptr<GameStateFactory> >& getFactories();
+ static std::map<std::string, shared_ptr<GameStateFactory>>& getFactories();
};
template <class T>
class TemplateGameStateFactory : public GameStateFactory
@@ -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, 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/Loader.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Loader.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/Loader.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -72,7 +72,7 @@
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> > >());
+ 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
@@ -162,10 +162,10 @@
istr >> line;
if (line <= lineTrace->size())
{
- std::vector<std::pair<std::string, size_t> > linesources = lineTrace->at(line - 1);
+ std::vector<std::pair<std::string, size_t>> linesources = lineTrace->at(line - 1);
std::ostringstream message;
message << "Possible sources of error:" << endl;
- for (std::vector<std::pair<std::string, size_t> >::iterator it = linesources.begin(); it != linesources.end(); ++it)
+ for (std::vector<std::pair<std::string, size_t>>::iterator it = linesources.begin(); it != linesources.end(); ++it)
{
message << it->first << ", Line " << it->second << endl;
}
Modified: code/branches/cpp11_v2/src/libraries/core/Loader.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Loader.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/Loader.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -66,7 +66,7 @@
private:
static bool getLuaTags(const std::string& text, std::map<size_t, bool>& luaTags);
- std::vector<std::pair<const XMLFile*, ClassTreeMask> > files_;
+ std::vector<std::pair<const XMLFile*, ClassTreeMask>> files_;
static Loader* singletonPtr_s;
};
Modified: code/branches/cpp11_v2/src/libraries/core/LuaState.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/LuaState.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/LuaState.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -244,7 +244,7 @@
//Add first line, which always exists
//Note: due to newlines etc., it's possible that one line consists of parts of
// multiple, different files
- std::vector<std::vector<std::pair<std::string, size_t> > >::reverse_iterator it = lineTrace_->rbegin();
+ std::vector<std::vector<std::pair<std::string, size_t>>>::reverse_iterator it = lineTrace_->rbegin();
std::pair<std::string, size_t> temppair = std::make_pair(filename, line);
//Avoid duplicate entries. This could happen if there were lua blocks on the same line
if (it->size() == 0 || std::find(it->begin(), it->end(), temppair) == it->end())
@@ -258,7 +258,7 @@
for (size_t i = 1; i <= newlinecount; i++)
{
//Add the new line to the trace map
- lineTrace_->push_back(std::vector<std::pair<std::string, size_t> >());
+ lineTrace_->push_back(std::vector<std::pair<std::string, size_t>>());
//Add the source of the line at the end
lineTrace_->rbegin()->push_back(std::make_pair(filename, line + i));
}
Modified: code/branches/cpp11_v2/src/libraries/core/LuaState.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/LuaState.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/LuaState.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -93,8 +93,8 @@
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)
- { map->push_back(std::vector<std::pair<std::string, size_t> >()); lineTrace_ = map; }
+ void setTraceMap(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_; }
@@ -115,7 +115,7 @@
private:
shared_ptr<ResourceInfo> getFileInfo(const std::string& filename);
- shared_ptr<std::vector<std::vector<std::pair<std::string, size_t> > > > lineTrace_;
+ shared_ptr<std::vector<std::vector<std::pair<std::string, size_t>>>> lineTrace_;
std::stringstream output_;
lua_State* luaState_;
Modified: code/branches/cpp11_v2/src/libraries/core/class/Identifiable.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/Identifiable.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/class/Identifiable.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -120,7 +120,7 @@
Identifier* identifier_; //!< The Identifier of the object
/// 'Fast map' that holds this-pointers of all derived types
- std::vector<std::pair<unsigned int, void*> > objectPointers_;
+ std::vector<std::pair<unsigned int, void*>> objectPointers_;
};
}
Modified: code/branches/cpp11_v2/src/libraries/core/class/Identifier.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/Identifier.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/class/Identifier.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -320,11 +320,11 @@
void updateConfigValues(bool updateChildren, Listable*) const;
void updateConfigValues(bool updateChildren, Identifiable*) const;
- static WeakPtr<ClassIdentifier<T> > classIdentifier_s;
+ static WeakPtr<ClassIdentifier<T>> classIdentifier_s;
};
template <class T>
- WeakPtr<ClassIdentifier<T> > ClassIdentifier<T>::classIdentifier_s;
+ WeakPtr<ClassIdentifier<T>> ClassIdentifier<T>::classIdentifier_s;
/**
@brief Returns the only instance of this class.
Modified: code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -110,7 +110,7 @@
/// Used while creating the object hierarchy to keep track of the identifiers of a newly created object (and all other objects that get created as
/// a consequence of this, e.g. nested member objects).
- std::map<Identifiable*, std::list<const Identifier*> > identifierTraceOfNewObject_;
+ std::map<Identifiable*, std::list<const Identifier*>> identifierTraceOfNewObject_;
Identifier* recordTraceForIdentifier_; //!< The identifier for which we want to record the trace of identifiers during object creation. If null, no trace is recorded.
static IdentifierManager* singletonPtr_s;
Modified: code/branches/cpp11_v2/src/libraries/core/command/ArgumentCompletionFunctions.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/ArgumentCompletionFunctions.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/command/ArgumentCompletionFunctions.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -98,13 +98,13 @@
std::string fragmentLC = getLowercase(fragment);
// get all the groups that are visible (except the shortcut group "")
- const std::map<std::string, std::map<std::string, ConsoleCommand*> >& commands = ConsoleCommandManager::getInstance().getCommands();
- for (std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = commands.begin(); it_group != commands.end(); ++it_group)
+ const std::map<std::string, std::map<std::string, ConsoleCommand*>>& commands = ConsoleCommandManager::getInstance().getCommands();
+ for (std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = commands.begin(); it_group != commands.end(); ++it_group)
if (groupIsVisible(it_group->second, bOnlyShowHidden) && it_group->first != "" && (fragmentLC == "" || getLowercase(it_group->first).find(fragmentLC) == 0))
groupList.push_back(ArgumentCompletionListElement(it_group->first, getLowercase(it_group->first)));
// now add all shortcuts (in group "")
- std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = commands.find("");
+ std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = commands.find("");
if (it_group != commands.end())
{
// add a line-break if the list isn't empty
@@ -137,7 +137,7 @@
std::string groupLC = getLowercase(group);
// find the iterator of the given group
- std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = ConsoleCommandManager::getInstance().getCommands().begin();
+ std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = ConsoleCommandManager::getInstance().getCommands().begin();
for ( ; it_group != ConsoleCommandManager::getInstance().getCommands().end(); ++it_group)
if (getLowercase(it_group->first) == groupLC)
break;
@@ -211,7 +211,7 @@
if (tokens.size() == 1)
{
- std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = ConsoleCommandManager::getInstance().getCommands().find(tokens[0]);
+ std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = ConsoleCommandManager::getInstance().getCommands().find(tokens[0]);
if (it_group != ConsoleCommandManager::getInstance().getCommands().end())
return detail::_subcommands(fragment, tokens[0], true);
else
Modified: code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -305,7 +305,7 @@
{
// the user typed 1-2 arguments, check what he tried to type and print a suitable error
std::string groupLC = getLowercase(this->getToken(0));
- for (std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = ConsoleCommandManager::getInstance().getCommandsLC().begin(); it_group != ConsoleCommandManager::getInstance().getCommandsLC().end(); ++it_group)
+ for (std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = ConsoleCommandManager::getInstance().getCommandsLC().begin(); it_group != ConsoleCommandManager::getInstance().getCommandsLC().end(); ++it_group)
if (it_group->first == groupLC)
return std::string("Error: There is no command in group \"") + this->getToken(0) + "\" starting with \"" + this->getToken(1) + "\".";
@@ -327,7 +327,7 @@
unsigned int nearestDistance = (unsigned int)-1;
// iterate through all groups and their commands and calculate the distance to the current command. keep the best.
- for (std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = ConsoleCommandManager::getInstance().getCommandsLC().begin(); it_group != ConsoleCommandManager::getInstance().getCommandsLC().end(); ++it_group)
+ for (std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = ConsoleCommandManager::getInstance().getCommandsLC().begin(); it_group != ConsoleCommandManager::getInstance().getCommandsLC().end(); ++it_group)
{
if (it_group->first != "")
{
@@ -345,7 +345,7 @@
}
// now also iterate through all shortcuts and keep the best if it's better than the one found above.
- std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = ConsoleCommandManager::getInstance().getCommandsLC().find("");
+ std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = ConsoleCommandManager::getInstance().getCommandsLC().find("");
if (it_group != ConsoleCommandManager::getInstance().getCommandsLC().end())
{
for (std::map<std::string, ConsoleCommand*>::const_iterator it_name = it_group->second.begin(); it_name != it_group->second.end(); ++it_name)
Modified: code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -49,7 +49,7 @@
ConsoleCommand* ConsoleCommandManager::getCommand(const std::string& group, const std::string& name, bool bPrintError)
{
// find the group
- std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = this->commandMap_.find(group);
+ std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = this->commandMap_.find(group);
if (it_group != this->commandMap_.end())
{
// find the name
@@ -82,7 +82,7 @@
std::string nameLC = getLowercase(name);
// find the group
- std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = this->commandMapLC_.find(groupLC);
+ std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = this->commandMapLC_.find(groupLC);
if (it_group != this->commandMapLC_.end())
{
// find the name
@@ -145,7 +145,7 @@
void ConsoleCommandManager::unregisterCommand(ConsoleCommand* command)
{
// iterate through all groups
- for (std::map<std::string, std::map<std::string, ConsoleCommand*> >::iterator it_group = this->commandMap_.begin(); it_group != this->commandMap_.end(); )
+ for (std::map<std::string, std::map<std::string, ConsoleCommand*>>::iterator it_group = this->commandMap_.begin(); it_group != this->commandMap_.end(); )
{
// iterate through all commands of each group
for (std::map<std::string, ConsoleCommand*>::iterator it_name = it_group->second.begin(); it_name != it_group->second.end(); )
@@ -167,7 +167,7 @@
// now the same for the lowercase-map:
// iterate through all groups
- for (std::map<std::string, std::map<std::string, ConsoleCommand*> >::iterator it_group = this->commandMapLC_.begin(); it_group != this->commandMapLC_.end(); )
+ for (std::map<std::string, std::map<std::string, ConsoleCommand*>>::iterator it_group = this->commandMapLC_.begin(); it_group != this->commandMapLC_.end(); )
{
// iterate through all commands of each group
for (std::map<std::string, ConsoleCommand*>::iterator it_name = it_group->second.begin(); it_name != it_group->second.end(); )
Modified: code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -53,10 +53,10 @@
void unregisterCommand(ConsoleCommand* command);
/// Returns the map with all groups and commands.
- inline const std::map<std::string, std::map<std::string, ConsoleCommand*> >& getCommands()
+ inline const std::map<std::string, std::map<std::string, ConsoleCommand*>>& getCommands()
{ return this->commandMap_; }
/// Returns the map with all groups and commands in lowercase.
- inline const std::map<std::string, std::map<std::string, ConsoleCommand*> >& getCommandsLC()
+ inline const std::map<std::string, std::map<std::string, ConsoleCommand*>>& getCommandsLC()
{ return this->commandMapLC_; }
/// Returns a command (shortcut) with given name. @param name The name of the command shortcut @param bPrintError If true, an error is printed if the command doesn't exist
@@ -70,8 +70,8 @@
ConsoleCommand* getCommandLC(const std::string& group, const std::string& name, bool bPrintError = false);
private:
- std::map<std::string, std::map<std::string, ConsoleCommand*> > commandMap_;
- std::map<std::string, std::map<std::string, ConsoleCommand*> > commandMapLC_;
+ std::map<std::string, std::map<std::string, ConsoleCommand*>> commandMap_;
+ std::map<std::string, std::map<std::string, ConsoleCommand*>> commandMapLC_;
static ConsoleCommandManager* singletonPtr_s;
};
Modified: code/branches/cpp11_v2/src/libraries/core/command/ExecutorPtr.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/ExecutorPtr.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/command/ExecutorPtr.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -65,7 +65,7 @@
public:
inline ExecutorMemberPtr() : SharedChildPtr<ExecutorMember<T>, ExecutorPtr>() {}
inline ExecutorMemberPtr(ExecutorMember<T>* pointer) : SharedChildPtr<ExecutorMember<T>, ExecutorPtr>(pointer) {}
- inline ExecutorMemberPtr(const SharedPtr<ExecutorMember<T> >& other) : SharedChildPtr<ExecutorMember<T>, ExecutorPtr>(other) {}
+ inline ExecutorMemberPtr(const SharedPtr<ExecutorMember<T>>& other) : SharedChildPtr<ExecutorMember<T>, ExecutorPtr>(other) {}
};
}
Modified: code/branches/cpp11_v2/src/libraries/core/command/FunctorPtr.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/FunctorPtr.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/command/FunctorPtr.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -64,7 +64,7 @@
public:
inline FunctorMemberPtr() : SharedChildPtr<FunctorMember<T>, FunctorPtr>() {}
inline FunctorMemberPtr(FunctorMember<T>* pointer) : SharedChildPtr<FunctorMember<T>, FunctorPtr>(pointer) {}
- inline FunctorMemberPtr(const SharedPtr<FunctorMember<T> >& other) : SharedChildPtr<FunctorMember<T>, FunctorPtr>(other) {}
+ inline FunctorMemberPtr(const SharedPtr<FunctorMember<T>>& other) : SharedChildPtr<FunctorMember<T>, FunctorPtr>(other) {}
};
/// FunctorStaticPtr is just FunctorMemberPtr with @a T = void
@@ -72,12 +72,12 @@
/// It's not possible to use a typedef for FunctorPointerPtr<T>, so we have to create a child-class instead. It inherits all functions from SharedChildPtr, but needs to (re-)implement some constructors.
template <class F, class T>
- class FunctorPointerPtr : public SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T> >
+ class FunctorPointerPtr : public SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T>>
{
public:
- inline FunctorPointerPtr() : SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T> >() {}
- inline FunctorPointerPtr(FunctorPointer<F, T>* pointer) : SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T> >(pointer) {}
- inline FunctorPointerPtr(const SharedPtr<FunctorPointer<F, T> >& other) : SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T> >(other) {}
+ inline FunctorPointerPtr() : SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T>>() {}
+ inline FunctorPointerPtr(FunctorPointer<F, T>* pointer) : SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T>>(pointer) {}
+ inline FunctorPointerPtr(const SharedPtr<FunctorPointer<F, T>>& other) : SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T>>(other) {}
};
}
Modified: code/branches/cpp11_v2/src/libraries/core/command/Shell.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/Shell.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/command/Shell.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -127,7 +127,7 @@
const std::string& getInput() const;
- typedef std::list<std::pair<std::string, LineType> > LineList;
+ typedef std::list<std::pair<std::string, LineType>> LineList;
LineList::const_iterator getNewestLineIterator() const;
LineList::const_iterator getEndIterator() const;
Modified: code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -62,7 +62,7 @@
friend class Singleton<SettingsConfigFile>;
public:
- typedef std::multimap<std::string, std::pair<std::string, ConfigValueContainer*> > ContainerMap;
+ typedef std::multimap<std::string, std::pair<std::string, ConfigValueContainer*>> ContainerMap;
SettingsConfigFile(const std::string& filename);
~SettingsConfigFile();
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputManager.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputManager.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -224,7 +224,7 @@
std::map<int, InputState*> activeStates_; //!< Contains all active input states by priority (std::map is sorted!)
std::vector<InputState*> activeStatesTicked_; //!< Like activeStates_, but only contains the ones that currently receive events
- std::vector<boost::function<void ()> > callBuffer_; //!< Caches all calls from InputStates to be executed afterwards (see preUpdate)
+ std::vector<boost::function<void ()>> callBuffer_; //!< Caches all calls from InputStates to be executed afterwards (see preUpdate)
static InputManager* singletonPtr_s; //!< Pointer reference to the singleton
}; // tolua_export
Modified: code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -126,7 +126,7 @@
Button buttons[JoyStickButtonCode::numberOfButtons];
};
//! Actual key bindings for joy stick buttons
- std::vector<shared_ptr<JoyStickButtonVector> > joyStickButtons_;
+ std::vector<shared_ptr<JoyStickButtonVector>> joyStickButtons_;
//! Helper class to use something like std:vector<HalfAxis[48]>
struct JoyStickAxisVector
{
@@ -134,14 +134,14 @@
HalfAxis halfAxes[JoyStickAxisCode::numberOfAxes * 2];
};
//! Actual key bindings for joy stick axes (and sliders)
- std::vector<shared_ptr<JoyStickAxisVector> > joyStickAxes_;
+ std::vector<shared_ptr<JoyStickAxisVector>> joyStickAxes_;
//! Pointer map with all Buttons, including half axes
std::map<std::string, Button*> allButtons_;
//! Pointer list with all half axes
std::vector<HalfAxis*> allHalfAxes_;
//! Maps input commands to all Button names, including half axes
- std::map< std::string, std::vector<std::string> > allCommands_;
+ std::map< std::string, std::vector<std::string>> allCommands_;
/**
@brief
Modified: code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -72,9 +72,9 @@
void ModuleInstance::deleteAllStaticallyInitializedInstances()
{
- std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*> > copy(this->staticallyInitializedInstancesByType_);
+ std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*>> copy(this->staticallyInitializedInstancesByType_);
this->staticallyInitializedInstancesByType_.clear();
- for (std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*> >::iterator it1 = copy.begin(); it1 != copy.end(); ++it1)
+ for (std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*>>::iterator it1 = copy.begin(); it1 != copy.end(); ++it1)
for (std::set<StaticallyInitializedInstance*>::iterator it2 = it1->second.begin(); it2 != it1->second.end(); ++it2)
delete (*it2);
}
Modified: code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -68,7 +68,7 @@
static ModuleInstance* getCurrentModuleInstance();
private:
- std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*> > staticallyInitializedInstancesByType_;
+ std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*>> staticallyInitializedInstancesByType_;
std::string libraryName_;
DynLib* dynLib_;
Modified: code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -51,7 +51,7 @@
{ this->retainedInstances_.push_back(instance); }
private:
- std::vector<StrongPtr<Destroyable> > retainedInstances_;
+ std::vector<StrongPtr<Destroyable>> retainedInstances_;
static DestroyLaterManager* singletonPtr_s;
};
Modified: code/branches/cpp11_v2/src/libraries/core/object/Iterator.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/Iterator.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/object/Iterator.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -69,20 +69,20 @@
@see See @ref IteratorExample "Iterator.h" for more information an example.
*/
template <class T>
- class Iterator : public IteratorBase<T, Iterator<T> >
+ class Iterator : public IteratorBase<T, Iterator<T>>
{
public:
/**
@brief Constructor: Sets the element, whereon the iterator points, to zero.
*/
- inline Iterator() : IteratorBase<T, Iterator<T> >() {}
+ inline Iterator() : IteratorBase<T, Iterator<T>>() {}
/**
@brief Constructor: Sets this element to the element of another Iterator.
@param other The other Iterator
*/
template <class OT, class OI>
- inline Iterator(const IteratorBase<OT, OI>& other) : IteratorBase<T, Iterator<T> >(other) {}
+ inline Iterator(const IteratorBase<OT, OI>& other) : IteratorBase<T, Iterator<T>>(other) {}
/**
@brief Assigns a given element.
Modified: code/branches/cpp11_v2/src/libraries/core/object/ObjectListIterator.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/ObjectListIterator.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/object/ObjectListIterator.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -67,26 +67,26 @@
@see See @ref ObjectListIteratorExample "ObjectListIterator.h" for more information an example.
*/
template <class T>
- class ObjectListIterator : public IteratorBase<T, ObjectListIterator<T> >
+ class ObjectListIterator : public IteratorBase<T, ObjectListIterator<T>>
{
public:
/**
@brief Constructor: Sets the element, whereon the ObjectListIterator points, to zero.
*/
- inline ObjectListIterator() : IteratorBase<T, ObjectListIterator<T> >() {}
+ inline ObjectListIterator() : IteratorBase<T, ObjectListIterator<T>>() {}
/**
@brief Constructor: Sets this element to a given element.
@param element The element to start with
*/
- inline ObjectListIterator(ObjectListElement<T>* element) : IteratorBase<T, ObjectListIterator<T> >(element) {}
+ inline ObjectListIterator(ObjectListElement<T>* element) : IteratorBase<T, ObjectListIterator<T>>(element) {}
/**
@brief Constructor: Sets this element to the element of another ObjectListIterator.
@param other The other ObjectListIterator
*/
template <class OI>
- inline ObjectListIterator(const IteratorBase<T, OI>& other) : IteratorBase<T, ObjectListIterator<T> >(other) {}
+ inline ObjectListIterator(const IteratorBase<T, OI>& other) : IteratorBase<T, ObjectListIterator<T>>(other) {}
/**
@brief Overloading of the *it operator: returns the pointer to the object.
Modified: code/branches/cpp11_v2/src/libraries/core/singleton/ScopeManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/singleton/ScopeManager.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/core/singleton/ScopeManager.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -78,7 +78,7 @@
void deactivateListener(ScopeListener* listener);
std::set<ScopeID::Value> activeScopes_;
- std::map<ScopeID::Value, std::set<ScopeListener*> > listeners_; //!< Stores all listeners for a scope
+ std::map<ScopeID::Value, std::set<ScopeListener*>> listeners_; //!< Stores all listeners for a scope
static ScopeManager* singletonPtr_s;
};
Modified: code/branches/cpp11_v2/src/libraries/network/FunctionCallManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/FunctionCallManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/network/FunctionCallManager.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -36,7 +36,7 @@
namespace orxonox {
std::map<uint32_t, packet::FunctionCalls*> FunctionCallManager::sPeerMap_;
-std::vector<std::pair<FunctionCall, std::pair<uint32_t, uint32_t> > > FunctionCallManager::sIncomingFunctionCallBuffer_;
+std::vector<std::pair<FunctionCall, std::pair<uint32_t, uint32_t>>> FunctionCallManager::sIncomingFunctionCallBuffer_;
void FunctionCallManager::addCall(uint32_t functionID, uint32_t objectID, uint32_t peerID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
@@ -69,7 +69,7 @@
void FunctionCallManager::processBufferedFunctionCalls()
{
- std::vector<std::pair<FunctionCall, std::pair<uint32_t, uint32_t> > >::iterator it = FunctionCallManager::sIncomingFunctionCallBuffer_.begin();
+ std::vector<std::pair<FunctionCall, std::pair<uint32_t, uint32_t>>>::iterator it = FunctionCallManager::sIncomingFunctionCallBuffer_.begin();
while( it!=FunctionCallManager::sIncomingFunctionCallBuffer_.end() )
{
OrxAssert( Host::getActiveInstance(), "No Host class existing" );
Modified: code/branches/cpp11_v2/src/libraries/network/FunctionCallManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/FunctionCallManager.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/network/FunctionCallManager.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -53,7 +53,7 @@
static void processBufferedFunctionCalls();
static std::map<uint32_t, packet::FunctionCalls*> sPeerMap_;
- static std::vector<std::pair<FunctionCall,std::pair<uint32_t, uint32_t> > > sIncomingFunctionCallBuffer_;
+ static std::vector<std::pair<FunctionCall,std::pair<uint32_t, uint32_t>>> sIncomingFunctionCallBuffer_;
protected:
FunctionCallManager();
~FunctionCallManager();
Modified: code/branches/cpp11_v2/src/libraries/network/GamestateManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/GamestateManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/network/GamestateManager.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -350,7 +350,7 @@
// void GamestateManager::removeClient(ClientInformation* client){
// assert(client);
-// std::map<unsigned int, std::map<unsigned int, packet::Gamestate*> >::iterator clientMap = gamestateMap_.find(client->getID());
+// std::map<unsigned int, std::map<unsigned int, packet::Gamestate*>>::iterator clientMap = gamestateMap_.find(client->getID());
// // first delete all remained gamestates
// std::map<unsigned int, packet::Gamestate*>::iterator it;
// for(it=clientMap->second.begin(); it!=clientMap->second.end(); it++)
Modified: code/branches/cpp11_v2/src/libraries/network/GamestateManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/GamestateManager.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/network/GamestateManager.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -107,7 +107,7 @@
private:
bool processGamestate(packet::Gamestate *gs);
-// std::map<unsigned int, std::map<unsigned int, packet::Gamestate*> > gamestateMap_;
+// std::map<unsigned int, std::map<unsigned int, packet::Gamestate*>> gamestateMap_;
std::map<unsigned int, packet::Gamestate*> gamestateQueue;
// std::map<unsigned int, uint32_t> lastProcessedGamestateID_;
std::map<uint32_t, peerInfo> peerMap_;
Modified: code/branches/cpp11_v2/src/libraries/network/TrafficControl.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/TrafficControl.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/network/TrafficControl.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -147,7 +147,7 @@
// shortcut for maps
std::map<unsigned int, objInfo >& objectListPerm = clientListPerm_[clientID];
- std::map<unsigned int, std::list<obj> >& objectListTemp = clientListTemp_[clientID];
+ std::map<unsigned int, std::list<obj>>& objectListTemp = clientListTemp_[clientID];
for(itvec = objectListTemp[gamestateID].begin(); itvec != objectListTemp[gamestateID].end(); itvec++)
{
@@ -179,7 +179,7 @@
*/
void TrafficControl::insertinClientListPerm(unsigned int clientID, obj objinf)
{
- std::map<unsigned int,std::map<unsigned int, objInfo> >::iterator itperm;//iterator clientListPerm over clientIDs
+ std::map<unsigned int,std::map<unsigned int, objInfo>>::iterator itperm;//iterator clientListPerm over clientIDs
unsigned int gsid=GAMESTATEID_INITIAL, gsdiff=currentGamestateID, prioperm=Synchronisable::getSynchronisable(objinf.objID)->getPriority(), priomom=0;
clientListPerm_[clientID][objinf.objID] = objInfo(objinf.objID, objinf.objCreatorID,gsid,gsdiff, objinf.objSize,prioperm,priomom);
}
Modified: code/branches/cpp11_v2/src/libraries/network/TrafficControl.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/TrafficControl.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/network/TrafficControl.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -81,13 +81,13 @@
/**
*permanent client list: contains client ids, object ids and objectInfos (in this order)
*/
- std::map<unsigned int, std::map<unsigned int, objInfo > > clientListPerm_;
+ std::map<unsigned int, std::map<unsigned int, objInfo >> clientListPerm_;
//has to be created with constructor and then needs to be updated by evaluateList().
/**
*temporary client list: contains client ids, gamestate ids and object ids (in this order)
*/
- std::map<unsigned int, std::map<unsigned int, std::list<obj> > > clientListTemp_;
+ std::map<unsigned int, std::map<unsigned int, std::list<obj>>> clientListTemp_;
/**updateReferenceList
*currentGamestateID and currentClientID will be defined as soon as TrafficControl is being called by Server
Modified: code/branches/cpp11_v2/src/libraries/network/packet/ClassID.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/ClassID.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/network/packet/ClassID.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -51,7 +51,7 @@
unsigned int packetSize=2*sizeof(uint32_t); //space for the packetID and for the nrofclasses
uint32_t network_id;
flags_ = flags_ | PACKET_FLAGS_CLASSID;
- std::queue<std::pair<uint32_t, std::string> > tempQueue;
+ std::queue<std::pair<uint32_t, std::string>> tempQueue;
//calculate total needed size (for all strings and integers)
std::map<std::string, Identifier*>::const_iterator it = IdentifierManager::getInstance().getIdentifierByStringMap().begin();
Modified: code/branches/cpp11_v2/src/libraries/network/packet/FunctionIDs.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/FunctionIDs.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/network/packet/FunctionIDs.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -52,7 +52,7 @@
unsigned int packetSize=2*sizeof(uint32_t); //space for the packetID and for the nroffunctions
uint32_t networkID;
flags_ = flags_ | PACKET_FLAGS_FUNCTIONIDS;
- std::queue<std::pair<uint32_t, std::string> > tempQueue;
+ std::queue<std::pair<uint32_t, std::string>> tempQueue;
//calculate total needed size (for all strings and integers)
const std::set<NetworkFunctionBase*>& set = NetworkFunctionManager::getInstance().getAllFunctions();
Modified: code/branches/cpp11_v2/src/libraries/network/synchronisable/Serialise.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/synchronisable/Serialise.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/network/synchronisable/Serialise.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -89,7 +89,7 @@
template <class T> inline void loadAndIncrease( const StrongPtr<T>& variable, uint8_t*& mem )
{
// *const_cast<typename Loki::TypeTraits<T*>::UnqualifiedType*>(&variable) = dynamic_cast<T*>(variable->getSynchronisable( *(uint32_t*)(mem) ));
- *const_cast<typename Loki::TypeTraits<StrongPtr<T> >::UnqualifiedType*>(&variable) = orxonox_cast<T*>(T::getSynchronisable(*(uint32_t*)(mem)));
+ *const_cast<typename Loki::TypeTraits<StrongPtr<T>>::UnqualifiedType*>(&variable) = orxonox_cast<T*>(T::getSynchronisable(*(uint32_t*)(mem)));
mem += returnSize( variable );
}
@@ -124,7 +124,7 @@
template <class T> inline void loadAndIncrease( const WeakPtr<T>& variable, uint8_t*& mem )
{
// *const_cast<typename Loki::TypeTraits<T*>::UnqualifiedType*>(&variable) = dynamic_cast<T*>(variable->getSynchronisable( *(uint32_t*)(mem) ));
- *const_cast<typename Loki::TypeTraits<WeakPtr<T> >::UnqualifiedType*>(&variable) = orxonox_cast<T*>(T::getSynchronisable(*(uint32_t*)(mem)));
+ *const_cast<typename Loki::TypeTraits<WeakPtr<T>>::UnqualifiedType*>(&variable) = orxonox_cast<T*>(T::getSynchronisable(*(uint32_t*)(mem)));
mem += returnSize( variable );
}
Modified: code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -241,15 +241,15 @@
{
SynchronisableVariableBase* sv;
if (bidirectional)
- sv = new SynchronisableVariableBidirectional<std::set<T> >(variable, mode, cb);
+ sv = new SynchronisableVariableBidirectional<std::set<T>>(variable, mode, cb);
else
- sv = new SynchronisableVariable<std::set<T> >(variable, mode, cb);
+ sv = new SynchronisableVariable<std::set<T>>(variable, mode, cb);
syncList_.push_back(sv);
stringList_.push_back(sv);
}
template <> _NetworkExport void Synchronisable::registerVariable( std::string& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional);
-// template <class T> _NetworkExport void Synchronisable::registerVariable<std::set<T> >( std::set<T>& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional);
+// template <class T> _NetworkExport void Synchronisable::registerVariable<std::set<T>>( std::set<T>& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional);
template <> _NetworkExport void Synchronisable::unregisterVariable( std::string& variable );
Modified: code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -70,7 +70,7 @@
namespace orxonox
{
- std::map<std::string, std::map<ColourValue, std::string> > TextureGenerator::materials_s;
+ std::map<std::string, std::map<ColourValue, std::string>> TextureGenerator::materials_s;
unsigned int TextureGenerator::materialCount_s = 0;
/*static*/ const std::string& TextureGenerator::getMaterialName(const std::string& textureName, const ColourValue& colour)
Modified: code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -52,7 +52,7 @@
TextureGenerator(const TextureGenerator&);
~TextureGenerator();
- static std::map<std::string, std::map<ColourValue, std::string> > materials_s;
+ static std::map<std::string, std::map<ColourValue, std::string>> materials_s;
static unsigned int materialCount_s;
};
}
Modified: code/branches/cpp11_v2/src/libraries/util/SharedPtr.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/SharedPtr.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/libraries/util/SharedPtr.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -342,7 +342,7 @@
This class is used to reflect the hierarchy of the underlying class @a T.
For example the @c Functor classes: While a @c Functor* pointer would be managed by
@c SharedPtr<Functor>, the child class @c FunctorStatic is managed by the class
- <tt>SharedChildPtr<FunctorStatic, SharedPtr<Functor> ></tt>.
+ <tt>SharedChildPtr<FunctorStatic, SharedPtr<Functor>></tt>.
The second template argument @a Parent is used as the parent class of
SharedChildPtr. This means that each instance of <tt>SharedChildPtr<T, Parent></tt>
@@ -350,7 +350,7 @@
So for example this works:
@code
- SharedChildPtr<FunctorStatic, SharedPtr<Functor> > functorStatic = createFunctor(&MyClass::myStaticFunction);
+ SharedChildPtr<FunctorStatic, SharedPtr<Functor>> functorStatic = createFunctor(&MyClass::myStaticFunction);
SharedPtr<Functor> functor = functorStatic;
@endcode
Modified: code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h
===================================================================
--- code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -105,7 +105,7 @@
bool bCleanup_; //!< Whether the generator is being cleaned up.
std::vector<std::string> names_; //!< The names of the image files for the skybox faces to be generated.
- std::vector< std::pair<int, int> > rotations_; //!< The rotation in yaw an pitch direction that is applied to the camera after a specific face has been generated.
+ std::vector< std::pair<int, int>> rotations_; //!< The rotation in yaw an pitch direction that is applied to the camera after a specific face has been generated.
// Storage variables
float aspectRatio_; //!< The backed up aspect ratio of the camera.
Modified: code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameAI.h
===================================================================
--- code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameAI.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameAI.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -80,7 +80,7 @@
protected:
- std::list<std::pair<Timer*, char> > reactionTimers_; //!< A list of reaction timers and the directions that take effect when their timer expires.
+ std::list<std::pair<Timer*, char>> reactionTimers_; //!< A list of reaction timers and the directions that take effect when their timer expires.
Mini4DgameCenterpoint* center_;
private:
Modified: code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -207,7 +207,7 @@
float distance;
bool humanItem;
- for( std::list<WeakPtr<Pawn> >::iterator current = pawnsIn_.begin(); current != pawnsIn_.end(); current++ )
+ for( std::list<WeakPtr<Pawn>>::iterator current = pawnsIn_.begin(); current != pawnsIn_.end(); current++ )
{
Pawn* currentPawn = *current;
if( currentPawn && currentPawn->getNode() )
Modified: code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -100,7 +100,7 @@
struct BillboardAdministration{ bool usedYet; Billboard* billy; };
// Variabeln::
- std::list<WeakPtr<Pawn> > pawnsIn_; //!< List of the pawns that this instance of SpaceBoundaries has to handle.
+ std::list<WeakPtr<Pawn>> pawnsIn_; //!< List of the pawns that this instance of SpaceBoundaries has to handle.
std::vector<BillboardAdministration> billboards_;
Modified: code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -99,7 +99,7 @@
std::queue<MultiTriggerState*>* queue = nullptr;
// Check for objects that were in range but no longer are. Iterate through all objects, that are in range.
- for(std::set<WeakPtr<WorldEntity> >::iterator it = this->range_.begin(); it != this->range_.end(); )
+ for(std::set<WeakPtr<WorldEntity>>::iterator it = this->range_.begin(); it != this->range_.end(); )
{
WorldEntity* entity = *it;
@@ -260,7 +260,7 @@
*/
bool DistanceMultiTrigger::addToRange(WorldEntity* entity)
{
- std::pair<std::set<WeakPtr<WorldEntity> >::iterator, bool> pair = this->range_.insert(entity);
+ std::pair<std::set<WeakPtr<WorldEntity>>::iterator, bool> pair = this->range_.insert(entity);
return pair.second;
}
}
Modified: code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -152,7 +152,7 @@
std::string targetName_; //!< The target name, used in <em>single-target</em> mode.
ClassTreeMask beaconMask_; //!< A mask, that only accepts DistanceTriggerBeacons.
- std::set<WeakPtr<WorldEntity> > range_; //!< The set of entities that currently are in range of the DistanceMultiTrigger.
+ std::set<WeakPtr<WorldEntity>> range_; //!< The set of entities that currently are in range of the DistanceMultiTrigger.
};
Modified: code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -191,7 +191,7 @@
std::set<BaseObject*> active_; //!< The set of all objects the MultiTrigger is active for.
std::set<BaseObject*> triggered_; //!< The set of all objects the MultiTrigger is triggered for.
- std::deque< std::pair<float, MultiTriggerState*> > stateQueue_; //!< The queue of states waiting to become active.
+ std::deque<std::pair<float, MultiTriggerState*>> stateQueue_; //!< The queue of states waiting to become active.
ClassTreeMask targetMask_; //!< The target mask, masking all objects that can trigger this MultiTrigger.
Modified: code/branches/cpp11_v2/src/modules/objects/triggers/Trigger.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/triggers/Trigger.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/objects/triggers/Trigger.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -126,7 +126,7 @@
BillboardSet debugBillboard_; //!< A set of debug billboards to visualize the state of the trigger.
- std::queue<std::pair<float, char> > stateChanges_; //!< A queue of state changes (in the same format as latestState_) paired with the time they will take effect since the last state change took effect.
+ std::queue<std::pair<float, char>> stateChanges_; //!< A queue of state changes (in the same format as latestState_) paired with the time they will take effect since the last state change took effect.
};
}
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -186,7 +186,7 @@
return;
const Matrix4& camTransform = cam->getOgreCamera()->getProjectionMatrix() * cam->getOgreCamera()->getViewMatrix();
- for (std::list<std::pair<RadarViewable*, unsigned int> >::iterator listIt = this->sortedObjectList_.begin(); listIt != this->sortedObjectList_.end(); ++listIt)
+ for (std::list<std::pair<RadarViewable*, unsigned int>>::iterator listIt = this->sortedObjectList_.begin(); listIt != this->sortedObjectList_.end(); ++listIt)
listIt->second = (int)((listIt->first->getRVWorldPosition() - HumanController::getLocalControllerSingleton()->getControllableEntity()->getWorldPosition()).length() + 0.5f);
this->sortedObjectList_.sort(compareDistance);
@@ -208,7 +208,7 @@
bool nextHasToBeSelected = false;
- for (std::list<std::pair<RadarViewable*, unsigned int> >::iterator listIt = this->sortedObjectList_.begin(); listIt != this->sortedObjectList_.end(); ++markerCount, ++listIt)
+ for (std::list<std::pair<RadarViewable*, unsigned int>>::iterator listIt = this->sortedObjectList_.begin(); listIt != this->sortedObjectList_.end(); ++markerCount, ++listIt)
{
std::map<RadarViewable*, ObjectInfo>::iterator it = this->activeObjectList_.find(listIt->first);
@@ -640,7 +640,7 @@
this->activeObjectList_.erase(viewable);
}
- for (std::list<std::pair<RadarViewable*, unsigned int> >::iterator listIt = this->sortedObjectList_.begin(); listIt != this->sortedObjectList_.end(); ++listIt)
+ for (std::list<std::pair<RadarViewable*, unsigned int>>::iterator listIt = this->sortedObjectList_.begin(); listIt != this->sortedObjectList_.end(); ++listIt)
{
if ((listIt->first) == viewable)
{
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -140,7 +140,7 @@
Vector3 toAimPosition(RadarViewable* target) const;
std::map<RadarViewable*, ObjectInfo> activeObjectList_;
- std::list<std::pair<RadarViewable*, unsigned int> > sortedObjectList_;
+ std::list<std::pair<RadarViewable*, unsigned int>> sortedObjectList_;
float healthMarkerSize_;
float healthLevelMarkerSize_;
Modified: code/branches/cpp11_v2/src/modules/pickup/PickupManager.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pickup/PickupManager.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/pickup/PickupManager.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -160,7 +160,7 @@
std::map<uint32_t, PickupInventoryContainer*> pickupInventoryContainers_; //!< Map linking a number identifying a Pickupable to a PickupInventoryContainer, which contains all necessary information about that Pickupable.
std::map<uint32_t, PickupInventoryContainer*>::iterator pickupsIterator_; //!< An iterator pointing to the current Pickupable in pickupsList_.
- std::map<uint32_t, WeakPtr<Pickupable> > pickups_; //!< Map linking a number identifying a Pickupable to a weak pointer of a Pickupable.
+ std::map<uint32_t, WeakPtr<Pickupable>> pickups_; //!< Map linking a number identifying a Pickupable to a weak pointer of a Pickupable.
std::map<Pickupable*, uint32_t> indexes_;//!< Map linking Pickupable to the number identifying it.
void updateGUI(void); //!< Updates the PickupInventory GUI.
Modified: code/branches/cpp11_v2/src/modules/pickup/items/ShrinkPickup.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/pickup/items/ShrinkPickup.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/pickup/items/ShrinkPickup.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -181,7 +181,7 @@
pawn->setMass(pawn->getMass()*factor);
// Iterate over all camera positions and inversely move the camera to create a shrinking sensation.
- const std::list< StrongPtr<CameraPosition> >& cameraPositions = pawn->getCameraPositions();
+ const std::list<StrongPtr<CameraPosition>>& cameraPositions = pawn->getCameraPositions();
int size = cameraPositions.size();
for(int index = 0; index < size; index++)
{
@@ -207,7 +207,7 @@
pawn->setMass(pawn->getMass()*this->shrinkFactor_);
// Iterate over all camera positions and inversely move the camera to create a shrinking sensation.
- const std::list< StrongPtr<CameraPosition> >& cameraPositions = pawn->getCameraPositions();
+ const std::list<StrongPtr<CameraPosition>>& cameraPositions = pawn->getCameraPositions();
int size = cameraPositions.size();
for(int index = 0; index < size; index++)
{
@@ -262,7 +262,7 @@
pawn->setMass(pawn->getMass()*factor);
// Iterate over all camera positions and inversely move the camera to create a shrinking sensation.
- const std::list< StrongPtr<CameraPosition> >& cameraPositions = pawn->getCameraPositions();
+ const std::list<StrongPtr<CameraPosition>>& cameraPositions = pawn->getCameraPositions();
int size = cameraPositions.size();
for(int index = 0; index < size; index++)
{
@@ -303,7 +303,7 @@
pawn->setMass(pawn->getMass()*factor);
// Iterate over all camera positions and inversely move the camera to create a shrinking sensation.
- const std::list< StrongPtr<CameraPosition> >& cameraPositions = pawn->getCameraPositions();
+ const std::list<StrongPtr<CameraPosition>>& cameraPositions = pawn->getCameraPositions();
int size = cameraPositions.size();
for(int index = 0; index < size; index++)
{
Modified: code/branches/cpp11_v2/src/modules/pong/PongAI.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/PongAI.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/pong/PongAI.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -76,7 +76,7 @@
*/
PongAI::~PongAI()
{
- for (std::list<std::pair<Timer*, char> >::iterator it = this->reactionTimers_.begin(); it != this->reactionTimers_.end(); ++it)
+ for (std::list<std::pair<Timer*, char>>::iterator it = this->reactionTimers_.begin(); it != this->reactionTimers_.end(); ++it)
it->first->destroy();
}
Modified: code/branches/cpp11_v2/src/modules/pong/PongAI.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/PongAI.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/pong/PongAI.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -88,7 +88,7 @@
float relHysteresisOffset_; //!< A hysteresis offset.
float strength_; //!< The strength of the AI. Ranging from 0 to 1.
- std::list<std::pair<Timer*, char> > reactionTimers_; //!< A list of reaction timers and the directions that take effect when their timer expires.
+ std::list<std::pair<Timer*, char>> reactionTimers_; //!< A list of reaction timers and the directions that take effect when their timer expires.
char movement_; //!< The planned movement.
char oldMove_; //!< The previous movement.
bool bOscillationAvoidanceActive_; //!< Boolean, to avoid oscillations.
Modified: code/branches/cpp11_v2/src/modules/tetris/Tetris.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/tetris/Tetris.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/tetris/Tetris.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -103,7 +103,7 @@
this->futureBrick_ = nullptr;
}
- for (std::list<StrongPtr<TetrisStone> >::iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
+ for (std::list<StrongPtr<TetrisStone>>::iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
(*it)->destroy();
this->stones_.clear();
}
@@ -135,7 +135,7 @@
else if(position.x > (this->center_->getWidth()-0.5)*this->center_->getStoneSize()) //!< If the stone touches the right edge of the level
return false;
- for(std::list<StrongPtr<TetrisStone> >::const_iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
+ for(std::list<StrongPtr<TetrisStone>>::const_iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
{
const Vector3& currentStonePosition = (*it)->getPosition(); //!< Saves the position of the currentStone
@@ -191,7 +191,7 @@
assert(stone);
// check for collisions with all stones
- for(std::list<StrongPtr<TetrisStone> >::const_iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
+ for(std::list<StrongPtr<TetrisStone>>::const_iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
{
//Vector3 currentStonePosition = rotateVector((*it)->getPosition(), this->activeBrick_->getRotationCount());
const Vector3& currentStonePosition = (*it)->getPosition(); //!< Saves the position of the currentStone
@@ -468,9 +468,9 @@
for (unsigned int row = 0; row < this->center_->getHeight(); row++)
{
stonesPerRow = 0;
- for(std::list<StrongPtr<TetrisStone> >::iterator it = this->stones_.begin(); it != this->stones_.end(); )
+ for(std::list<StrongPtr<TetrisStone>>::iterator it = this->stones_.begin(); it != this->stones_.end(); )
{
- std::list<StrongPtr<TetrisStone> >::iterator it_temp = it++;
+ std::list<StrongPtr<TetrisStone>>::iterator it_temp = it++;
correctPosition = static_cast<unsigned int>(((*it_temp)->getPosition().y - 5)/this->center_->getStoneSize());
if(correctPosition == row)
{
@@ -490,7 +490,7 @@
void Tetris::clearRow(unsigned int row)
{// clear the full row
- for(std::list<StrongPtr<TetrisStone> >::iterator it = this->stones_.begin(); it != this->stones_.end(); )
+ for(std::list<StrongPtr<TetrisStone>>::iterator it = this->stones_.begin(); it != this->stones_.end(); )
{
if(static_cast<unsigned int>(((*it)->getPosition().y - 5)/this->center_->getStoneSize()) == row)
{
@@ -501,7 +501,7 @@
++it;
}
// adjust height of stones above the deleted row //TODO: check if this could be a source of a bug.
- for(std::list<StrongPtr<TetrisStone> >::iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
+ for(std::list<StrongPtr<TetrisStone>>::iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
{
if(static_cast<unsigned int>(((*it)->getPosition().y - 5)/this->center_->getStoneSize()) > row)
(*it)->setPosition((*it)->getPosition()-Vector3(0,10,0));
Modified: code/branches/cpp11_v2/src/modules/tetris/Tetris.h
===================================================================
--- code/branches/cpp11_v2/src/modules/tetris/Tetris.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/tetris/Tetris.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -92,7 +92,7 @@
PlayerInfo* player_;
WeakPtr<TetrisCenterpoint> center_; //!< The playing field.
- std::list<StrongPtr<TetrisStone> > stones_; //!< A list of all stones in play.
+ std::list<StrongPtr<TetrisStone>> stones_; //!< A list of all stones in play.
WeakPtr<TetrisBrick> activeBrick_;
WeakPtr<TetrisBrick> futureBrick_;
Modified: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -286,7 +286,7 @@
}
}
- for (std::list<WeakPtr<TowerDefenseEnemy> >::iterator it = enemies_.begin(); it != enemies_.end(); )
+ for (std::list<WeakPtr<TowerDefenseEnemy>>::iterator it = enemies_.begin(); it != enemies_.end(); )
{
if (*it == nullptr)
{
Modified: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -86,9 +86,9 @@
int credit_;
int waveNumber_;
int lifes_;
- std::list<orxonox::WeakPtr<TowerDefenseEnemy> > enemies_;
+ std::list<orxonox::WeakPtr<TowerDefenseEnemy>> enemies_;
TowerDefenseField* fields_[16][16];
- std::vector<orxonox::WeakPtr<TowerDefenseField> > waypoints_;
+ std::vector<orxonox::WeakPtr<TowerDefenseField>> waypoints_;
Vector3 endpoint_;
Vector3 offset_;
};
Modified: code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -88,7 +88,7 @@
//WAYPOINT DATA
- std::vector<WeakPtr<WorldEntity> > waypoints_;
+ std::vector<WeakPtr<WorldEntity>> waypoints_;
size_t currentWaypoint_;
float squaredaccuracy_;
WorldEntity* defaultWaypoint_;
Modified: code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -98,7 +98,7 @@
bool bReadyToSpawn_;
Controller* controller_;
ControllableEntity* controllableEntity_;
- std::vector< WeakPtr<ControllableEntity> > previousControllableEntity_; //!< List of the previous ControllableEntities if repeatedly startTemporary control was called. The ControllableEntity at the back is the most recent.
+ std::vector<WeakPtr<ControllableEntity>> previousControllableEntity_; //!< List of the previous ControllableEntities if repeatedly startTemporary control was called. The ControllableEntity at the back is the most recent.
unsigned int controllableEntityID_;
const GametypeInfo* gtinfo_;
Modified: code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -61,7 +61,7 @@
OverlayGroup::~OverlayGroup()
{
- for (std::set< StrongPtr<OrxonoxOverlay> >::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
+ for (std::set<StrongPtr<OrxonoxOverlay>>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
(*it)->destroy();
this->hudElements_.clear();
}
@@ -85,7 +85,7 @@
//! Scales every element in the set.
void OverlayGroup::setScale(const Vector2& scale)
{
- for (std::set< StrongPtr<OrxonoxOverlay> >::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
+ for (std::set<StrongPtr<OrxonoxOverlay>>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
(*it)->scale(scale / this->scale_);
this->scale_ = scale;
}
@@ -93,7 +93,7 @@
//! Scrolls every element in the set.
void OverlayGroup::setScroll(const Vector2& scroll)
{
- for (std::set< StrongPtr<OrxonoxOverlay> >::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
+ for (std::set<StrongPtr<OrxonoxOverlay>>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
(*it)->scroll(scroll - this->scroll_);
this->scroll_ = scroll;
}
@@ -132,7 +132,7 @@
{
if (index < this->hudElements_.size())
{
- std::set< StrongPtr<OrxonoxOverlay> >::const_iterator it = hudElements_.begin();
+ std::set<StrongPtr<OrxonoxOverlay>>::const_iterator it = hudElements_.begin();
for (unsigned int i = 0; i != index; ++it, ++i)
;
return *it;
@@ -146,7 +146,7 @@
{
SUPER( OverlayGroup, changedVisibility );
- for (std::set< StrongPtr<OrxonoxOverlay> >::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
+ for (std::set<StrongPtr<OrxonoxOverlay>>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
(*it)->changedVisibility(); //inform all Child Overlays that our visibility has changed
}
@@ -154,7 +154,7 @@
{
this->owner_ = owner;
- for (std::set< StrongPtr<OrxonoxOverlay> >::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
+ for (std::set<StrongPtr<OrxonoxOverlay>>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
(*it)->setOwner(owner);
}
Modified: code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -64,7 +64,7 @@
static void scaleGroup(const std::string& name, float scale);
static void scrollGroup(const std::string& name, const Vector2& scroll);
- inline const std::set< StrongPtr<OrxonoxOverlay> >& getOverlays() const
+ inline const std::set<StrongPtr<OrxonoxOverlay>>& getOverlays() const
{ return this->hudElements_; }
virtual void changedVisibility();
@@ -90,7 +90,7 @@
OrxonoxOverlay* getElement(unsigned int index);
private:
- std::set< StrongPtr<OrxonoxOverlay> > hudElements_; //!< Contains all the OrxonoxOverlays of the this group.
+ std::set<StrongPtr<OrxonoxOverlay>> hudElements_; //!< Contains all the OrxonoxOverlays of the this group.
Vector2 scale_; //!< Current scale (independent of the elements).
Vector2 scroll_; //!< Current scrolling offset.
BaseObject* owner_; //!< The owner of this OverlayGroup
Modified: code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -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<shared_ptr<SoundBuffer>>::iterator poolIterator)
: filename_(filename)
, audioBuffer_(AL_NONE)
, poolIterator_(poolIterator)
Modified: code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -63,7 +63,7 @@
{ return this->filename_; }
private:
- SoundBuffer(const std::string& filename, std::list<shared_ptr<SoundBuffer> >::iterator poolIterator);
+ SoundBuffer(const std::string& filename, std::list<shared_ptr<SoundBuffer>>::iterator poolIterator);
#if !defined(_MSC_VER) || _MSC_VER >= 1500
~SoundBuffer();
#endif
@@ -72,7 +72,7 @@
std::string filename_;
ALuint audioBuffer_;
- std::list<shared_ptr<SoundBuffer> >::iterator poolIterator_;
+ std::list<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-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/orxonox/sound/SoundManager.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -421,7 +421,7 @@
void SoundManager::fadeIn(AmbientSound* sound)
{
// If we're already fading out --> remove that
- for (std::list<StrongPtr<AmbientSound> >::iterator it = this->fadeOutList_.begin(); it != this->fadeOutList_.end(); it++)
+ for (std::list<StrongPtr<AmbientSound>>::iterator it = this->fadeOutList_.begin(); it != this->fadeOutList_.end(); it++)
{
if (*it == sound)
{
@@ -437,7 +437,7 @@
void SoundManager::fadeOut(AmbientSound* sound)
{
// If we're already fading in --> remove that
- for (std::list<StrongPtr<AmbientSound> >::iterator it = this->fadeInList_.begin(); it != this->fadeInList_.end(); it++)
+ for (std::list<StrongPtr<AmbientSound>>::iterator it = this->fadeInList_.begin(); it != this->fadeInList_.end(); it++)
{
if (*it == sound)
{
@@ -460,7 +460,7 @@
}
// FADE IN
- for (std::list<StrongPtr<AmbientSound> >::iterator it= this->fadeInList_.begin(); it != this->fadeInList_.end(); )
+ for (std::list<StrongPtr<AmbientSound>>::iterator it= this->fadeInList_.begin(); it != this->fadeInList_.end(); )
{
if ((*it)->getVolume() + this->crossFadeStep_*dt > 1.0f)
{
@@ -475,7 +475,7 @@
}
// FADE OUT
- for (std::list<StrongPtr<AmbientSound> >::iterator it = this->fadeOutList_.begin(); it != this->fadeOutList_.end(); )
+ for (std::list<StrongPtr<AmbientSound>>::iterator it = this->fadeOutList_.begin(); it != this->fadeOutList_.end(); )
{
if ((*it)->getVolume() - this->crossFadeStep_*dt < 0.0f)
{
@@ -605,7 +605,7 @@
assert((*it) != source);
#endif
this->availableSoundSources_.push_back(source);
- for (std::vector<std::pair<ALuint, BaseSound*> >::iterator it = this->usedSoundSources_.begin();
+ for (std::vector<std::pair<ALuint, BaseSound*>>::iterator it = this->usedSoundSources_.begin();
it != this->usedSoundSources_.end(); ++it)
{
if (it->first == source)
Modified: code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -124,12 +124,12 @@
ALCcontext* context_;
// Ambient sound related
- typedef std::list<std::pair<AmbientSound*, bool> > AmbientList;
+ typedef std::list<std::pair<AmbientSound*, bool>> AmbientList;
AmbientList ambientSounds_;
//! Absolute change per second (0.1 means 10% of the nominal volume) for cross fading
float crossFadeStep_;
- std::list<StrongPtr<AmbientSound> > fadeInList_;
- std::list<StrongPtr<AmbientSound> > fadeOutList_;
+ std::list<StrongPtr<AmbientSound>> fadeInList_;
+ std::list<StrongPtr<AmbientSound>> fadeOutList_;
// Volume related
float volume_[3];
@@ -138,16 +138,16 @@
// 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<shared_ptr<SoundBuffer>> EffectsPoolList;
EffectsPoolList effectsPool_;
- typedef std::map<std::string, shared_ptr<SoundBuffer> > SoundBufferMap;
+ typedef std::map<std::string, shared_ptr<SoundBuffer>> SoundBufferMap;
SoundBufferMap soundBuffers_;
// Sound source related
unsigned int minSources_;
unsigned int maxSources_;
std::vector<ALuint> availableSoundSources_;
- std::vector<std::pair<ALuint, BaseSound*> > usedSoundSources_;
+ std::vector<std::pair<ALuint, BaseSound*>> usedSoundSources_;
bool bDestructorCalled_; ///< Becomes true if the destructor is called - used to prevent ambient sounds from registering after the lists were cleared
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -107,7 +107,7 @@
if (this->camera_)
this->camera_->destroy();
- for (std::list<StrongPtr<CameraPosition> >::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
+ for (std::list<StrongPtr<CameraPosition>>::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
(*it)->destroy();
if (this->getScene()->getSceneManager())
@@ -164,7 +164,7 @@
CameraPosition* ControllableEntity::getCameraPosition(unsigned int index) const
{
unsigned int i = 0;
- for (std::list<StrongPtr<CameraPosition> >::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
+ for (std::list<StrongPtr<CameraPosition>>::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
{
if (i == index)
return (*it);
@@ -179,7 +179,7 @@
return 0;
unsigned int counter = 0;
- for (std::list<StrongPtr<CameraPosition> >::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
+ for (std::list<StrongPtr<CameraPosition>>::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
{
if ((*it) == this->currentCameraPosition_)
break;
@@ -218,7 +218,7 @@
}
else if (this->cameraPositions_.size() > 0)
{
- for (std::list<StrongPtr<CameraPosition> >::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
+ for (std::list<StrongPtr<CameraPosition>>::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
{
if ((*it) == this->camera_->getParent())
{
@@ -476,7 +476,7 @@
WorldEntity* parent = this->getParent();
if (parent)
{
- for (std::list<StrongPtr<CameraPosition> >::iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
+ for (std::list<StrongPtr<CameraPosition>>::iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
if ((*it)->getIsAbsolute())
parent->attach((*it));
}
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h 2015-11-07 09:23:42 UTC (rev 10769)
@@ -120,7 +120,7 @@
void addCameraPosition(CameraPosition* position);
CameraPosition* getCameraPosition(unsigned int index) const;
- inline const std::list<StrongPtr<CameraPosition> >& getCameraPositions() const
+ inline const std::list<StrongPtr<CameraPosition>>& getCameraPositions() const
{ return this->cameraPositions_; }
unsigned int getCurrentCameraIndex() const;
bool setCameraPosition(unsigned int index);
@@ -241,7 +241,7 @@
Camera* camera_;
bool bMouseLook_;
float mouseLookSpeed_;
- std::list<StrongPtr<CameraPosition> > cameraPositions_;
+ std::list<StrongPtr<CameraPosition>> cameraPositions_;
CameraPosition* currentCameraPosition_;
std::string cameraPositionTemplate_;
Controller* xmlcontroller_;
Modified: code/branches/cpp11_v2/test/util/SharedPtrTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/SharedPtrTest.cc 2015-11-06 21:54:34 UTC (rev 10768)
+++ code/branches/cpp11_v2/test/util/SharedPtrTest.cc 2015-11-07 09:23:42 UTC (rev 10769)
@@ -177,7 +177,7 @@
TestChildClassMock* pointer = new TestChildClassMock();
SharedPtr<TestClass> test = pointer;
- std::vector<SharedPtr<TestClass> > tests;
+ std::vector<SharedPtr<TestClass>> tests;
for (size_t i = 0; i < 100; ++i)
tests.push_back(SharedPtr<TestClass>(test));
More information about the Orxonox-commit
mailing list