Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 7, 2015, 10:23:42 AM (9 years ago)
Author:
landauf
Message:

no space needed anymore between closing template brackets ('> >' → '>>')

Location:
code/branches/cpp11_v2/src/libraries/core
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h

    r10768 r10769  
    157157
    158158        private:
    159             std::stack<std::pair<std::list<ClassTreeMaskNode*>::iterator, std::list<ClassTreeMaskNode*>::iterator> > nodes_;    ///< A stack to store list-iterators
     159            std::stack<std::pair<std::list<ClassTreeMaskNode*>::iterator, std::list<ClassTreeMaskNode*>::iterator>> nodes_;    ///< A stack to store list-iterators
    160160            std::list<ClassTreeMaskNode*> rootlist_;                                                                            ///< A list for internal use (it only stores the root-node)
    161161    };
    … …  
    298298            void create(ClassTreeMaskNode* node);
    299299
    300             std::list<std::pair<const Identifier*, bool> >           subclasses_;       ///< A list of all Identifiers through which objects the iterator should iterate
    301             std::list<std::pair<const Identifier*, bool> >::iterator subclassIterator_; ///< The current class of the iterator
    302             Iterator<BaseObject>                                     objectIterator_;   ///< The current object of the iterator
     300            std::list<std::pair<const Identifier*, bool>>           subclasses_;       ///< A list of all Identifiers through which objects the iterator should iterate
     301            std::list<std::pair<const Identifier*, bool>>::iterator subclassIterator_; ///< The current class of the iterator
     302            Iterator<BaseObject>                                    objectIterator_;   ///< The current object of the iterator
    303303    };
    304304}

  • code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc

    r10768 r10769  
    143143
    144144        // Create directories to avoid problems when opening files in non existent folders.
    145         std::vector<std::pair<bf::path, std::string> > directories;
     145        std::vector<std::pair<bf::path, std::string>> directories;
    146146        directories.push_back(std::make_pair(bf::path(configPath_), std::string("config")));
    147147        directories.push_back(std::make_pair(bf::path(logPath_), std::string("log")));
    148148
    149         for (std::vector<std::pair<bf::path, std::string> >::iterator it = directories.begin();
     149        for (std::vector<std::pair<bf::path, std::string>>::iterator it = directories.begin();
    150150            it != directories.end(); ++it)
    151151        {

  • code/branches/cpp11_v2/src/libraries/core/EventIncludes.h

    r8729 r10769  
    8686
    8787#define XMLPortEventStateIntern(name, classname, statename, xmlelement, mode) \
    88     static orxonox::ExecutorMemberPtr<classname> xmlsetfunctor##name = orxonox::createExecutor(orxonox::createFunctor(&classname::addEventSource), std::string( #classname ) + "::" + "addEventSource" + '(' + statename + ')').cast<orxonox::ExecutorMember<classname> >(); \
    89     static orxonox::ExecutorMemberPtr<classname> xmlgetfunctor##name = orxonox::createExecutor(orxonox::createFunctor(&classname::getEventSource), std::string( #classname ) + "::" + "getEventSource" + '(' + statename + ')').cast<orxonox::ExecutorMember<classname> >(); \
     88    static orxonox::ExecutorMemberPtr<classname> xmlsetfunctor##name = orxonox::createExecutor(orxonox::createFunctor(&classname::addEventSource), std::string( #classname ) + "::" + "addEventSource" + '(' + statename + ')').cast<orxonox::ExecutorMember<classname>>(); \
     89    static orxonox::ExecutorMemberPtr<classname> xmlgetfunctor##name = orxonox::createExecutor(orxonox::createFunctor(&classname::getEventSource), std::string( #classname ) + "::" + "getEventSource" + '(' + statename + ')').cast<orxonox::ExecutorMember<classname>>(); \
    9090    xmlsetfunctor##name->setDefaultValue(1, statename); \
    9191    xmlgetfunctor##name->setDefaultValue(1, statename); \

  • code/branches/cpp11_v2/src/libraries/core/GUIManager.cc

    r10768 r10769  
    165165                d_caching = false;
    166166
    167                 std::vector<std::pair<CEGUI::String, CEGUI::LoggingLevel> >::iterator it = d_cache.begin();
     167                std::vector<std::pair<CEGUI::String, CEGUI::LoggingLevel>>::iterator it = d_cache.begin();
    168168
    169169                while (it != d_cache.end())

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

    r10768 r10769  
    7373        std::string name_;
    7474        weak_ptr<GameStateTreeNode> parent_;
    75         std::vector<shared_ptr<GameStateTreeNode> > children_;
     75        std::vector<shared_ptr<GameStateTreeNode>> children_;
    7676    };
    7777
    … …  
    384384
    385385        // Check children first
    386         std::vector<shared_ptr<GameStateTreeNode> > requestedNodes;
     386        std::vector<shared_ptr<GameStateTreeNode>> requestedNodes;
    387387        for (unsigned int i = 0; i < lastRequestedNode->children_.size(); ++i)
    388388        {
    … …  
    454454    {
    455455        // Split string into pieces of the form whitespacesText
    456         std::vector<std::pair<std::string, int> > stateStrings;
     456        std::vector<std::pair<std::string, int>> stateStrings;
    457457        size_t pos = 0;
    458458        size_t startPos = 0;
    … …  
    473473
    474474        // Parse elements recursively
    475         std::vector<std::pair<std::string, int> >::const_iterator begin = stateStrings.begin();
     475        std::vector<std::pair<std::string, int>>::const_iterator begin = stateStrings.begin();
    476476        parseStates(begin, this->rootStateNode_);
    477477    }
    … …  
    479479    /*** Internal ***/
    480480
    481     void Game::parseStates(std::vector<std::pair<std::string, int> >::const_iterator& it, shared_ptr<GameStateTreeNode> currentNode)
     481    void Game::parseStates(std::vector<std::pair<std::string, int>>::const_iterator& it, shared_ptr<GameStateTreeNode> currentNode)
    482482    {
    483483        SubString tokens(it->first, ",");
    484         std::vector<std::pair<std::string, int> >::const_iterator startIt = it;
     484        std::vector<std::pair<std::string, int>>::const_iterator startIt = it;
    485485
    486486        for (unsigned int i = 0; i < tokens.size(); ++i)
    … …  
    620620    }
    621621
    622     /*static*/ std::map<std::string, shared_ptr<Game::GameStateFactory> >& Game::GameStateFactory::getFactories()
    623     {
    624         static std::map<std::string, shared_ptr<GameStateFactory> > factories;
     622    /*static*/ std::map<std::string, shared_ptr<Game::GameStateFactory>>& Game::GameStateFactory::getFactories()
     623    {
     624        static std::map<std::string, shared_ptr<GameStateFactory>> factories;
    625625        return factories;
    626626    }
    … …  
    628628    /*static*/ shared_ptr<GameState> Game::GameStateFactory::fabricate(const GameStateInfo& info)
    629629    {
    630         std::map<std::string, shared_ptr<Game::GameStateFactory> >::const_iterator it = getFactories().find(info.className);
     630        std::map<std::string, shared_ptr<Game::GameStateFactory>>::const_iterator it = getFactories().find(info.className);
    631631        assert(it != getFactories().end());
    632632        return it->second->fabricateInternal(info);

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

    r10624 r10769  
    8484    { // tolua_export
    8585        friend class Singleton<Game>;
    86         typedef std::vector<shared_ptr<GameState> > GameStateVector;
    87         typedef std::map<std::string, shared_ptr<GameState> > GameStateMap;
     86        typedef std::vector<shared_ptr<GameState>> GameStateVector;
     87        typedef std::map<std::string, shared_ptr<GameState>> GameStateMap;
    8888        typedef shared_ptr<GameStateTreeNode> GameStateTreeNodePtr;
    8989
    … …  
    129129
    130130            virtual shared_ptr<GameState> fabricateInternal(const GameStateInfo& info) = 0;
    131             static std::map<std::string, shared_ptr<GameStateFactory> >& getFactories();
     131            static std::map<std::string, shared_ptr<GameStateFactory>>& getFactories();
    132132        };
    133133        template <class T>
    … …  
    150150        void unloadGraphics(bool loadGraphicsManagerWithoutRenderer = true);
    151151
    152         void parseStates(std::vector<std::pair<std::string, int> >::const_iterator& it, shared_ptr<GameStateTreeNode> currentNode);
     152        void parseStates(std::vector<std::pair<std::string, int>>::const_iterator& it, shared_ptr<GameStateTreeNode> currentNode);
    153153        bool checkState(const std::string& name) const;
    154154        void loadState(const std::string& name);

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

    r10768 r10769  
    7373        std::string xmlInput;
    7474
    75         shared_ptr<std::vector<std::vector<std::pair<std::string, size_t> > > > lineTrace(new std::vector<std::vector<std::pair<std::string, size_t> > >());
     75        shared_ptr<std::vector<std::vector<std::pair<std::string, size_t>>>> lineTrace(new std::vector<std::vector<std::pair<std::string, size_t>>>());
    7676        lineTrace->reserve(1000); //arbitrary number
    7777
    … …  
    163163                    if (line <= lineTrace->size())
    164164                    {
    165                         std::vector<std::pair<std::string, size_t> > linesources = lineTrace->at(line - 1);
     165                        std::vector<std::pair<std::string, size_t>> linesources = lineTrace->at(line - 1);
    166166                        std::ostringstream message;
    167167                        message << "Possible sources of error:" << endl;
    168                         for (std::vector<std::pair<std::string, size_t> >::iterator it = linesources.begin(); it != linesources.end(); ++it)
     168                        for (std::vector<std::pair<std::string, size_t>>::iterator it = linesources.begin(); it != linesources.end(); ++it)
    169169                        {
    170170                            message << it->first << ", Line " << it->second << endl;

  • code/branches/cpp11_v2/src/libraries/core/Loader.h

    r10624 r10769  
    6767            static bool getLuaTags(const std::string& text, std::map<size_t, bool>& luaTags);
    6868
    69             std::vector<std::pair<const XMLFile*, ClassTreeMask> > files_;
     69            std::vector<std::pair<const XMLFile*, ClassTreeMask>> files_;
    7070
    7171            static Loader* singletonPtr_s;

  • code/branches/cpp11_v2/src/libraries/core/LuaState.cc

    r10765 r10769  
    245245            //Note: due to newlines etc., it's possible that one line consists of parts of
    246246            //      multiple, different files
    247             std::vector<std::vector<std::pair<std::string, size_t> > >::reverse_iterator it = lineTrace_->rbegin();
     247            std::vector<std::vector<std::pair<std::string, size_t>>>::reverse_iterator it = lineTrace_->rbegin();
    248248            std::pair<std::string, size_t> temppair = std::make_pair(filename, line);
    249249            //Avoid duplicate entries. This could happen if there were lua blocks on the same line
    … …  
    259259            {
    260260                //Add the new line to the trace map
    261                 lineTrace_->push_back(std::vector<std::pair<std::string, size_t> >());
     261                lineTrace_->push_back(std::vector<std::pair<std::string, size_t>>());
    262262                //Add the source of the line at the end
    263263                lineTrace_->rbegin()->push_back(std::make_pair(filename, line + i));

  • code/branches/cpp11_v2/src/libraries/core/LuaState.h

    r10265 r10769  
    9494        void clearOutput() { output_.clear(); } // tolua_export
    9595
    96         void setTraceMap(shared_ptr<std::vector<std::vector<std::pair<std::string, size_t> > > > map)
    97             { map->push_back(std::vector<std::pair<std::string, size_t> >()); lineTrace_ = map; }
     96        void setTraceMap(shared_ptr<std::vector<std::vector<std::pair<std::string, size_t>>>> map)
     97            { map->push_back(std::vector<std::pair<std::string, size_t>>()); lineTrace_ = map; }
    9898
    9999        void setIncludeParser(std::string (*function)(const std::string&)) { includeParseFunction_ = function; }
    … …  
    116116    private:
    117117        shared_ptr<ResourceInfo> getFileInfo(const std::string& filename);
    118         shared_ptr<std::vector<std::vector<std::pair<std::string, size_t> > > > lineTrace_;
     118        shared_ptr<std::vector<std::vector<std::pair<std::string, size_t>>>> lineTrace_;
    119119       
    120120        std::stringstream output_;

  • code/branches/cpp11_v2/src/libraries/core/class/Identifiable.h

    r10765 r10769  
    121121
    122122            /// 'Fast map' that holds this-pointers of all derived types
    123             std::vector<std::pair<unsigned int, void*> > objectPointers_;
     123            std::vector<std::pair<unsigned int, void*>> objectPointers_;
    124124    };
    125125}

  • code/branches/cpp11_v2/src/libraries/core/class/Identifier.h

    r10768 r10769  
    321321            void updateConfigValues(bool updateChildren, Identifiable*) const;
    322322
    323             static WeakPtr<ClassIdentifier<T> > classIdentifier_s;
     323            static WeakPtr<ClassIdentifier<T>> classIdentifier_s;
    324324    };
    325325
    326326    template <class T>
    327     WeakPtr<ClassIdentifier<T> > ClassIdentifier<T>::classIdentifier_s;
     327    WeakPtr<ClassIdentifier<T>> ClassIdentifier<T>::classIdentifier_s;
    328328
    329329    /**

  • code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.h

    r10624 r10769  
    111111            /// 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
    112112            /// a consequence of this, e.g. nested member objects).
    113             std::map<Identifiable*, std::list<const Identifier*> > identifierTraceOfNewObject_;
     113            std::map<Identifiable*, std::list<const Identifier*>> identifierTraceOfNewObject_;
    114114            Identifier* recordTraceForIdentifier_; //!< The identifier for which we want to record the trace of identifiers during object creation. If null, no trace is recorded.
    115115

  • code/branches/cpp11_v2/src/libraries/core/command/ArgumentCompletionFunctions.cc

    r10624 r10769  
    9999
    100100                // get all the groups that are visible (except the shortcut group "")
    101                 const std::map<std::string, std::map<std::string, ConsoleCommand*> >& commands = ConsoleCommandManager::getInstance().getCommands();
    102                 for (std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = commands.begin(); it_group != commands.end(); ++it_group)
     101                const std::map<std::string, std::map<std::string, ConsoleCommand*>>& commands = ConsoleCommandManager::getInstance().getCommands();
     102                for (std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = commands.begin(); it_group != commands.end(); ++it_group)
    103103                    if (groupIsVisible(it_group->second, bOnlyShowHidden) && it_group->first != "" && (fragmentLC == "" || getLowercase(it_group->first).find(fragmentLC) == 0))
    104104                        groupList.push_back(ArgumentCompletionListElement(it_group->first, getLowercase(it_group->first)));
    105105
    106106                // now add all shortcuts (in group "")
    107                 std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = commands.find("");
     107                std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = commands.find("");
    108108                if (it_group != commands.end())
    109109                {
    … …  
    138138
    139139                // find the iterator of the given group
    140                 std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = ConsoleCommandManager::getInstance().getCommands().begin();
     140                std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = ConsoleCommandManager::getInstance().getCommands().begin();
    141141                for ( ; it_group != ConsoleCommandManager::getInstance().getCommands().end(); ++it_group)
    142142                    if (getLowercase(it_group->first) == groupLC)
    … …  
    212212            if (tokens.size() == 1)
    213213            {
    214                 std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = ConsoleCommandManager::getInstance().getCommands().find(tokens[0]);
     214                std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = ConsoleCommandManager::getInstance().getCommands().find(tokens[0]);
    215215                if (it_group != ConsoleCommandManager::getInstance().getCommands().end())
    216216                    return detail::_subcommands(fragment, tokens[0], true);

  • code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc

    r10768 r10769  
    306306                // the user typed 1-2 arguments, check what he tried to type and print a suitable error
    307307                std::string groupLC = getLowercase(this->getToken(0));
    308                 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)
     308                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)
    309309                    if (it_group->first == groupLC)
    310310                        return std::string("Error: There is no command in group \"") + this->getToken(0) + "\" starting with \"" + this->getToken(1) + "\".";
    … …  
    328328
    329329        // iterate through all groups and their commands and calculate the distance to the current command. keep the best.
    330         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)
     330        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)
    331331        {
    332332            if (it_group->first != "")
    … …  
    346346
    347347        // now also iterate through all shortcuts and keep the best if it's better than the one found above.
    348         std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = ConsoleCommandManager::getInstance().getCommandsLC().find("");
     348        std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = ConsoleCommandManager::getInstance().getCommandsLC().find("");
    349349        if (it_group !=  ConsoleCommandManager::getInstance().getCommandsLC().end())
    350350        {

  • code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.cc

    r10768 r10769  
    5050    {
    5151        // find the group
    52         std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = this->commandMap_.find(group);
     52        std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = this->commandMap_.find(group);
    5353        if (it_group != this->commandMap_.end())
    5454        {
    … …  
    8383
    8484        // find the group
    85         std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = this->commandMapLC_.find(groupLC);
     85        std::map<std::string, std::map<std::string, ConsoleCommand*>>::const_iterator it_group = this->commandMapLC_.find(groupLC);
    8686        if (it_group != this->commandMapLC_.end())
    8787        {
    … …  
    146146    {
    147147        // iterate through all groups
    148         for (std::map<std::string, std::map<std::string, ConsoleCommand*> >::iterator it_group = this->commandMap_.begin(); it_group != this->commandMap_.end(); )
     148        for (std::map<std::string, std::map<std::string, ConsoleCommand*>>::iterator it_group = this->commandMap_.begin(); it_group != this->commandMap_.end(); )
    149149        {
    150150            // iterate through all commands of each group
    … …  
    168168
    169169        // iterate through all groups
    170         for (std::map<std::string, std::map<std::string, ConsoleCommand*> >::iterator it_group = this->commandMapLC_.begin(); it_group != this->commandMapLC_.end(); )
     170        for (std::map<std::string, std::map<std::string, ConsoleCommand*>>::iterator it_group = this->commandMapLC_.begin(); it_group != this->commandMapLC_.end(); )
    171171        {
    172172            // iterate through all commands of each group

  • code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.h

    r10624 r10769  
    5454
    5555            /// Returns the map with all groups and commands.
    56             inline const std::map<std::string, std::map<std::string, ConsoleCommand*> >& getCommands()
     56            inline const std::map<std::string, std::map<std::string, ConsoleCommand*>>& getCommands()
    5757                { return this->commandMap_; }
    5858            /// Returns the map with all groups and commands in lowercase.
    59             inline const std::map<std::string, std::map<std::string, ConsoleCommand*> >& getCommandsLC()
     59            inline const std::map<std::string, std::map<std::string, ConsoleCommand*>>& getCommandsLC()
    6060                { return this->commandMapLC_; }
    6161
    … …  
    7171
    7272        private:
    73             std::map<std::string, std::map<std::string, ConsoleCommand*> > commandMap_;
    74             std::map<std::string, std::map<std::string, ConsoleCommand*> > commandMapLC_;
     73            std::map<std::string, std::map<std::string, ConsoleCommand*>> commandMap_;
     74            std::map<std::string, std::map<std::string, ConsoleCommand*>> commandMapLC_;
    7575
    7676            static ConsoleCommandManager* singletonPtr_s;

  • code/branches/cpp11_v2/src/libraries/core/command/ExecutorPtr.h

    r7401 r10769  
    6666            inline ExecutorMemberPtr() : SharedChildPtr<ExecutorMember<T>, ExecutorPtr>() {}
    6767            inline ExecutorMemberPtr(ExecutorMember<T>* pointer) : SharedChildPtr<ExecutorMember<T>, ExecutorPtr>(pointer) {}
    68             inline ExecutorMemberPtr(const SharedPtr<ExecutorMember<T> >& other) : SharedChildPtr<ExecutorMember<T>, ExecutorPtr>(other) {}
     68            inline ExecutorMemberPtr(const SharedPtr<ExecutorMember<T>>& other) : SharedChildPtr<ExecutorMember<T>, ExecutorPtr>(other) {}
    6969    };
    7070}

  • code/branches/cpp11_v2/src/libraries/core/command/FunctorPtr.h

    r7401 r10769  
    6565            inline FunctorMemberPtr() : SharedChildPtr<FunctorMember<T>, FunctorPtr>() {}
    6666            inline FunctorMemberPtr(FunctorMember<T>* pointer) : SharedChildPtr<FunctorMember<T>, FunctorPtr>(pointer) {}
    67             inline FunctorMemberPtr(const SharedPtr<FunctorMember<T> >& other) : SharedChildPtr<FunctorMember<T>, FunctorPtr>(other) {}
     67            inline FunctorMemberPtr(const SharedPtr<FunctorMember<T>>& other) : SharedChildPtr<FunctorMember<T>, FunctorPtr>(other) {}
    6868    };
    6969
    … …  
    7373    /// 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.
    7474    template <class F, class T>
    75     class FunctorPointerPtr : public SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T> >
     75    class FunctorPointerPtr : public SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T>>
    7676    {
    7777        public:
    78             inline FunctorPointerPtr() : SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T> >() {}
    79             inline FunctorPointerPtr(FunctorPointer<F, T>* pointer) : SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T> >(pointer) {}
    80             inline FunctorPointerPtr(const SharedPtr<FunctorPointer<F, T> >& other) : SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T> >(other) {}
     78            inline FunctorPointerPtr() : SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T>>() {}
     79            inline FunctorPointerPtr(FunctorPointer<F, T>* pointer) : SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T>>(pointer) {}
     80            inline FunctorPointerPtr(const SharedPtr<FunctorPointer<F, T>>& other) : SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T>>(other) {}
    8181    };
    8282}

  • code/branches/cpp11_v2/src/libraries/core/command/Shell.h

    r10624 r10769  
    128128            const std::string& getInput() const;
    129129
    130             typedef std::list<std::pair<std::string, LineType> > LineList;
     130            typedef std::list<std::pair<std::string, LineType>> LineList;
    131131            LineList::const_iterator getNewestLineIterator() const;
    132132            LineList::const_iterator getEndIterator() const;

  • code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h

    r9684 r10769  
    6363
    6464        public:
    65             typedef std::multimap<std::string, std::pair<std::string, ConfigValueContainer*> > ContainerMap;
     65            typedef std::multimap<std::string, std::pair<std::string, ConfigValueContainer*>> ContainerMap;
    6666
    6767            SettingsConfigFile(const std::string& filename);

  • code/branches/cpp11_v2/src/libraries/core/input/InputManager.h

    r10765 r10769  
    225225        std::vector<InputState*>            activeStatesTicked_;   //!< Like activeStates_, but only contains the ones that currently receive events
    226226
    227         std::vector<boost::function<void ()> > callBuffer_;        //!< Caches all calls from InputStates to be executed afterwards (see preUpdate)
     227        std::vector<boost::function<void ()>> callBuffer_;        //!< Caches all calls from InputStates to be executed afterwards (see preUpdate)
    228228
    229229        static InputManager*                singletonPtr_s;        //!< Pointer reference to the singleton

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

    r10765 r10769  
    127127        };
    128128        //! Actual key bindings for joy stick buttons
    129         std::vector<shared_ptr<JoyStickButtonVector> > joyStickButtons_;
     129        std::vector<shared_ptr<JoyStickButtonVector>> joyStickButtons_;
    130130        //! Helper class to use something like std:vector<HalfAxis[48]>
    131131        struct JoyStickAxisVector
    … …  
    135135        };
    136136        //! Actual key bindings for joy stick axes (and sliders)
    137         std::vector<shared_ptr<JoyStickAxisVector> > joyStickAxes_;
     137        std::vector<shared_ptr<JoyStickAxisVector>> joyStickAxes_;
    138138
    139139        //! Pointer map with all Buttons, including half axes
    … …  
    142142        std::vector<HalfAxis*> allHalfAxes_;
    143143        //! Maps input commands to all Button names, including half axes
    144         std::map< std::string, std::vector<std::string> > allCommands_;
     144        std::map< std::string, std::vector<std::string>> allCommands_;
    145145
    146146        /**

  • code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.cc

    r10765 r10769  
    7373    void ModuleInstance::deleteAllStaticallyInitializedInstances()
    7474    {
    75         std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*> > copy(this->staticallyInitializedInstancesByType_);
     75        std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*>> copy(this->staticallyInitializedInstancesByType_);
    7676        this->staticallyInitializedInstancesByType_.clear();
    77         for (std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*> >::iterator it1 = copy.begin(); it1 != copy.end(); ++it1)
     77        for (std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*>>::iterator it1 = copy.begin(); it1 != copy.end(); ++it1)
    7878            for (std::set<StaticallyInitializedInstance*>::iterator it2 = it1->second.begin(); it2 != it1->second.end(); ++it2)
    7979                delete (*it2);

  • code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.h

    r10549 r10769  
    6969
    7070        private:
    71             std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*> > staticallyInitializedInstancesByType_;
     71            std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*>> staticallyInitializedInstancesByType_;
    7272            std::string libraryName_;
    7373            DynLib* dynLib_;

  • code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h

    r10624 r10769  
    5252
    5353        private:
    54             std::vector<StrongPtr<Destroyable> > retainedInstances_;
     54            std::vector<StrongPtr<Destroyable>> retainedInstances_;
    5555
    5656            static DestroyLaterManager* singletonPtr_s;

  • code/branches/cpp11_v2/src/libraries/core/object/Iterator.h

    r10736 r10769  
    7070    */
    7171    template <class T>
    72     class Iterator : public IteratorBase<T, Iterator<T> >
     72    class Iterator : public IteratorBase<T, Iterator<T>>
    7373    {
    7474        public:
    … …  
    7676                @brief Constructor: Sets the element, whereon the iterator points, to zero.
    7777            */
    78             inline Iterator() : IteratorBase<T, Iterator<T> >() {}
     78            inline Iterator() : IteratorBase<T, Iterator<T>>() {}
    7979
    8080            /**
    … …  
    8383            */
    8484            template <class OT, class OI>
    85             inline Iterator(const IteratorBase<OT, OI>& other) : IteratorBase<T, Iterator<T> >(other) {}
     85            inline Iterator(const IteratorBase<OT, OI>& other) : IteratorBase<T, Iterator<T>>(other) {}
    8686
    8787            /**

  • code/branches/cpp11_v2/src/libraries/core/object/ObjectListIterator.h

    r10736 r10769  
    6868    */
    6969    template <class T>
    70     class ObjectListIterator : public IteratorBase<T, ObjectListIterator<T> >
     70    class ObjectListIterator : public IteratorBase<T, ObjectListIterator<T>>
    7171    {
    7272        public:
    … …  
    7474                @brief Constructor: Sets the element, whereon the ObjectListIterator points, to zero.
    7575            */
    76             inline ObjectListIterator() : IteratorBase<T, ObjectListIterator<T> >() {}
     76            inline ObjectListIterator() : IteratorBase<T, ObjectListIterator<T>>() {}
    7777
    7878            /**
    … …  
    8080                @param element The element to start with
    8181            */
    82             inline ObjectListIterator(ObjectListElement<T>* element) : IteratorBase<T, ObjectListIterator<T> >(element) {}
     82            inline ObjectListIterator(ObjectListElement<T>* element) : IteratorBase<T, ObjectListIterator<T>>(element) {}
    8383
    8484            /**
    … …  
    8787            */
    8888            template <class OI>
    89             inline ObjectListIterator(const IteratorBase<T, OI>& other) : IteratorBase<T, ObjectListIterator<T> >(other) {}
     89            inline ObjectListIterator(const IteratorBase<T, OI>& other) : IteratorBase<T, ObjectListIterator<T>>(other) {}
    9090
    9191            /**

  • code/branches/cpp11_v2/src/libraries/core/singleton/ScopeManager.h

    r10542 r10769  
    7979
    8080            std::set<ScopeID::Value> activeScopes_;
    81             std::map<ScopeID::Value, std::set<ScopeListener*> > listeners_; //!< Stores all listeners for a scope
     81            std::map<ScopeID::Value, std::set<ScopeListener*>> listeners_; //!< Stores all listeners for a scope
    8282
    8383            static ScopeManager* singletonPtr_s;
Note: See TracChangeset for help on using the changeset viewer.