Merge pull request #685 from 9rnsr/fix_unqual

Remove unused _Unqual from `object` module
dlang · Dec 10, 2013 · 8d49e9d · 8d49e9d
2 parents 2649883 + 3efbfd5
commit 8d49e9d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 39 deletions.
diff --git a/src/core/time.d b/src/core/time.d
@@ -3254,25 +3254,7 @@ string numToString(long value) @safe pure nothrow
 }
 
 
-/+ A copy of std.traits.Unqual. +/
-private template _Unqual(T)
-{
-    version (none) // Error: recursive alias declaration @@@BUG1308@@@
-    {
-             static if (is(T U ==     const U)) alias _Unqual!U _Unqual;
-        else static if (is(T U == immutable U)) alias _Unqual!U _Unqual;
-        else static if (is(T U ==    shared U)) alias _Unqual!U _Unqual;
-        else                                    alias        T _Unqual;
-    }
-    else // workaround
-    {
-             static if (is(T U == shared(const U))) alias U _Unqual;
-        else static if (is(T U ==        const U )) alias U _Unqual;
-        else static if (is(T U ==    immutable U )) alias U _Unqual;
-        else static if (is(T U ==       shared U )) alias U _Unqual;
-        else                                        alias T _Unqual;
-    }
-}
+private alias _Unqual(T) = typeof(cast()T.init);
 
 unittest
 {

diff --git a/src/object.di b/src/object.di
@@ -375,16 +375,6 @@ extern (C)
     void _aaRangePopFront(ref AARange r);
 }
 
-private template _Unqual(T)
-{
-         static if (is(T U == shared(const U))) alias U _Unqual;
-    else static if (is(T U ==        const U )) alias U _Unqual;
-    else static if (is(T U ==    immutable U )) alias U _Unqual;
-    else static if (is(T U ==        inout U )) alias U _Unqual;
-    else static if (is(T U ==       shared U )) alias U _Unqual;
-    else                                        alias T _Unqual;
-}
-
 struct AssociativeArray(Key, Value)
 {
 private:

diff --git a/src/object_.d b/src/object_.d
@@ -1944,16 +1944,6 @@ extern (C)
     hash_t _aaGetHash(in void* aa, in TypeInfo tiRaw) nothrow;
 }
 
-private template _Unqual(T)
-{
-         static if (is(T U == shared(const U))) alias U _Unqual;
-    else static if (is(T U ==        const U )) alias U _Unqual;
-    else static if (is(T U ==    immutable U )) alias U _Unqual;
-    else static if (is(T U ==        inout U )) alias U _Unqual;
-    else static if (is(T U ==       shared U )) alias U _Unqual;
-    else                                        alias T _Unqual;
-}
-
 struct AssociativeArray(Key, Value)
 {
 private: