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 3612076943)
This commit is contained in:
parent
acae85d1a4
commit
edfe398e26
|
|
@ -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 name_component_t&that);
|
||||||
extern std::ostream& operator<< (std::ostream&out, const index_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 */
|
#endif /* IVL_pform_types_H */
|
||||||
|
|
|
||||||
|
|
@ -903,4 +903,8 @@ class ExpTime : public Expression {
|
||||||
timeunit_t unit_;
|
timeunit_t unit_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if __cplusplus < 201103L
|
||||||
|
#undef unique_ptr
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* IVL_expression_H */
|
#endif /* IVL_expression_H */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue