Skip to content

Commit

Permalink
[osc] build fix as GCC < 13 does not support mixing c++ and builtin a…
Browse files Browse the repository at this point in the history
…ttributes
  • Loading branch information
jcelerier committed Apr 2, 2024
1 parent ed1b520 commit 7d3a628
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
15 changes: 4 additions & 11 deletions src/ossia/detail/config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,10 @@
#define OSSIA_EXTERN_EXPORT_HPP(EXPORT) EXPORT
#define OSSIA_EXTERN_EXPORT_CPP(EXPORT)

#if defined(__cplusplus) \
&& ((__cplusplus >= 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1900))
#define OSSIA_CXX11 1
#endif
#if defined(__cplusplus) \
&& ((__cplusplus >= 201403L) || (defined(_MSC_VER) && _MSC_VER >= 1900))
#define OSSIA_CXX14 1
#endif
#if defined(__cplusplus) \
&& ((__cplusplus >= 201703L) || (defined(_MSC_VER) && _MSC_VER >= 1900))
#define OSSIA_CXX17 1
#if defined(__clang__) || defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ >= 13))
#define OSSIA_DEPRECATED(REASON) [[deprecated(REASON)]]
#else
#define OSSIA_DEPRECATED(REASON)
#endif

/// Constexpr support ///
Expand Down
2 changes: 1 addition & 1 deletion src/ossia/network/osc/osc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace ossia::net
{
struct osc_1_0_outbound_stream_visitor;

class [[deprecated("Use make_osc_protocol")]] OSSIA_EXPORT osc_protocol final
class OSSIA_EXPORT OSSIA_DEPRECATED("Use make_osc_protocol") osc_protocol final
: public ossia::net::protocol_base
{
public:
Expand Down

0 comments on commit 7d3a628

Please sign in to comment.