[Orxonox-commit 6335] r10992 - in code/branches/cpp11_v2/src: libraries/core libraries/core/class libraries/core/command libraries/core/commandline libraries/core/config libraries/core/input libraries/tools libraries/util libraries/util/output orxonox orxonox/chat
landauf at orxonox.net
landauf at orxonox.net
Tue Dec 29 17:16:29 CET 2015
Author: landauf
Date: 2015-12-29 17:16:28 +0100 (Tue, 29 Dec 2015)
New Revision: 10992
Modified:
code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.h
code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.h
code/branches/cpp11_v2/src/libraries/core/Core.h
code/branches/cpp11_v2/src/libraries/core/GUIManager.h
code/branches/cpp11_v2/src/libraries/core/Game.h
code/branches/cpp11_v2/src/libraries/core/GameMode.h
code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h
code/branches/cpp11_v2/src/libraries/core/Language.h
code/branches/cpp11_v2/src/libraries/core/Resource.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/CommandExecutor.h
code/branches/cpp11_v2/src/libraries/core/command/IRC.h
code/branches/cpp11_v2/src/libraries/core/command/Shell.h
code/branches/cpp11_v2/src/libraries/core/command/TclBind.h
code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.h
code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h
code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h
code/branches/cpp11_v2/src/libraries/core/input/InputManager.h
code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h
code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h
code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h
code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h
code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h
code/branches/cpp11_v2/src/libraries/util/Clock.h
code/branches/cpp11_v2/src/libraries/util/DestructionHelper.h
code/branches/cpp11_v2/src/libraries/util/ImplicitConversion.h
code/branches/cpp11_v2/src/libraries/util/Singleton.h
code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h
code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h
code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h
code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h
code/branches/cpp11_v2/src/orxonox/CameraManager.h
code/branches/cpp11_v2/src/orxonox/LevelManager.h
code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h
Log:
for all non-copyable classes (i.e. those with deleted copy-constructor) I added also a deleted assignment operator
Modified: code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -103,7 +103,9 @@
std::vector<std::string> getPluginPaths();
private:
+ // non-copyable:
ApplicationPaths(const ApplicationPaths&) = delete;
+ ApplicationPaths& operator=(const ApplicationPaths&) = delete;
std::vector<std::string> getModuleOrPluginPaths(boost::filesystem::path& directory, const std::string& extension);
Modified: code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -92,7 +92,9 @@
void setConfigurablePaths(const ApplicationPaths& applicationPaths);
private:
+ // non-copyable:
ConfigurablePaths(const ConfigurablePaths&) = delete;
+ ConfigurablePaths& operator=(const ConfigurablePaths&) = delete;
boost::filesystem::path& dataPath_; //!< Path to the data files folder
boost::filesystem::path& externalDataPath_; //!< Path to the external data files folder
Modified: code/branches/cpp11_v2/src/libraries/core/Core.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Core.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/Core.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -91,7 +91,9 @@
{ return this->config_; }
private:
+ // non-copyable:
Core(const Core&) = delete;
+ Core& operator=(const Core&) = delete;
void setThreadAffinity(int limitToCPU);
Modified: code/branches/cpp11_v2/src/libraries/core/GUIManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GUIManager.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/GUIManager.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -150,7 +150,9 @@
inline bool usingOldCEGUI(void) { return this->oldCEGUI_; } // tolua_export
private:
+ // non-copyable:
GUIManager(const GUIManager&) = delete;
+ GUIManager& operator=(const GUIManager&) = delete;
void executeCode(const std::string& str);
Modified: code/branches/cpp11_v2/src/libraries/core/Game.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Game.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/Game.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -144,7 +144,9 @@
uint32_t tickLength;
};
+ // non-copyable:
Game(const Game&) = delete;
+ Game& operator=(const Game&) = delete;
void loadGraphics();
void unloadGraphics(bool loadGraphicsManagerWithoutRenderer = true);
Modified: code/branches/cpp11_v2/src/libraries/core/GameMode.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GameMode.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/GameMode.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -65,6 +65,7 @@
// static class, no instances allowed:
GameMode() = delete;
GameMode(const GameMode&) = delete;
+ GameMode& operator=(const GameMode&) = delete;
~GameMode() = delete;
/// Checks if we're in control of the game (either standalone or server).
Modified: code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -101,7 +101,9 @@
void setCamera(Ogre::Camera* camera);
private:
+ // non-copyable:
GraphicsManager(const GraphicsManager&) = delete;
+ GraphicsManager& operator=(const GraphicsManager&) = delete;
// OGRE initialisation
void loadOgreRoot();
Modified: code/branches/cpp11_v2/src/libraries/core/Language.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Language.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/Language.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -170,7 +170,9 @@
const std::string& getLocalisation(const LanguageEntryLabel& label, bool bError = true) const;
private:
+ // non-copyable:
Language(const Language&) = delete;
+ Language& operator=(const Language&) = delete;
void readDefaultLanguageFile();
bool readTranslatedLanguageFile(const std::string& language);
Modified: code/branches/cpp11_v2/src/libraries/core/Resource.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Resource.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/Resource.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -143,6 +143,7 @@
// static class, no instances allowed:
Resource() = delete;
Resource(const Resource&) = delete;
+ Resource& operator=(const Resource&) = delete;
~Resource() = delete;
};
}
Modified: code/branches/cpp11_v2/src/libraries/core/class/Identifier.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/Identifier.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/class/Identifier.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -117,9 +117,12 @@
public:
Identifier(const std::string& name, Factory* factory, bool bLoadable);
- Identifier(const Identifier&) = delete;
virtual ~Identifier();
+ // non-copyable:
+ Identifier(const Identifier&) = delete;
+ Identifier& operator=(const Identifier&) = delete;
+
/// Returns the name of the class the Identifier belongs to.
inline const std::string& getName() const { return this->name_; }
@@ -301,7 +304,9 @@
static ClassIdentifier<T>* getIdentifier();
private:
+ // non-copyable:
ClassIdentifier(const ClassIdentifier<T>&) = delete;
+ ClassIdentifier& operator=(const ClassIdentifier<T>&) = delete;
void setConfigValues(T* object, Configurable*) const;
void setConfigValues(T* object, Identifiable*) const;
Modified: code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -94,7 +94,9 @@
{ return this->identifierByNetworkId_; }
private:
+ // non-copyable:
IdentifierManager(const IdentifierManager&) = delete;
+ IdentifierManager& operator=(const IdentifierManager&) = delete;
/// Increases the hierarchyCreatingCounter_s variable, causing all new objects to store their parents.
inline void startCreatingHierarchy()
Modified: code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -132,9 +132,12 @@
private:
CommandExecutor() = default; ///< Empty constructor
- CommandExecutor(const CommandExecutor&) = delete; ///< Not implemented copy-constructor
~CommandExecutor() = default; ///< Empty destructor
+ // non-copyable:
+ CommandExecutor(const CommandExecutor&) = delete;
+ CommandExecutor& operator=(const CommandExecutor&) = delete;
+
static CommandExecutor& getInstance();
bool getCached(const std::string& command, CommandEvaluation& evaluation);
Modified: code/branches/cpp11_v2/src/libraries/core/command/IRC.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/IRC.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/command/IRC.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -64,9 +64,12 @@
void initialize();
IRC();
- IRC(const IRC&) = delete;
~IRC() = default;
+ // non-copyable:
+ IRC(const IRC&) = delete;
+ IRC& operator=(const IRC&) = delete;
+
Tcl::interpreter* interpreter_; ///< The Tcl interpreter that is used for the IRC connection
std::string nickname_; ///< The user's nickname on the IRC server
};
Modified: code/branches/cpp11_v2/src/libraries/core/command/Shell.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/Shell.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/command/Shell.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -148,7 +148,9 @@
{ return Shell::cacheSize_s; }
private:
+ // non-copyable:
Shell(const Shell&) = delete;
+ Shell& operator=(const Shell&) = delete;
// DevModeListener
virtual void devModeChanged(bool value) override;
Modified: code/branches/cpp11_v2/src/libraries/core/command/TclBind.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/TclBind.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/command/TclBind.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -123,7 +123,9 @@
static std::string eval(const std::string& tclcode, int* error = nullptr);
private:
+ // non-copyable:
TclBind(const TclBind&) = delete;
+ TclBind& operator=(const TclBind&) = delete;
static std::string tcl_helper(Tcl::object const &args, bool bQuery);
Modified: code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -106,7 +106,9 @@
const MultiType& getDefaultValue() const { return defaultValue_; }
private:
+ // non-copyable:
CommandLineArgument(const CommandLineArgument&) = delete;
+ CommandLineArgument& operator=(const CommandLineArgument&) = delete;
//! Parses the value string of a command line argument.
void parse(const std::string& value);
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -66,7 +66,9 @@
}
private:
+ // non-copyable:
ConfigFileManager(const ConfigFileManager&) = delete;
+ ConfigFileManager& operator=(const ConfigFileManager&) = delete;
std::array<ConfigFile*, 3> configFiles_; ///< Stores the config files for each type in an array (must have the same size like ConfigFileType::Value)
static ConfigFileManager* singletonPtr_s; ///< Stores the singleton-pointer
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -98,7 +98,9 @@
std::vector<InputState*> inputStates_;
private:
+ // non-copyable:
InputDevice(const InputDevice&) = delete;
+ InputDevice& operator=(const InputDevice&) = delete;
bool bCalibrating_; //!< Whether the device is in calibration mode
const unsigned int deviceID_; //!< ID of the device (the same as in InputDeviceEnumerator for mouse and keyboard)
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputManager.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputManager.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -191,7 +191,9 @@
static InputManager& getInstance() { return Singleton<InputManager>::getInstance(); } // tolua_export
private: // functions
+ // non-copyable:
InputManager(const InputManager&) = delete;
+ InputManager& operator=(const InputManager&) = delete;
// Internal methods
void loadDevices();
Modified: code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -101,7 +101,10 @@
void registerKeybindCallback(LuaFunctor* function); //tolua_export
private:
+ // non-copyable:
KeyBinderManager(const KeyBinderManager&) = delete;
+ KeyBinderManager& operator=(const KeyBinderManager&) = delete;
+
void keybindInternal(const std::string& command, bool bTemporary);
void keybindKeyPressed(const std::string& keyName);
void defaultFilenameChanged();
Modified: code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -47,7 +47,9 @@
void setCallback(const FunctorPtr& function) { this->callbackFunction_ = function; }
private:
+ // non-copyable:
KeyDetector(const KeyDetector&) = delete;
+ KeyDetector& operator=(const KeyDetector&) = delete;
void callback(const std::string& name);
virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
Modified: code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -53,7 +53,9 @@
ResourceLocation* getResourceLocation(unsigned int index) const;
private:
+ // non-copyable:
ResourceCollection(const ResourceCollection&) = delete;
+ ResourceCollection& operator=(const ResourceCollection&) = delete;
std::string resourceGroup_;
std::vector<ResourceLocation*> resourceLocations_;
Modified: code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -59,7 +59,9 @@
const std::string& getResourceGroup() const { return resourceGroup_; }
private:
+ // non-copyable:
ResourceLocation(const ResourceLocation&) = delete;
+ ResourceLocation& operator=(const ResourceLocation&) = delete;
void load(const std::string& resourceGroup);
void unload();
Modified: code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -51,6 +51,7 @@
// static class, no instances allowed:
TextureGenerator() = delete;
TextureGenerator(const TextureGenerator&) = delete;
+ TextureGenerator& operator=(const TextureGenerator&) = delete;
~TextureGenerator() = delete;
static std::map<std::string, std::map<ColourValue, std::string>> materials_s;
Modified: code/branches/cpp11_v2/src/libraries/util/Clock.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/Clock.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/util/Clock.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -101,7 +101,9 @@
unsigned long long getRealMicroseconds() const;
private:
+ // non-copyable:
Clock(const Clock&) = delete;
+ Clock& operator=(const Clock&) = delete;
Ogre::Timer* timer_; ///< Ogre timer object
unsigned long long tickTime_; ///< Currently captured time
Modified: code/branches/cpp11_v2/src/libraries/util/DestructionHelper.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/DestructionHelper.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/util/DestructionHelper.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -86,7 +86,9 @@
}
private:
+ // non-copyable:
DestructionHelper(const DestructionHelper&) = delete;
+ DestructionHelper& operator=(const DestructionHelper&) = delete;
T* object_;
};
Modified: code/branches/cpp11_v2/src/libraries/util/ImplicitConversion.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/ImplicitConversion.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/util/ImplicitConversion.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -70,7 +70,9 @@
// static class, no instances allowed:
ImplicitConversion() = delete;
ImplicitConversion(const ImplicitConversion&) = delete;
+ ImplicitConversion& operator=(const ImplicitConversion&) = delete;
~ImplicitConversion() = delete;
+
// Gets chosen only if there is an implicit conversion from FromType to ToType.
static char test(ToType);
// Accepts any argument. Why do we not use a template? The reason is that with templates,
Modified: code/branches/cpp11_v2/src/libraries/util/Singleton.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/Singleton.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/util/Singleton.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -143,7 +143,9 @@
}
private:
+ // non-copyable:
Singleton(const Singleton&) = delete;
+ Singleton& operator=(const Singleton&) = delete;
};
}
Modified: code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -52,7 +52,6 @@
{
public:
ConsoleWriter(std::ostream& outputStream);
- ConsoleWriter(const ConsoleWriter&) = delete;
virtual ~ConsoleWriter();
void enable();
@@ -65,6 +64,10 @@
virtual void printLine(const std::string& line, OutputLevel level) override;
private:
+ // non-copyable:
+ ConsoleWriter(const ConsoleWriter&) = delete;
+ ConsoleWriter& operator=(const ConsoleWriter&) = delete;
+
std::ostream& outputStream_; ///< The ostream to which the console writer writes its output
bool bEnabled_; ///< If false, the instance will not write output to the console.
};
Modified: code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -56,7 +56,6 @@
{
public:
LogWriter();
- LogWriter(const LogWriter&) = delete;
virtual ~LogWriter();
void setLogDirectory(const std::string& directory);
@@ -72,6 +71,10 @@
virtual void printLine(const std::string& line, OutputLevel level) override;
private:
+ // non-copyable:
+ LogWriter(const LogWriter&) = delete;
+ LogWriter& operator=(const LogWriter&) = delete;
+
void openFile();
void closeFile();
Modified: code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -67,7 +67,6 @@
public:
MemoryWriter();
- MemoryWriter(const MemoryWriter&) = delete;
virtual ~MemoryWriter();
void resendOutput(OutputListener* listener) const;
@@ -77,6 +76,10 @@
virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines) override;
private:
+ // non-copyable:
+ MemoryWriter(const MemoryWriter&) = delete;
+ MemoryWriter& operator=(const MemoryWriter&) = delete;
+
std::vector<Message> messages_; ///< Stores all output messages from the creation of this instance until disable() is called.
};
}
Modified: code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -66,7 +66,6 @@
{
public:
OutputManager();
- OutputManager(const OutputManager&) = delete;
virtual ~OutputManager();
static OutputManager& getInstance();
@@ -114,6 +113,10 @@
inline OutputContextMask getCombinedAdditionalContextsMask() const { return this->combinedAdditionalContextsMask_; }
private:
+ // non-copyable:
+ OutputManager(const OutputManager&) = delete;
+ OutputManager& operator=(const OutputManager&) = delete;
+
void updateMasks();
void updateCombinedLevelMask();
void updateCombinedAdditionalContextsLevelMask();
Modified: code/branches/cpp11_v2/src/orxonox/CameraManager.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/CameraManager.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/orxonox/CameraManager.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -58,7 +58,9 @@
void useCamera(Ogre::Camera* camera);
private:
+ // non-copyable:
CameraManager(const CameraManager&) = delete;
+ CameraManager& operator=(const CameraManager&) = delete;
std::list<Camera*> cameraList_;
Modified: code/branches/cpp11_v2/src/orxonox/LevelManager.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/LevelManager.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/orxonox/LevelManager.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -108,7 +108,9 @@
// tolua_end
private:
+ // non-copyable:
LevelManager(const LevelManager&) = delete;
+ LevelManager& operator=(const LevelManager&) = delete;
void activateNextLevel(); //!< Activate the next level.
Modified: code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h 2015-12-29 15:59:35 UTC (rev 10991)
+++ code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h 2015-12-29 16:16:28 UTC (rev 10992)
@@ -52,7 +52,9 @@
static void chat(const std::string& message, unsigned int targetID = NETWORK_PEER_ID_BROADCAST);
protected:
+ // non-copyable:
ChatManager(const ChatManager&) = delete;
+ ChatManager& operator=(const ChatManager&) = delete;
virtual void incomingChat(const std::string& message, unsigned int sourceID) override;
More information about the Orxonox-commit
mailing list