Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 17, 2009, 3:17:15 PM (15 years ago)
Author:
rgrieder
Message:

Added using declaration for boost::shared_ptr, weak_ptr and scoped_ptr to OrxonoxConfig.h

Location:
code/branches/resource2/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/resource2/src/OrxonoxConfig.h.in

    r3196 r5651  
    198198}
    199199
     200// Import general purpose smart pointers
     201namespace boost
     202{
     203    template<class T> class scoped_ptr;
     204    template<class T> class shared_ptr;
     205    template<class T> class weak_ptr;
     206}
     207namespace orxonox
     208{
     209    using boost::scoped_ptr;
     210    using boost::shared_ptr;
     211    using boost::weak_ptr;
     212}
     213
    200214#endif /* _OrxonoxConfig_H__ */
  • code/branches/resource2/src/core/Core.h

    r5645 r5651  
    5151{
    5252    class CoreConfiguration;
    53     using boost::scoped_ptr;
    5453
    5554    /**
  • code/branches/resource2/src/core/GUIManager.h

    r3370 r5651  
    9292        void mouseScrolled (int abs, int rel);
    9393
    94         boost::scoped_ptr<CEGUI::OgreCEGUIRenderer> guiRenderer_;  //!< CEGUI's interface to the Ogre Engine
    95         boost::scoped_ptr<CEGUI::LuaScriptModule>   scriptModule_; //!< CEGUI's script module to use Lua
    96         boost::scoped_ptr<CEGUI::System>            guiSystem_;    //!< CEGUI's main system
     94        scoped_ptr<CEGUI::OgreCEGUIRenderer> guiRenderer_;  //!< CEGUI's interface to the Ogre Engine
     95        scoped_ptr<CEGUI::LuaScriptModule>   scriptModule_; //!< CEGUI's script module to use Lua
     96        scoped_ptr<CEGUI::System>            guiSystem_;    //!< CEGUI's main system
    9797        Ogre::RenderWindow*      renderWindow_;     //!< Ogre's render window to give CEGUI access to it
    9898        CEGUI::ResourceProvider* resourceProvider_; //!< CEGUI's resource provider
  • code/branches/resource2/src/core/Game.cc

    r3370 r5651  
    5454namespace orxonox
    5555{
    56     using boost::shared_ptr;
    57     using boost::weak_ptr;
    58 
    5956    static void stop_game()
    6057        { Game::getInstance().stop(); }
  • code/branches/resource2/src/core/Game.h

    r3370 r5651  
    6161{
    6262    class GameConfiguration;
    63     using boost::scoped_ptr;
    64     using boost::shared_ptr;
    6563
    6664    //! Helper object required before GameStates are being constructed
     
    8482        typedef std::vector<shared_ptr<GameState> > GameStateVector;
    8583        typedef std::map<std::string, shared_ptr<GameState> > GameStateMap;
    86         typedef boost::shared_ptr<GameStateTreeNode> GameStateTreeNodePtr;
     84        typedef shared_ptr<GameStateTreeNode> GameStateTreeNodePtr;
    8785    public:
    8886        Game(const std::string& cmdLine);
  • code/branches/resource2/src/core/GraphicsManager.h

    r5641 r5651  
    4949namespace orxonox
    5050{
    51     using boost::scoped_ptr;
    52 
    5351    /**
    5452    @brief
Note: See TracChangeset for help on using the changeset viewer.