From 803f7ed4bb05d8f79114e0e5f148e70c0a9dd3c7 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Mon, 4 Nov 2019 10:47:45 +0300 Subject: Move GC_throw_bad_alloc definition to new C++ file Issue #268 (bdgwc). * CMakeLists.txt [enable_cplusplus] (gccpp): Add gc_badalc.cc library source file. * Makefile.am [CPLUSPLUS] (libgccpp_la_SOURCES): Likewise. * Makefile.am (EXTRA_DIST): Add gc_badalc.cpp. * Makefile.direct (SRCS): Add gc_badalc.cc. * Makefile.direct (gc_badalc.o): New target. * NT_MAKEFILE (gc_badalc.obj): Likewise. * WCC_MAKEFILE (gc_badalc.obj): Likewise. * digimars.mak (gc_badalc.obj): Likewise. * build/s60v3/libgc.mmp (SOURCE): Mention gc_badalc.cpp (commented out). * Makefile.direct (c++): Add dependency on gc_badalc.o; pass gc_badalc.o to ru tool. * NT_MAKEFILE (gccpp.lib): Add dependency on gc_badalc.obj; pass gc_badalc.obj to lib or link tool. * WCC_MAKEFILE (gccpp.lib, gccpp.dll): Likewise. * digimars.mak (OBJS): Add gc_badalc.obj. * doc/README.Mac (Files to build the GC libraries): Add gc_badalc.cc. * doc/gcinterface.md (C++ Interface): Mention gc_badalc.cc file. * gc_badalc.cc: New file. * gc_badalc.cpp: Likewise. * gc_cpp.cc (GC_throw_bad_alloc): Move to gc_badalc.cc. * gc_cpp.cc (GC_ALLOCATOR_THROW_OR_ABORT): Add comment; do not define unless GC_NO_INLINE_STD_NEW, or not _MSC_VER and not __DMC__. * tests/tests.am [CPLUSPLUS && AVOID_CPP_LIB] (test_cpp_LDADD): Add gc_badalc.o. --- NT_MAKEFILE | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'NT_MAKEFILE') diff --git a/NT_MAKEFILE b/NT_MAKEFILE index 76784f60..1ca2b620 100644 --- a/NT_MAKEFILE +++ b/NT_MAKEFILE @@ -121,8 +121,8 @@ gc.lib: $(OBJS) cord.lib: $(COBJS) lib /out:cord.lib /MACHINE:$(CPU) $(COBJS) -gccpp.lib: gc_cpp.obj - lib /out:gccpp.lib /MACHINE:$(CPU) gc_cpp.obj +gccpp.lib: gc_badalc.obj gc_cpp.obj + lib /out:gccpp.lib /MACHINE:$(CPU) gc_badalc.obj gc_cpp.obj !ELSE @@ -132,8 +132,8 @@ gc.lib: $(OBJS) cord.lib: $(COBJS) gc.lib $(link) $(ldebug) gc.lib /subsystem:windows /dll /INCREMENTAL:NO /pdb:"cord.pdb" /out:cord.dll /implib:cord.lib /MACHINE:$(CPU) $(COBJS) -gccpp.lib: gc_cpp.obj gc.lib - $(link) $(ldebug) gc.lib /subsystem:windows /dll /INCREMENTAL:NO /pdb:"gccpp.pdb" /out:gccpp.dll /implib:gccpp.lib /MACHINE:$(CPU) gc_cpp.obj +gccpp.lib: gc_badalc.obj gc_cpp.obj gc.lib + $(link) $(ldebug) gc.lib /subsystem:windows /dll /INCREMENTAL:NO /pdb:"gccpp.pdb" /out:gccpp.dll /implib:gccpp.lib /MACHINE:$(CPU) gc_badalc.obj gc_cpp.obj !ENDIF @@ -157,6 +157,8 @@ de.exe: cord\tests\de.obj cord\tests\de_win.obj cord\tests\de_win.rbj gc.lib cor cordtest.exe: cord\tests\cordtest.obj gc.lib cord.lib $(link) /subsystem:console /MACHINE:$(CPU) /INCREMENTAL:NO $(ldebug) $(lflags) -out:cordtest.exe cord\tests\cordtest.obj gc.lib cord.lib user32.lib +gc_badalc.obj: gc_badalc.cc include\gc_cpp.h include\gc.h + gc_cpp.obj: gc_cpp.cc include\gc_cpp.h include\gc.h test_cpp.cpp: tests\test_cpp.cc -- cgit v1.2.1