diff options
| author | Ian Lance Taylor <iant@golang.org> | 2022-02-16 12:21:31 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2022-02-16 12:21:31 -0800 |
| commit | b43d6db9780462273c4d885a0111e3376c114c61 (patch) | |
| tree | 0dff7e34fe65a75ba82e4a13d69991fdaea7c5eb /libphobos/libdruntime/rt | |
| parent | 9419b14e109a2807361a9f695f5767f03dfa0cae (diff) | |
| parent | 24ca97325cab7bc454c785d55f37120fe7ea6f74 (diff) | |
| download | gcc-b43d6db9780462273c4d885a0111e3376c114c61.zip gcc-b43d6db9780462273c4d885a0111e3376c114c61.tar.gz gcc-b43d6db9780462273c4d885a0111e3376c114c61.tar.bz2 | |
Merge from trunk revision 24ca97325cab7bc454c785d55f37120fe7ea6f74.
Diffstat (limited to 'libphobos/libdruntime/rt')
| -rw-r--r-- | libphobos/libdruntime/rt/dmain2.d | 2 | ||||
| -rw-r--r-- | libphobos/libdruntime/rt/util/typeinfo.d | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libphobos/libdruntime/rt/dmain2.d b/libphobos/libdruntime/rt/dmain2.d index b363e3f..47b67f1 100644 --- a/libphobos/libdruntime/rt/dmain2.d +++ b/libphobos/libdruntime/rt/dmain2.d @@ -624,7 +624,7 @@ extern (C) void _d_print_throwable(Throwable t) { WSink caption; if (t) - caption.sink(t.classinfo.name); + caption.sink(typeid(t).name); // Avoid static user32.dll dependency for console applications // by loading it dynamically as needed diff --git a/libphobos/libdruntime/rt/util/typeinfo.d b/libphobos/libdruntime/rt/util/typeinfo.d index d06254c..26c24c4 100644 --- a/libphobos/libdruntime/rt/util/typeinfo.d +++ b/libphobos/libdruntime/rt/util/typeinfo.d @@ -367,7 +367,10 @@ detect if we need to override. The overriding initializer should be nonzero. private class TypeInfoArrayGeneric(T, Base = T) : Select!(is(T == Base), TypeInfo_Array, TypeInfoArrayGeneric!Base) { static if (is(T == Base)) - override bool opEquals(Object o) { return TypeInfo.opEquals(o); } + override bool opEquals(const Object o) const @safe nothrow { return TypeInfo.opEquals(cast(const TypeInfo) o); } + + alias opEquals = typeof(super).opEquals; + alias opEquals = TypeInfo.opEquals; override string toString() const { return (T[]).stringof; } |