diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-01-25 17:42:56 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-01-25 17:42:56 +0100 |
| commit | 8d06606835e3d01f537ebe96de8b216e64a1f969 (patch) | |
| tree | 5def38115e55b4b9b78a016e6fe9cfc2771d22a0 /src | |
| parent | dadefbcd103bd11bc74ca35a40d18dd2c1877f70 (diff) | |
| download | Mana-8d06606835e3d01f537ebe96de8b216e64a1f969.tar.gz Mana-8d06606835e3d01f537ebe96de8b216e64a1f969.tar.bz2 Mana-8d06606835e3d01f537ebe96de8b216e64a1f969.tar.xz Mana-8d06606835e3d01f537ebe96de8b216e64a1f969.zip | |
Always use C++11 and remove related compatibility option/code
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/cpp0x_compat/cstdint | 10 | ||||
| -rw-r--r-- | src/utils/mutex.h | 4 |
3 files changed, 0 insertions, 19 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b4227f65..68cba816 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,11 +35,6 @@ ENDIF() SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"") SET(FLAGS "${FLAGS} -DPKG_DATADIR=\\\"${PKG_DATADIR}/\\\"") SET(FLAGS "${FLAGS} -DLOCALEDIR=\\\"${LOCALEDIR}/\\\"") -IF (ENABLE_CPP0X) - SET(FLAGS "${FLAGS} -std=c++0x -DENABLE_CPP0X=1") -ELSE() - INCLUDE_DIRECTORIES("cpp0x_compat") -ENDIF() IF (ENABLE_NLS) SET(FLAGS "${FLAGS} -DENABLE_NLS=1") diff --git a/src/cpp0x_compat/cstdint b/src/cpp0x_compat/cstdint deleted file mode 100644 index 05d56c6e..00000000 --- a/src/cpp0x_compat/cstdint +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Compatibility header used when the compiler doesn't support C++0x. - * - * While GCC 4.2.1 understands types like uint16_t by default, later versions - * are more strict so here are some typedefs for types used in our code. - */ - -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; diff --git a/src/utils/mutex.h b/src/utils/mutex.h index f7f26233..d0120cfa 100644 --- a/src/utils/mutex.h +++ b/src/utils/mutex.h @@ -53,9 +53,7 @@ class MutexLocker { public: MutexLocker(Mutex *mutex); -#ifdef ENABLE_CPP0X MutexLocker(MutexLocker&&); -#endif ~MutexLocker(); private: @@ -95,13 +93,11 @@ inline MutexLocker::MutexLocker(Mutex *mutex): mMutex->lock(); } -#ifdef ENABLE_CPP0X inline MutexLocker::MutexLocker(MutexLocker&& rhs): mMutex(rhs.mMutex) { rhs.mMutex = NULL; } -#endif inline MutexLocker::~MutexLocker() { |