From aa57fe653d3836026fcb607cbf16a7a9eaa774ff Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 14 Apr 2018 16:13:39 +0100
Subject: Ice 3.7

--ice / allow-ice is no longer required.
---
 slicer/test/Jamfile.jam | 5 ++---
 slicer/tool/parser.cpp  | 3 +--
 slicer/tool/parser.h    | 1 -
 slicer/tool/slicer.cpp  | 1 -
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/slicer/test/Jamfile.jam b/slicer/test/Jamfile.jam
index 44f9aa1..45558d3 100644
--- a/slicer/test/Jamfile.jam
+++ b/slicer/test/Jamfile.jam
@@ -17,12 +17,11 @@ generators.override $(__name__).slicer : slice.slicer ;
 feature.feature slicerbin : : free dependency ;
 toolset.flags slicer SLICERBIN <slicerbin> ;
 toolset.flags slicer INCLUDES <include> ;
-toolset.flags slicer ALLOWICE <allow-ice>yes : --ice ;
 
 actions slicer bind SLICERBIN
 {
-  slice2cpp -I"$(INCLUDES)" --checksum --output-dir $(1[1]:D) $(2) --dll-export JAM_DLL_PUBLIC $(ALLOWICE[1])
-	"$(SLICERBIN)" -I"$(INCLUDES)" $(2) $(1[2]) $(ALLOWICE[1]) --headerPrefix="\"\""
+  slice2cpp -I"$(INCLUDES)" --checksum --output-dir $(1[1]:D) $(2) --dll-export JAM_DLL_PUBLIC
+	"$(SLICERBIN)" -I"$(INCLUDES)" $(2) $(1[2]) --headerPrefix="\"\""
 }
 
 lib types :
diff --git a/slicer/tool/parser.cpp b/slicer/tool/parser.cpp
index 0004f36..043d10c 100644
--- a/slicer/tool/parser.cpp
+++ b/slicer/tool/parser.cpp
@@ -18,7 +18,6 @@ namespace Slicer {
 	Slicer::Slicer() :
 		cpp(NULL),
 		headerPrefix("slicer"),
-		allowIcePrefix(false),
 		components(0),
 		classNo(0)
 	{
@@ -595,7 +594,7 @@ namespace Slicer {
 				throw CompilerError("preprocess failed");
 			}
 
-			Slice::UnitPtr u = Slice::Unit::createUnit(false, false, allowIcePrefix, false);
+			Slice::UnitPtr u = Slice::Unit::createUnit(false, false, false, false);
 
 			int parseStatus = u->parse(slicePath.string(), cppHandle, false);
 
diff --git a/slicer/tool/parser.h b/slicer/tool/parser.h
index 3410dc5..5be5fbb 100644
--- a/slicer/tool/parser.h
+++ b/slicer/tool/parser.h
@@ -27,7 +27,6 @@ namespace Slicer {
 			boost::filesystem::path cppPath;
 			boost::filesystem::path headerPrefix;
 			std::vector<boost::filesystem::path> includes;
-			bool allowIcePrefix;
 
 			unsigned int Execute();
 			unsigned int Components() const;
diff --git a/slicer/tool/slicer.cpp b/slicer/tool/slicer.cpp
index e97483e..925e6df 100644
--- a/slicer/tool/slicer.cpp
+++ b/slicer/tool/slicer.cpp
@@ -12,7 +12,6 @@ main(int argc, char ** argv)
 	opts.add_options()
 		("help,h", "Show this help message")
 		("include,I", po::value(&slicer.includes), "Add include directory to search path")
-		("ice", po::value(&slicer.allowIcePrefix)->default_value(slicer.allowIcePrefix)->zero_tokens(), "Allow reserved Ice prefix in Slice identifiers")
 		("headerPrefix", po::value(&slicer.headerPrefix)->default_value(slicer.headerPrefix), "Prefix path for Slicer C++ #includes")
 		("slice,i", po::value(&slicer.slicePath), "Input ICE Slice file")
 		("cpp,o", po::value(&slicer.cppPath), "Output C++ file");
-- 
cgit v1.2.3