diff options
| author | dim <dim@FreeBSD.org> | 2015-01-31 23:08:29 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-01-31 23:08:29 +0000 |
| commit | addd2d04c7ab661635b00b0cb84ac21021d38f5f (patch) | |
| tree | 5546dff34da9eb6026bbca6122c460637f666ab1 /contrib/libcxxrt | |
| parent | e626c4973b3e1e7a3a70e3500fded50cd241f126 (diff) | |
| download | FreeBSD-src-addd2d04c7ab661635b00b0cb84ac21021d38f5f.zip FreeBSD-src-addd2d04c7ab661635b00b0cb84ac21021d38f5f.tar.gz | |
Revert r256642, not only to reduce diffs against upstream libcxxrt, but
also because it is the wrong approach: comparing typeinfo names deeply
causes trouble if two loaded DSOs use independent types of the same
name.
In addition, this particular change was never merged to FreeBSD 10.x and
9.x, so let's get rid of it before it ends up in an 11.x release.
Discussed with: theraven, joerg@netbsd
Diffstat (limited to 'contrib/libcxxrt')
| -rw-r--r-- | contrib/libcxxrt/typeinfo.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/contrib/libcxxrt/typeinfo.cc b/contrib/libcxxrt/typeinfo.cc index 7c32073..71de9ae 100644 --- a/contrib/libcxxrt/typeinfo.cc +++ b/contrib/libcxxrt/typeinfo.cc @@ -35,23 +35,15 @@ type_info::~type_info() {} bool type_info::operator==(const type_info &other) const { -#ifdef LIBCXXRT_MERGED_TYPEINFO return __type_name == other.__type_name; -#else - return __type_name == other.__type_name || strcmp(__type_name, other.__type_name) == 0; -#endif } bool type_info::operator!=(const type_info &other) const { - return !operator==(other); + return __type_name != other.__type_name; } bool type_info::before(const type_info &other) const { -#ifdef LIBCXXRT_MERGED_TYPEINFO return __type_name < other.__type_name; -#else - return strcmp(__type_name, other.__type_name) < 0; -#endif } const char* type_info::name() const { |
