From 484ea62a62d7e09ea550a40ea3ded24dcab8a6d0 Mon Sep 17 00:00:00 2001 From: frosch Date: Mon, 14 Dec 2020 21:46:35 +0100 Subject: Cleanup: use std::optional instead of custom implementation. --- src/3rdparty/optional/ottd_optional.h | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 src/3rdparty/optional/ottd_optional.h (limited to 'src/3rdparty/optional/ottd_optional.h') 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 . - */ - -/** @file ottd_optional.h Header to select between native. */ - -#ifndef OTTD_OPTIONAL_H -#define OTTD_OPTIONAL_H - -#if defined(__has_include) -# if __has_include() -# include -# endif -#endif - -#if (__cplusplus >= 201703L) || (defined(__cpp_lib_optional) && __cpp_lib_optional >= 201606L) - -/* Native std::optional. */ -#include -namespace opt = std; - -#else - -/* No std::optional, use local copy instead. */ -#include "optional.hpp" -namespace opt = std::experimental; - -#endif - -#endif /* OTTD_OPTIONAL_H */ -- cgit v1.2.3-54-g00ecf