diff options
author | frosch <frosch@openttd.org> | 2020-12-14 21:46:35 +0100 |
---|---|---|
committer | Michael Lutz <michi@icosahedron.de> | 2020-12-14 23:50:50 +0100 |
commit | 484ea62a62d7e09ea550a40ea3ded24dcab8a6d0 (patch) | |
tree | bdcf5185564262f356ca6582365f231aa573deb5 /src/3rdparty/optional/ottd_optional.h | |
parent | 5d278b62ccdacbf16b482c1d10247def85ceb71c (diff) | |
download | openttd-484ea62a62d7e09ea550a40ea3ded24dcab8a6d0.tar.xz |
Cleanup: use std::optional instead of custom implementation.
Diffstat (limited to 'src/3rdparty/optional/ottd_optional.h')
-rw-r--r-- | src/3rdparty/optional/ottd_optional.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/src/3rdparty/optional/ottd_optional.h b/src/3rdparty/optional/ottd_optional.h deleted file mode 100644 index 19b44c505..000000000 --- a/src/3rdparty/optional/ottd_optional.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This file is part of OpenTTD. - * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. - * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>. - */ - -/** @file ottd_optional.h Header to select between native. */ - -#ifndef OTTD_OPTIONAL_H -#define OTTD_OPTIONAL_H - -#if defined(__has_include) -# if __has_include(<version>) -# include <version> -# endif -#endif - -#if (__cplusplus >= 201703L) || (defined(__cpp_lib_optional) && __cpp_lib_optional >= 201606L) - -/* Native std::optional. */ -#include <optional> -namespace opt = std; - -#else - -/* No std::optional, use local copy instead. */ -#include "optional.hpp" -namespace opt = std::experimental; - -#endif - -#endif /* OTTD_OPTIONAL_H */ |