Problem building JDK-1.3.1p9 on recent -current (patch included)

[Timo Geusch]

Apologies if this is a known problem...

Building JDK13 on -current cvsup'd yesterday fails as the newer C++ compiler
doesn't like some of the C++ code in the plugin directory - see attached error 
message.

The patch fixes the error for me, unfortunately I don't have a scratch 
releng_4 box handy to rebuild the JDK there in order to verify that the patch 
doesn't break compilation with the older code. The patch itself is simple
enough, it appears that the 'offending' code is already in place but was
commented out.

Regards,

T.

-------------- next part --------------
>>>Recursively making ./../ext/plugin/build/solaris all @ Sun Aug 29 08:38:47 BST 2004 ...
gmake[1]: Entering directory `/usr/ports/java/jdk13/work/j2sdk1.3.1/ext/plugin/build/solaris'
g++ -Wall -Wno-unused -Wconversion  -O -c  -w -D_GNU_SOURCE -DXP_UNIX  -DVERSION="\"1.3.1-p9-root-040829-08:38\"" -DDATE="\"Aug-29-2004\"" -DARCH="\"i386\"" -DRAPTOR_API -DNEW_STREAMING_API -I../../tmp/bsd/i386/CClassHeaders -I../../oji-plugin/src/motif/common -I../../oji-plugin/src/motif/navig5 -I/usr/X11R6/include -I/usr/X11R6/include -I../../../../src/share/javavm/export -I../../../../src/solaris/javavm/export -I../../oji-plugin/include/solaris/navig5 -I/usr/local/include/glib12 -I/usr/X11R6/include/gtk12 -I -I/usr/local/bin//../plugin/libg/lib/glib/include -I/usr/local/include -I/usr/local/bin//../../share/plugin -o ../../tmp/bsd/i386/NetscapeStream5.o ../../oji-plugin/src/motif/navig5/NetscapeStream5.cpp
In file included from ../../oji-plugin/include/solaris/navig5/nsComponentManagerUtils.h:23,
                 from ../../oji-plugin/include/solaris/navig5/nsIComponentManager.h:157,
                 from ../../oji-plugin/include/solaris/navig5/nsRepository.h:26,
                 from ../../oji-plugin/include/solaris/navig5/nsplugin.h:86,
                 from ../../oji-plugin/src/motif/navig5/NetscapeStream5.cpp:31:
../../oji-plugin/include/solaris/navig5/nsCOMPtr.h:605: error: an explicit specialization must be preceded by 'template <>'
../../oji-plugin/include/solaris/navig5/nsCOMPtr.h:848: error: an explicit specialization must be preceded by 'template <>'
gmake[1]: *** [../../tmp/bsd/i386/NetscapeStream5.o] Error 1
gmake[1]: Leaving directory `/usr/ports/java/jdk13/work/j2sdk1.3.1/ext/plugin/build/solaris'
gmake: *** [plugin-all] Error 1
*** Error code 2

Stop in /usr/ports/java/jdk13.
-------------- next part --------------
--- ext/plugin/oji-plugin/include/solaris/navig5/nsCOMPtr.h.orig	Sun Aug 29 08:40:56 2004
+++ ext/plugin/oji-plugin/include/solaris/navig5/nsCOMPtr.h	Sun Aug 29 08:41:48 2004
@@ -600,7 +600,7 @@
     Specializing |nsCOMPtr| for |nsISupports| allows us to 
   */
 
-// template <>
+template <>
 class nsCOMPtr<nsISupports>
     : private nsCOMPtr_base
   {
@@ -843,7 +843,7 @@
   };
 
 
-// template <>
+template <>
 class nsGetterAddRefs<nsISupports>
   {
     public: