alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

* spot/misc/common.hh: Require C++17 and simplify some macros.

Browse source
This commit is contained in:
Alexandre Duret-Lutz 2020-09-21 14:19:07 +02:00
parent ea3e396427
commit f6ac69d0d2
1 changed files with 10 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

52
spot/misc/common.hh
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*- // -*- coding: utf-8 -*-
// Copyright (C) 2013-2019 Laboratoire de Recherche et Développement // Copyright (C) 2013-2020 Laboratoire de Recherche et Développement
// de l'Epita (LRDE). // de l'Epita (LRDE).
// //
// This file is part of Spot, a model checking library. // This file is part of Spot, a model checking library.
@ -31,23 +31,15 @@
#define SPOT_UNLIKELY(expr) (expr) #define SPOT_UNLIKELY(expr) (expr)
#endif #endif
#ifdef __has_cpp_attribute #ifdef SWIG
# if __has_cpp_attribute(deprecated) && __cplusplus >= 201402L #define SPOT_DEPRECATED(msg)
# define SPOT_DEPRECATED(msg) [[deprecated(msg)]] #define SPOT_FALLTHROUGH
# elif __has_cpp_attribute(gnu::deprecated) #else
# define SPOT_DEPRECATED(msg) [[gnu::deprecated(msg)]] #if __cplusplus < 201703L
# elif __has_cpp_attribute(clang::deprecated) #error C++17 compiler required
# define SPOT_DEPRECATED(msg) [[clang::deprecated(msg)]] #endif
# endif #define SPOT_DEPRECATED(msg) [[deprecated(msg)]]
#endif #define SPOT_FALLTHROUGH [[fallthrough]]
#ifndef SPOT_DEPRECATED
# ifdef __GNUC__
# define SPOT_DEPRECATED(msg) __attribute__ ((deprecated))
# elif defined(_MSC_VER)
# define SPOT_DEPRECATED(msg) __declspec(deprecated)
# else
# define SPOT_DEPRECATED(msg)
# endif
#endif #endif
#if defined _WIN32 || defined __CYGWIN__ #if defined _WIN32 || defined __CYGWIN__
@ -142,30 +134,6 @@
// auto func(int param) SPOT_RETURN(implem_.func(param)); // auto func(int param) SPOT_RETURN(implem_.func(param));
#define SPOT_RETURN(code) -> decltype(code) { return code; } #define SPOT_RETURN(code) -> decltype(code) { return code; }
// We hope compilers that implement -Wimplicit-fallthrough also
// support __has_cpp_attribute and some form of [[fallthrough]]. Do
// not use [[fallthough]] if the code is compiled in a pre-C++17
// standard since clang's -Wpedantic would complain that we are using
// a feature from the future.
#ifdef __has_cpp_attribute
# if __has_cpp_attribute(fallthrough) && __cplusplus > 201402L
# define SPOT_FALLTHROUGH [[fallthrough]]
# elif __has_cpp_attribute(clang::fallthrough)
# define SPOT_FALLTHROUGH [[clang::fallthrough]]
# elif __has_cpp_attribute(gnu::fallthrough)
# define SPOT_FALLTHROUGH [[gnu::fallthrough]]
# endif
#endif
#ifndef SPOT_FALLTHROUGH
// Clang 3.5 does not support __has_cpp_attribute but has
// [[clang::fallthrough]].
# if __clang__
# define SPOT_FALLTHROUGH [[clang::fallthrough]]
# else
# define SPOT_FALLTHROUGH while (0)
# endif
#endif
namespace spot namespace spot
{ {
struct SPOT_API parse_error: public std::runtime_error struct SPOT_API parse_error: public std::runtime_error