Merge pull request #2634 from JinShil/refactor_object

Refactor object.d: Move __cmp and __equals to rt merged-on-behalf-of: unknown
dlang · Jun 17, 2019 · d385cda · d385cda
2 parents c901b2a + 8d19a51
commit d385cda
Show file tree

Hide file tree

Showing 7 changed files with 456 additions and 418 deletions.
diff --git a/mak/COPY b/mak/COPY
@@ -403,4 +403,7 @@ COPY=\
 	$(IMPDIR)\core\sys\windows\wtsapi32.d \
 	$(IMPDIR)\core\sys\windows\wtypes.d \
 	\
+	$(IMPDIR)\rt\array\comparison.d \
+	$(IMPDIR)\rt\array\equality.d \
+	\
 	$(IMPDIR)\etc\linux\memoryerror.d
diff --git a/mak/SRCS b/mak/SRCS
@@ -451,6 +451,9 @@ SRCS=\
 	src\rt\tracegc.d \
 	src\rt\unwind.d \
 	\
+	src\rt\array\comparison.d \
+	src\rt\array\equality.d \
+	\
 	src\rt\backtrace\dwarf.d \
 	src\rt\backtrace\elf.d \
 	src\rt\backtrace\macho.d \

diff --git a/mak/WINDOWS b/mak/WINDOWS
@@ -55,6 +55,7 @@ copydir: $(IMPDIR)
 	mkdir $(IMPDIR)\core\sys\solaris\sys
 	mkdir $(IMPDIR)\core\sys\windows
 	mkdir $(IMPDIR)\etc\linux
+	mkdir $(IMPDIR)\rt\array
 
 copy: $(COPY)
 
@@ -1186,3 +1187,9 @@ $(IMPDIR)\core\sys\windows\wtypes.d : src\core\sys\windows\wtypes.d
 
 $(IMPDIR)\etc\linux\memoryerror.d : src\etc\linux\memoryerror.d
 	copy $** $@
+
+$(IMPDIR)\rt\array\comparison.d : src\rt\array\comparison.d
+	copy $** $@
+
+$(IMPDIR)\rt\array\equality.d : src\rt\array\equality.d
+	copy $** $@