Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-07-13 06:07:37 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-07-13 06:07:37 (GMT) |
| commit | 497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc (patch) | |
| tree | 4d69e5ce56c755cf3b61aaf78e24729130f77e2e /Swiften/Base | |
| parent | 8f4d198c4d3aa55a5215061e84572d5faf4e4117 (diff) | |
| download | swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.zip swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.tar.bz2 | |
Remove Swiften/Base/Override.h
Replaced SWIFTEN_OVERRIDE with C++11 standard override
keyword.
Test-Information:
Tested on macOS 10.12.5 with clang trunk.
Change-Id: If89c6cc2a648662522a320834c314496c943a55a
Diffstat (limited to 'Swiften/Base')
| -rw-r--r-- | Swiften/Base/Override.h | 34 | ||||
| -rw-r--r-- | Swiften/Base/SimpleIDGenerator.h | 5 | ||||
| -rw-r--r-- | Swiften/Base/StdRandomGenerator.h | 3 |
3 files changed, 3 insertions, 39 deletions
diff --git a/Swiften/Base/Override.h b/Swiften/Base/Override.h deleted file mode 100644 index 2806aae..0000000 --- a/Swiften/Base/Override.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2012 Isode Limited. - * All rights reserved. - * See the COPYING file for more information. - */ - -#pragma once - -#if defined(__clang__) -# if __has_feature(cxx_override_control) || __has_extension(cxx_override_control) -# define SWIFTEN_OVERRIDE override -# else -# define SWIFTEN_OVERRIDE -# endif - -#elif defined(__GNUC__) -# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) && defined(__GXX_EXPERIMENTAL_CXX0X__) -# define SWIFTEN_OVERRIDE override -# else -# define SWIFTEN_OVERRIDE -# endif - -#elif defined(_MSC_VER) -// Actually, 1700 is the first version that supports the C++11 override, but -// older versions apparently support a similar keyword. -# if _MSC_VER >= 1400 -# define SWIFTEN_OVERRIDE override -# else -# define SWIFTEN_OVERRIDE -# endif - -#else -# define SWIFTEN_OVERRIDE -#endif diff --git a/Swiften/Base/SimpleIDGenerator.h b/Swiften/Base/SimpleIDGenerator.h index 5baf2f1..09e01de 100644 --- a/Swiften/Base/SimpleIDGenerator.h +++ b/Swiften/Base/SimpleIDGenerator.h @@ -1,32 +1,31 @@ /* * Copyright (c) 2010-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <string> #include <Swiften/Base/API.h> #include <Swiften/Base/IDGenerator.h> -#include <Swiften/Base/Override.h> namespace Swift { /** * @brief The SimpleIDGenerator class implements a IDGenerator generating consecutive ID strings from * the lower case latin alphabet. */ class SWIFTEN_API SimpleIDGenerator : public IDGenerator { public: SimpleIDGenerator(); - ~SimpleIDGenerator() SWIFTEN_OVERRIDE; + ~SimpleIDGenerator() override; - std::string generateID() SWIFTEN_OVERRIDE; + std::string generateID() override; private: std::string currentID; }; } diff --git a/Swiften/Base/StdRandomGenerator.h b/Swiften/Base/StdRandomGenerator.h index 4cc5e95..159d361 100644 --- a/Swiften/Base/StdRandomGenerator.h +++ b/Swiften/Base/StdRandomGenerator.h @@ -1,25 +1,24 @@ /* * Copyright (c) 2012-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <random> #include <Swiften/Base/API.h> -#include <Swiften/Base/Override.h> #include <Swiften/Base/RandomGenerator.h> namespace Swift { class SWIFTEN_API StdRandomGenerator : public RandomGenerator { public: StdRandomGenerator(); - int generateRandomInteger(int max) SWIFTEN_OVERRIDE; + int generateRandomInteger(int max) override; private: std::mt19937 generator; }; } |