Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 29, 2015, 4:47:42 PM (9 years ago)
Author:
landauf
Message:

use '= delete' to explicitly delete unimplemented copy-constructors (for non-copyable classes).
use '= default' to explicitly implement default constructors/destructors.

Location:
code/branches/cpp11_v2/src
Files:
65 edited

Legend:

Unmodified
Added
Removed

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

    r10624 r10990  
    104104
    105105        private:
    106             ApplicationPaths(const ApplicationPaths&); //!< Don't use (undefined symbol)
     106            ApplicationPaths(const ApplicationPaths&) = delete;
    107107
    108108            std::vector<std::string> getModuleOrPluginPaths(boost::filesystem::path& directory, const std::string& extension);

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

    r10770 r10990  
    276276        public:
    277277            /// Default-constructor: Does nothing.
    278             inline ClassTreeMaskObjectIterator() {}
     278            inline ClassTreeMaskObjectIterator() = default;
    279279            /// Copy-Constructor: Initializes the iterator from another ClassTreeMask.
    280280            inline ClassTreeMaskObjectIterator(const ClassTreeMask& mask) { (*this) = mask; }

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

    r10624 r10990  
    9393
    9494        private:
    95             ConfigurablePaths(const ConfigurablePaths&); //!< Don't use (undefined symbol)
     95            ConfigurablePaths(const ConfigurablePaths&) = delete;
    9696
    9797            boost::filesystem::path& dataPath_;              //!< Path to the data files folder

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

    r10817 r10990  
    7373
    7474            /// Leave empty and use destroy() instead
    75             ~Core() {}
     75            ~Core() = default;
    7676            /// Destructor that also executes when the object fails to construct
    7777            void destroy();
    … …  
    9292
    9393        private:
    94             Core(const Core&); //!< Don't use (undefined symbol)
     94            Core(const Core&) = delete;
    9595
    9696            void setThreadAffinity(int limitToCPU);

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

    r10624 r10990  
    7676    public:
    7777        DevModeListener();
    78         virtual ~DevModeListener() {}
     78        virtual ~DevModeListener() = default;
    7979        virtual void devModeChanged(bool value) = 0;
    8080    };

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

    r10845 r10990  
    9797
    9898        //! Leave empty and use cleanup() instead
    99         ~GUIManager() {}
     99        ~GUIManager() = default;
    100100        /// Destructor that also executes when object fails to construct
    101101        void destroy();
    … …  
    151151
    152152    private:
    153         GUIManager(const GUIManager& instance); //!< private and undefined copy c'tor (this is a singleton class)
     153        GUIManager(const GUIManager&) = delete;
    154154
    155155        void executeCode(const std::string& str);

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

    r10845 r10990  
    9292
    9393        //! Leave empty and use cleanup() instead
    94         ~Game() {}
     94        ~Game() = default;
    9595        /// Destructor that also executes when object fails to construct
    9696        void destroy();
    … …  
    122122        {
    123123        public:
    124             virtual ~GameStateFactory() { }
     124            virtual ~GameStateFactory() = default;
    125125            static std::shared_ptr<GameState> fabricate(const GameStateInfo& info);
    126126            template <class T>
    … …  
    145145        };
    146146
    147         Game(Game&); // don't mess with singletons
     147        Game(const Game&) = delete;
    148148
    149149        void loadGraphics();

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

    r7401 r10990  
    6363
    6464        private:
    65             GameMode();
    66             GameMode(const GameMode& inst);
    67             ~GameMode();
     65            // static class, no instances allowed:
     66            GameMode() = delete;
     67            GameMode(const GameMode&) = delete;
     68            ~GameMode() = delete;
    6869
    6970            /// Checks if we're in control of the game (either standalone or server).

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

    r10845 r10990  
    7171
    7272        //! Leave empty and use cleanup() instead
    73         ~GraphicsManager() {}
     73        ~GraphicsManager() = default;
    7474        /// Destructor that also executes when object fails to construct
    7575        void destroy();
    … …  
    102102
    103103    private:
    104         GraphicsManager(GraphicsManager&); // don't mess with singletons
     104        GraphicsManager(const GraphicsManager&) = delete;
    105105
    106106        // OGRE initialisation

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

    r10624 r10990  
    171171
    172172        private:
    173             Language(const Language&);
     173            Language(const Language&) = delete;
    174174
    175175            void readDefaultLanguageFile();

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

    r10771 r10990  
    141141
    142142    private:
    143         Resource();
    144         ~Resource();
    145         Resource(const Resource& instance);
     143        // static class, no instances allowed:
     144        Resource() = delete;
     145        Resource(const Resource&) = delete;
     146        ~Resource() = delete;
    146147    };
    147148}

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

    r9667 r10990  
    4444        protected:
    4545            ViewportEventListener();
    46             virtual ~ViewportEventListener() {}
     46            virtual ~ViewportEventListener() = default;
    4747    };
    4848}

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

    r9667 r10990  
    4747        protected:
    4848            WindowEventListener();
    49             virtual ~WindowEventListener() { }
     49            virtual ~WindowEventListener() = default;
    5050
    5151            //! Returns the current render window width

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

    r9667 r10990  
    4444        public:
    4545            XMLNameListener();
    46             virtual ~XMLNameListener() {}
     46            virtual ~XMLNameListener() = default;
    4747
    4848            virtual void loadedNewXMLName(BaseObject* object) = 0;

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

    r10845 r10990  
    334334            XMLPortParamContainer()
    335335                { this->parseResult_ = PR_not_started; }
    336             virtual ~XMLPortParamContainer() {}
     336            virtual ~XMLPortParamContainer() = default;
    337337
    338338            inline const std::string& getName() const
    … …  
    376376                this->loadexecutor_ = loadexecutor;
    377377                this->saveexecutor_ = saveexecutor;
    378             }
    379 
    380             ~XMLPortClassParamContainer()
    381             {
    382378            }
    383379
    … …  
    511507            XMLPortObjectContainer()
    512508                { this->bApplyLoaderMask_ = false; }
    513             virtual ~XMLPortObjectContainer() {}
     509            virtual ~XMLPortObjectContainer() = default;
    514510
    515511            XMLPortObjectContainer& port(BaseObject* object, Element& xmlelement, XMLPort::Mode mode);
    … …  
    550546                this->bApplyLoaderMask_ = bApplyLoaderMask;
    551547                this->bLoadBefore_ = bLoadBefore;
    552             }
    553 
    554             ~XMLPortClassObjectContainer()
    555             {
    556548            }
    557549

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

    r10920 r10990  
    118118        public:
    119119            Identifier(const std::string& name, Factory* factory, bool bLoadable);
    120             Identifier(const Identifier& identifier); // don't copy
     120            Identifier(const Identifier&) = delete;
    121121            virtual ~Identifier();
    122122
    … …  
    302302
    303303        private:
    304             ClassIdentifier(const ClassIdentifier<T>& identifier) {}    // don't copy
     304            ClassIdentifier(const ClassIdentifier<T>&) = delete;
    305305
    306306            void setConfigValues(T* object, Configurable*) const;

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

    r10988 r10990  
    5454        public:
    5555            IdentifierManager();
    56             ~IdentifierManager() {}
     56            ~IdentifierManager() = default;
    5757
    5858            void addIdentifier(Identifier* identifier);
    … …  
    9595
    9696        private:
    97             IdentifierManager(const IdentifierManager&); // not implemented
     97            IdentifierManager(const IdentifierManager&) = delete;
    9898
    9999            /// Increases the hierarchyCreatingCounter_s variable, causing all new objects to store their parents.

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

    r10768 r10990  
    132132
    133133        private:
    134             CommandExecutor() {}                            ///< Empty constructor
    135             CommandExecutor(const CommandExecutor& other); ///< Not implemented copy-constructor
    136             ~CommandExecutor() {}                           ///< Empty destructor
     134            CommandExecutor() = default;                      ///< Empty constructor
     135            CommandExecutor(const CommandExecutor&) = delete; ///< Not implemented copy-constructor
     136            ~CommandExecutor() = default;                     ///< Empty destructor
    137137
    138138            static CommandExecutor& getInstance();

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

    r10765 r10990  
    6464            defaultValue_[i] = other.defaultValue_[i];
    6565        this->functor_ = other.functor_->clone();
    66     }
    67 
    68     /**
    69         @brief Destructor
    70     */
    71     Executor::~Executor()
    72     {
    7366    }
    7467

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

    r10828 r10990  
    100100            Executor(const FunctorPtr& functor, const std::string& name = "");
    101101            Executor(const Executor& other);
    102             virtual ~Executor();
     102            virtual ~Executor() = default;
    103103
    104104            /// Calls the wrapped function with 0 arguments. If the function needs more arguments, the executor's default values are used.

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

    r10987 r10990  
    187187
    188188        public:
    189             virtual ~Functor() {}
     189            virtual ~Functor() = default;
    190190
    191191            /// Calls the function-pointer with up to five arguments. In case of a member-function, the assigned object-pointer is used to call the function. @return Returns the return-value of the function (if any; MultiType::Null otherwise)

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

    r7401 r10990  
    6565
    6666            IRC();
    67             IRC(const IRC& other);              ///< Copy-constructor: Not implemented
    68             ~IRC() {}                           ///< Destructor
     67            IRC(const IRC&) = delete;
     68            ~IRC() = default;
    6969
    7070            Tcl::interpreter* interpreter_;     ///< The Tcl interpreter that is used for the IRC connection

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

    r10845 r10990  
    6161
    6262        public:
    63             virtual ~ShellListener() {}
     63            ShellListener() = default;
     64            virtual ~ShellListener() = default;
    6465
    6566        private:
    … …  
    148149
    149150        private:
    150             Shell(const Shell& other);
     151            Shell(const Shell&) = delete;
    151152
    152153            // DevModeListener

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

    r10768 r10990  
    124124
    125125        private:
    126             TclBind(const TclBind& other);      ///< Copy-constructor, not implemented
     126            TclBind(const TclBind&) = delete;
    127127
    128128            static std::string tcl_helper(Tcl::object const &args, bool bQuery);

  • code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.h

    r10542 r10990  
    107107
    108108    private:
    109         //! Undefined copy constructor
    110         CommandLineArgument(const CommandLineArgument& instance);
     109        CommandLineArgument(const CommandLineArgument&) = delete;
    111110
    112111        //! Parses the value string of a command line argument.

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

    r9559 r10990  
    5151        public:
    5252            /// Destructor
    53             virtual ~ConfigFileEntry() {};
     53            virtual ~ConfigFileEntry() = default;
    5454
    5555            /// Changes the value of the entry.

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

    r10845 r10990  
    5454
    5555            /// Destructor
    56             virtual inline ~ConfigFileEntryComment() {}
     56            virtual inline ~ConfigFileEntryComment() = default;
    5757
    5858            virtual inline const std::string& getName() const override

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

    r10845 r10990  
    6767
    6868            /// Destructor
    69             virtual inline ~ConfigFileEntryValue() {}
     69            virtual inline ~ConfigFileEntryValue() = default;
    7070
    7171            virtual inline const std::string& getName() const override

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

    r10845 r10990  
    6565
    6666            /// Destructor
    67             inline ~ConfigFileEntryVectorValue() {}
     67            inline ~ConfigFileEntryVectorValue() = default;
    6868
    6969            virtual inline unsigned int getIndex() const override

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

    r10776 r10990  
    6767
    6868        private:
    69             ConfigFileManager(const ConfigFileManager&);    ///< Copy-constructor: not implemented
     69            ConfigFileManager(const ConfigFileManager&) = delete;
    7070
    7171            std::array<ConfigFile*, 3> configFiles_;        ///< Stores the config files for each type in an array (must have the same size like ConfigFileType::Value)

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

    r10918 r10990  
    6767        public:
    6868            inline ConfigValueCallback(void (T::*function) (void)) : function_(function) {}
    69             virtual inline ~ConfigValueCallback() {}
     69            virtual inline ~ConfigValueCallback() = default;
    7070            virtual inline void call(void* object) override
    7171            {

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

    r10845 r10990  
    4747              trueKeyFalseChar_(trueKeyFalseChar), char_(_char), key_(key)
    4848        { }
    49         virtual ~BaseInputBufferListenerTuple() { }
     49        virtual ~BaseInputBufferListenerTuple() = default;
    5050        virtual void callFunction() = 0;
    5151        bool bListenToAllChanges_;
    … …  
    6565              listener_(listener), function_(function)
    6666        { }
    67         virtual ~InputBufferListenerTuple() { }
     67        virtual ~InputBufferListenerTuple() = default;
    6868        virtual void callFunction() override
    6969        {

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

    r10845 r10990  
    5757    public:
    5858        BaseCommand() : bFixedKeybindMode_(false) {}
    59         virtual ~BaseCommand() { }
     59        virtual ~BaseCommand() = default;
    6060
    6161        virtual bool execute(float abs = 1.0f, float rel = 1.0f) = 0;

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

    r10916 r10990  
    6060        //! Only resets the members
    6161        InputDevice(unsigned int id) : bCalibrating_(false), deviceID_(id) { }
    62         virtual ~InputDevice() { }
     62        virtual ~InputDevice() = default;
    6363        //! Returns the device class (derived) name as string
    6464        virtual std::string getClassName() const = 0;
    … …  
    9999
    100100    private:
    101         InputDevice(const InputDevice& rhs); //!< Don't use!
     101        InputDevice(const InputDevice&) = delete;
    102102
    103103        bool bCalibrating_;                  //!< Whether the device is in calibration mode

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

    r8729 r10990  
    119119    {
    120120    public:
    121         virtual ~InputHandler() { }
     121        virtual ~InputHandler() = default;
    122122
    123123        template<class T> void buttonEvent(unsigned int device, T button, ButtonEvent::TPress)

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

    r10845 r10990  
    192192
    193193    private: // functions
    194         // don't mess with a Singleton
    195         InputManager(const InputManager&);
     194        InputManager(const InputManager&) = delete;
    196195
    197196        // Internal methods

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

    r10845 r10990  
    155155    private:
    156156        InputState(const std::string& name, bool bAlwaysGetsInput, bool bTransparent, InputStatePriority priority);
    157         ~InputState() { }
     157        ~InputState() = default;
    158158
    159159        virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;

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

    r10845 r10990  
    7070        //! Assigns a generated ID string and loads the calibration (if present)
    7171        JoyStick(unsigned int id, OIS::InputManager* oisInputManager);
    72         ~JoyStick() { }
     72        ~JoyStick() = default;
    7373        void setConfigValues();
    7474

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

    r9667 r10990  
    4848    protected:
    4949        JoyStickQuantityListener();
    50         virtual ~JoyStickQuantityListener() { }
     50        virtual ~JoyStickQuantityListener() = default;
    5151
    5252        //! Returns a list with all JoySticks currently loaded

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

    r10829 r10990  
    102102
    103103    private:
    104         KeyBinderManager(const KeyBinderManager&);
     104        KeyBinderManager(const KeyBinderManager&) = delete;
    105105        void keybindInternal(const std::string& command, bool bTemporary);
    106106        void keybindKeyPressed(const std::string& keyName);

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

    r10845 r10990  
    4848
    4949    private:
    50         KeyDetector(const KeyDetector&);
     50        KeyDetector(const KeyDetector&) = delete;
    5151
    5252        void callback(const std::string& name);

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

    r10845 r10990  
    6363        //! Only resets the keyboard modifiers. Initialising is done in the base class.
    6464        Keyboard(unsigned int id, OIS::InputManager* oisInputManager) : super(id, oisInputManager), modifiers_(0) { }
    65         ~Keyboard() { }
     65        ~Keyboard() = default;
    6666
    6767    private:

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

    r10532 r10990  
    3737    {
    3838        public:
    39             StaticInitializationHandler() {}
    40             virtual ~StaticInitializationHandler() {}
     39            StaticInitializationHandler() = default;
     40            virtual ~StaticInitializationHandler() = default;
    4141
    4242            virtual void setupHandler() = 0;

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

    r10542 r10990  
    4343
    4444        public:
    45             StaticInitializationManager() {}
    46             virtual ~StaticInitializationManager() {}
     45            StaticInitializationManager() = default;
     46            virtual ~StaticInitializationManager() = default;
    4747
    4848            void addHandler(StaticInitializationHandler* handler);

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

    r9667 r10990  
    5353    {
    5454        public:
    55             virtual ~Factory() {}
     55            Factory() = default;
     56            virtual ~Factory() = default;
    5657            virtual Identifiable* fabricate(Context* context) = 0;
    5758    };

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

    r10817 r10990  
    104104    {
    105105        public:
    106             virtual ~ObjectListElementRemovalListener() {}
     106            ObjectListElementRemovalListener = default;
     107            virtual ~ObjectListElementRemovalListener() = default;
    107108            virtual void removedElement(ObjectListBaseElement* element) = 0;
    108109    };

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

    r10514 r10990  
    7272        protected:
    7373            ScopeListener() : bActivated_(false) { }
    74             virtual ~ScopeListener() { }
     74            virtual ~ScopeListener() = default;
    7575
    7676            //! Gets called if the scope is activated

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

    r10845 r10990  
    6464                : className_(className)
    6565            { }
    66             virtual ~ScopedSingletonWrapper() { }
     66            virtual ~ScopedSingletonWrapper() = default;
    6767
    6868        protected:

  • code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.cc

    r10765 r10990  
    4848    }
    4949
    50     ResourceCollection::~ResourceCollection()
    51     {
    52     }
    53 
    5450    void ResourceCollection::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    5551    {

  • code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h

    r10817 r10990  
    4242    public:
    4343        ResourceCollection(Context* context);
    44         virtual ~ResourceCollection();
     44        virtual ~ResourceCollection() = default;
    4545
    4646        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    … …  
    5454
    5555    private:
    56         ResourceCollection(const ResourceCollection&);
     56        ResourceCollection(const ResourceCollection&) = delete;
    5757
    5858        std::string resourceGroup_;

  • code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.cc

    r10624 r10990  
    5454    }
    5555
    56     ResourceLocation::~ResourceLocation()
    57     {
    58     }
    59 
    6056    void ResourceLocation::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    6157    {

  • code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h

    r10817 r10990  
    4444    public:
    4545        ResourceLocation(Context* context);
    46         virtual ~ResourceLocation();
     46        virtual ~ResourceLocation() = default;
    4747
    4848        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    … …  
    6060
    6161    private:
    62         ResourceLocation(const ResourceLocation&);
     62        ResourceLocation(const ResourceLocation&) = delete;
    6363
    6464        void load(const std::string& resourceGroup);

  • code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h

    r10769 r10990  
    4949
    5050    private:
    51         TextureGenerator();
    52         TextureGenerator(const TextureGenerator&);
    53         ~TextureGenerator();
     51        // static class, no instances allowed:
     52        TextureGenerator() = delete;
     53        TextureGenerator(const TextureGenerator&) = delete;
     54        ~TextureGenerator() = delete;
    5455
    5556        static std::map<std::string, std::map<ColourValue, std::string>> materials_s;

  • code/branches/cpp11_v2/src/libraries/tools/interfaces/TimeFactorListener.h

    r9667 r10990  
    3939        public:
    4040            TimeFactorListener();
    41             virtual ~TimeFactorListener() {}
     41            virtual ~TimeFactorListener() = default;
    4242
    4343            static void setTimeFactor(float factor);

  • code/branches/cpp11_v2/src/libraries/util/Clock.h

    r7401 r10990  
    102102
    103103    private:
    104         /// Undefined
    105         Clock(const Clock& instance);
     104        Clock(const Clock&) = delete;
    106105
    107106        Ogre::Timer*       timer_;       ///< Ogre timer object

  • code/branches/cpp11_v2/src/libraries/util/DestructionHelper.h

    r10765 r10990  
    8787
    8888    private:
    89         DestructionHelper(const DestructionHelper&); //!< Don't use (undefined)
     89        DestructionHelper(const DestructionHelper&) = delete;
    9090
    9191        T* object_;

  • code/branches/cpp11_v2/src/libraries/util/ImplicitConversion.h

    r8267 r10990  
    6868    {
    6969    private:
    70         ImplicitConversion(); ImplicitConversion(const ImplicitConversion&); ~ImplicitConversion();
     70        // static class, no instances allowed:
     71        ImplicitConversion() = delete;
     72        ImplicitConversion(const ImplicitConversion&) = delete;
     73        ~ImplicitConversion() = delete;
    7174        // Gets chosen only if there is an implicit conversion from FromType to ToType.
    7275        static char test(ToType);

  • code/branches/cpp11_v2/src/libraries/util/Singleton.h

    r10765 r10990  
    144144
    145145    private:
    146         Singleton(const Singleton& rhs); //!< Don't use (undefined)
     146        Singleton(const Singleton&) = delete;
    147147    };
    148148}

  • code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h

    r10817 r10990  
    5353        public:
    5454            ConsoleWriter(std::ostream& outputStream);
    55             ConsoleWriter(const ConsoleWriter&);
     55            ConsoleWriter(const ConsoleWriter&) = delete;
    5656            virtual ~ConsoleWriter();
    5757

  • code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h

    r10817 r10990  
    5757        public:
    5858            LogWriter();
    59             LogWriter(const LogWriter&);
     59            LogWriter(const LogWriter&) = delete;
    6060            virtual ~LogWriter();
    6161

  • code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h

    r10817 r10990  
    6868        public:
    6969            MemoryWriter();
    70             MemoryWriter(const MemoryWriter&);
     70            MemoryWriter(const MemoryWriter&) = delete;
    7171            virtual ~MemoryWriter();
    7272

  • code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h

    r10829 r10990  
    6767        public:
    6868            OutputManager();
    69             OutputManager(const OutputManager&);
     69            OutputManager(const OutputManager&) = delete;
    7070            virtual ~OutputManager();
    7171

  • code/branches/cpp11_v2/src/orxonox/CameraManager.h

    r9667 r10990  
    5959
    6060        private:
    61             CameraManager(const CameraManager&); // don't use
     61            CameraManager(const CameraManager&) = delete;
    6262
    6363            std::list<Camera*>    cameraList_;

  • code/branches/cpp11_v2/src/orxonox/LevelManager.h

    r10258 r10990  
    109109
    110110        private:
    111             LevelManager(const LevelManager&);
     111            LevelManager(const LevelManager&) = delete;
    112112
    113113            void activateNextLevel(); //!< Activate the next level.

  • code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h

    r10817 r10990  
    4747        public:
    4848            ChatManager();
    49             virtual ~ChatManager() {}
     49            virtual ~ChatManager() = default;
    5050
    5151            static void message(const std::string& message, unsigned int targetID = NETWORK_PEER_ID_BROADCAST);
    … …  
    5353
    5454        protected:
    55             ChatManager(const ChatManager&);
     55            ChatManager(const ChatManager&) = delete;
    5656
    5757            virtual void incomingChat(const std::string& message, unsigned int sourceID) override;
Note: See TracChangeset for help on using the changeset viewer.