From edfe398e26e186dcadc81f83ad864c2af1e1eb4d Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Fri, 2 Nov 2018 21:22:10 +0000 Subject: [PATCH] Undo redefinition of unique_ptr at end of header files. It seems that clang both defines __cplusplus < 201103L and provides unique_ptr (GitHub issue #215). (cherry picked from commit 36120769432577e3abd12a182b97d605bd4572a6) --- pform_types.h | 4 ++++ vhdlpp/expression.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pform_types.h b/pform_types.h index 0bd87d817..92061527e 100644 --- a/pform_types.h +++ b/pform_types.h @@ -380,4 +380,8 @@ extern std::ostream& operator<< (std::ostream&out, const pform_name_t&); extern std::ostream& operator<< (std::ostream&out, const name_component_t&that); extern std::ostream& operator<< (std::ostream&out, const index_component_t&that); +#if __cplusplus < 201103L +#undef unique_ptr +#endif + #endif /* IVL_pform_types_H */ diff --git a/vhdlpp/expression.h b/vhdlpp/expression.h index 303cdc063..f67de08b1 100644 --- a/vhdlpp/expression.h +++ b/vhdlpp/expression.h @@ -903,4 +903,8 @@ class ExpTime : public Expression { timeunit_t unit_; }; +#if __cplusplus < 201103L +#undef unique_ptr +#endif + #endif /* IVL_expression_H */