From 283d43f98839b00e662677a04360544c9f8bf028 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 30 May 2018 23:29:05 +0200 Subject: [PATCH] putil: workaround macOS 10.6 compile error until #300 is fixed [skip ci] --- panda/src/putil/bitMask.cxx | 5 +++-- panda/src/putil/doubleBitMask.cxx | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/panda/src/putil/bitMask.cxx b/panda/src/putil/bitMask.cxx index ba81e204c7..cd200ab565 100644 --- a/panda/src/putil/bitMask.cxx +++ b/panda/src/putil/bitMask.cxx @@ -12,13 +12,14 @@ */ #include "bitMask.h" -#include template class BitMask; template class BitMask; template class BitMask; -#ifndef CPPPARSER +#if !defined(CPPPARSER) && !defined(__APPLE__) +#include + static_assert(std::is_literal_type::value, "BitMask16 is not a literal type"); static_assert(std::is_literal_type::value, "BitMask32 is not a literal type"); static_assert(std::is_literal_type::value, "BitMask64 is not a literal type"); diff --git a/panda/src/putil/doubleBitMask.cxx b/panda/src/putil/doubleBitMask.cxx index a69d6b0eb0..ff651eea61 100644 --- a/panda/src/putil/doubleBitMask.cxx +++ b/panda/src/putil/doubleBitMask.cxx @@ -12,12 +12,13 @@ */ #include "doubleBitMask.h" -#include template class DoubleBitMask; template class DoubleBitMask; -#ifndef CPPPARSER +#if !defined(CPPPARSER) && !defined(__APPLE__) +#include + static_assert(std::is_literal_type::value, "DoubleBitMaskNative is not a literal type"); static_assert(std::is_literal_type::value, "QuadBitMaskNative is not a literal type"); #endif