Improve detection of libsupc++

main
David Chisnall 8 years ago
parent dc9b8313a4
commit 7832765112

@ -21,7 +21,6 @@ namespace std
bool operator==(const type_info &) const; bool operator==(const type_info &) const;
bool operator!=(const type_info &) const; bool operator!=(const type_info &) const;
bool before(const type_info &) const; bool before(const type_info &) const;
type_info();
private: private:
type_info(const type_info& rhs); type_info(const type_info& rhs);
type_info& operator= (const type_info& rhs); type_info& operator= (const type_info& rhs);
@ -44,14 +43,12 @@ namespace std
class type_info2 : public std::type_info class type_info2 : public std::type_info
{ {
public: public:
type_info2() : type_info("foo") {}
virtual bool __is_pointer_p() const; virtual bool __is_pointer_p() const;
virtual bool __is_function_p() const { return true; } virtual bool __is_function_p() const { return true; }
virtual bool __do_catch(const type_info *thrown_type, virtual bool __do_catch(const type_info *thrown_type,
void **thrown_object, void **thrown_object,
unsigned outer) const { return true; } unsigned outer) const { return true; }
virtual bool __do_upcast(
const __class_type_info *target,
void **thrown_object) const { return true; }
}; };
bool type_info2::__is_pointer_p() const { return true; } bool type_info2::__is_pointer_p() const { return true; }

@ -231,7 +231,7 @@ if (ENABLE_OBJCXX)
target_link_libraries(objc ${CXX_RUNTIME}) target_link_libraries(objc ${CXX_RUNTIME})
endif() endif()
set(libobjc_CXX_SRCS ${libobjcxx_CXX_SRCS}) set(libobjc_CXX_SRCS ${libobjcxx_CXX_SRCS})
target_sources(objc ${libobjcxx_CXX_SRCS}) target_sources(objc PRIVATE ${libobjcxx_CXX_SRCS})
endif() endif()

Loading…
Cancel
Save