# HG changeset patch
# User erikj
# Date 1440753057 -7200
# Node ID bf890f7af01425e342ad6f6c3244b2ec930b8eec
# Parent  f7abf3de78228c541acdd532d6a7de12ad05e1b2# Parent  c64d134410a77bc86a7db986765462cfb3478abe
Merge

diff -r f7abf3de7822 -r bf890f7af014 make/solaris/makefiles/adlc.make
--- a/make/solaris/makefiles/adlc.make	Fri Aug 28 09:05:46 2015 +0200
+++ b/make/solaris/makefiles/adlc.make	Fri Aug 28 11:10:57 2015 +0200
@@ -76,6 +76,11 @@
 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
   CFLAGS_WARN = +w -errwarn
 endif
+# When using compiler version 5.13 (Solaris Studio 12.4), calls to explicitly 
+# instantiated template functions trigger this warning when +w is active.
+ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 513), 1)
+  CFLAGS_WARN += -erroff=notemsource
+endif
 CFLAGS += $(CFLAGS_WARN)
 
 ifeq ("${Platform_compiler}", "sparcWorks")