diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-10-10 03:29:39 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-10-10 03:29:39 +0300 |
commit | 1d3118ec21f537695dc0e6a9608acd67396d0a51 (patch) | |
tree | 5cf9229b2d23f2a7a584b5fed9aaead306df6496 /src/utils | |
parent | dd996d01676d7dca3eec442b14c4966ba0bb0935 (diff) | |
download | manaplus-1d3118ec21f537695dc0e6a9608acd67396d0a51.tar.gz manaplus-1d3118ec21f537695dc0e6a9608acd67396d0a51.tar.bz2 manaplus-1d3118ec21f537695dc0e6a9608acd67396d0a51.tar.xz manaplus-1d3118ec21f537695dc0e6a9608acd67396d0a51.zip |
Delete copy constructor from other classes.
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/mutex.h | 33 | ||||
-rw-r--r-- | src/utils/translation/podict.h | 2 | ||||
-rw-r--r-- | src/utils/translation/poparser.h | 2 | ||||
-rw-r--r-- | src/utils/xml.h | 2 |
4 files changed, 25 insertions, 14 deletions
diff --git a/src/utils/mutex.h b/src/utils/mutex.h index fe560e354..3ea607029 100644 --- a/src/utils/mutex.h +++ b/src/utils/mutex.h @@ -33,18 +33,22 @@ */ class Mutex { -public: - Mutex(); - ~Mutex(); + public: + Mutex(); - void lock(); - void unlock(); + A_DELETE_COPY(Mutex); -private: - Mutex(const Mutex&); // prevent copying - Mutex& operator=(const Mutex&); + ~Mutex(); - SDL_mutex *mMutex; + void lock(); + + void unlock(); + + private: +// Mutex(const Mutex&); // prevent copying +// Mutex& operator=(const Mutex&); + + SDL_mutex *mMutex; }; /** @@ -52,12 +56,13 @@ private: */ class MutexLocker { -public: - MutexLocker(Mutex *mutex); - ~MutexLocker(); + public: + MutexLocker(Mutex *mutex); + + ~MutexLocker(); -private: - Mutex *mMutex; + private: + Mutex *mMutex; }; diff --git a/src/utils/translation/podict.h b/src/utils/translation/podict.h index 4a62c6da8..d1f0a9677 100644 --- a/src/utils/translation/podict.h +++ b/src/utils/translation/podict.h @@ -33,6 +33,8 @@ class PoDict final public: PoDict(std::string lang); + A_DELETE_COPY(PoDict); + ~PoDict(); const std::string getStr(const std::string &str); diff --git a/src/utils/translation/poparser.h b/src/utils/translation/poparser.h index 274591d3b..a0ffc2669 100644 --- a/src/utils/translation/poparser.h +++ b/src/utils/translation/poparser.h @@ -33,6 +33,8 @@ class PoParser final public: PoParser(); + A_DELETE_COPY(PoParser); + PoDict *load(const std::string &lang, const std::string &fileName = "", PoDict *const dict = nullptr); diff --git a/src/utils/xml.h b/src/utils/xml.h index ad54f4b28..4889c4a1f 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -76,6 +76,8 @@ namespace XML */ Document(const char *const data, const int size); + A_DELETE_COPY(Document); + /** * Destructor. Frees the loaded XML file. */ |