Adjusted code to support safetyhook update #25

Job	Run time
build with sm1.9 on linux	1m 7s
build with sm1.10 on linux	1m 19s
build with sm1.11 on linux	2m 46s
build with smlatest on linux	1m 34s
build with sm1.9 on oldlinux	41s
build with sm1.10 on oldlinux	1m 16s
build with sm1.11 on oldlinux	55s
build with smlatest on oldlinux	1m 30s
build with sm1.9 on win	2m 3s
build with sm1.10 on win	1m 53s
build with sm1.11 on win	1m 51s
build with smlatest on win	2m 20s
	19m 15s

Provide feedback