From cdcadd2d16710a14ba1427e88a048d75ee88a3cb Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 17 Apr 2018 22:22:02 +0100 Subject: C++17 and Ice 3.7 Update everything to Ice 3.7 and C++17 in keeping with other libs/services --- slice.jam | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'slice.jam') diff --git a/slice.jam b/slice.jam index 434e562..d261c50 100644 --- a/slice.jam +++ b/slice.jam @@ -8,7 +8,6 @@ import toolset ; type.register SLICE : ice ; feature slicer : no yes pure ; -feature allow-ice : no yes ; feature ice-visibility : public hidden ; class slice-scanner : common-scanner @@ -29,27 +28,24 @@ generators.register-standard slice.slicer.pure : SLICE : CPP(slicer-%) : ; toolset.flags slice.slice2cpp DLLEXPORT public : --dll-export JAM_DLL_PUBLIC ; -toolset.flags slice.slice2cpp ALLOWICE yes : --ice ; toolset.flags slice.slicer INCLUDES ; toolset.flags slice.slicer DLLEXPORT public : --dll-export JAM_DLL_PUBLIC ; -toolset.flags slice.slicer ALLOWICE yes : --ice ; toolset.flags slice.slicer.pure INCLUDES ; -toolset.flags slice.slicer.pure ALLOWICE yes : --ice ; actions slice.slice2cpp { - slice2cpp -I"$(INCLUDES)" --checksum --output-dir $(1[1]:D) $(2) $(DLLEXPORT) $(ALLOWICE[1]) + slice2cpp -I"$(INCLUDES)" --checksum --output-dir $(1[1]:D) $(2) $(DLLEXPORT) } actions slice.slicer { - slice2cpp -I"$(INCLUDES)" --checksum --output-dir $(1[1]:D) $(2) $(DLLEXPORT) $(ALLOWICE[1]) - slicer -I"$(INCLUDES)" $(2) $(1[2]) $(ALLOWICE[1]) + slice2cpp -I"$(INCLUDES)" --checksum --output-dir $(1[1]:D) $(2) $(DLLEXPORT) + slicer -I"$(INCLUDES)" $(2) $(1[2]) } actions slice.slicer.pure { - slicer -I"$(INCLUDES)" $(2) $(1[1]) $(ALLOWICE[1]) + slicer -I"$(INCLUDES)" $(2) $(1[1]) } IMPORT $(__name__) : slice.slice2cpp : : slice.slice2cpp ; -- cgit v1.2.3