Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Revert PR 2194 - Don't needlessly import everything in object.d when compiling with -betterC #2208

Merged
dlang-bot merged 1 commit into from
Jun 10, 2018
Merged

Revert PR 2194 - Don't needlessly import everything in object.d when compiling with -betterC #2208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions src/object.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@

module object;

version(D_BetterC) { }
else
{
version = Not_BetterC;
}

// NOTE: For some reason, this declaration method doesn't work
// in this particular file (and this file only). It must
// be a DMD thing.
Expand Down Expand Up @@ -101,8 +95,6 @@ int __cmp(T)(const T[] lhs, const T[] rhs) @trusted
}
}

version(Not_BetterC)
{
// Compare class and interface objects for ordering.
private int __cmp(Obj)(Obj lhs, Obj rhs)
if (is(Obj : Object))
Expand Down Expand Up @@ -323,7 +315,6 @@ version(Not_BetterC)
assert(__cmp([c2, c2], [c1, c1]) > 0);
assert(__cmp([c2, c2], [c2, c1]) > 0);
}
}

// `lhs == rhs` lowers to `__equals(lhs, rhs)` for dynamic arrays
bool __equals(T1, T2)(T1[] lhs, T2[] rhs)
Expand Down Expand Up @@ -563,8 +554,7 @@ nothrow @safe @nogc unittest
}
}

version(Not_BetterC)
{

/// ditto
void destroy(T)(T obj) if (is(T == class))
{
Expand Down Expand Up @@ -851,12 +841,7 @@ version(Not_BetterC)
assert(isnan(a));
}
}
}

/*============================ NOT -betterC ====================================
Anything below this line should not be imported if compiling with -betterC
*/
version(Not_BetterC):

private
{
Expand Down