ChangeLogTag:Mon Dec 9 17:02:41 2002 Steve Huston <shuston@riverace.com>

4 files changed, 32 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 73e28f042d5..e1cf10f68a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,19 @@
+Mon Dec  9 17:02:41 2002  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_aix_ibm.GNU: Change from using
+          -qtemplateregistry to use -qtempinc for Visual Age C++ 6 template
+          handling. -qtemplateregistry is a nice idea, but generates too
+          many errors from missing templates. Using -qtempinc still generates
+          gobs of multiple-instantiation warnings, but the build is correct
+          and the tests run.
+
+        * bin/aix_shr: Add the error number patterns for VA 6's multiple
+          template instantiation warnings to the filter-out pattern.
+
 Mon Dec  9 15:42:39 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* examples/C++NPv1/Reactive_Logging_Server_Ex.cpp:  Removed
-	  duplicate template specilization for ACE_Hash<ACE_HANDLE> on
+	  duplicate template specialization for ACE_Hash<ACE_HANDLE> on
 	  Windows that's no longer needed.
 
 Mon Dec  9 07:41:39 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 73e28f042d5..e1cf10f68a6 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,7 +1,19 @@
+Mon Dec  9 17:02:41 2002  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_aix_ibm.GNU: Change from using
+          -qtemplateregistry to use -qtempinc for Visual Age C++ 6 template
+          handling. -qtemplateregistry is a nice idea, but generates too
+          many errors from missing templates. Using -qtempinc still generates
+          gobs of multiple-instantiation warnings, but the build is correct
+          and the tests run.
+
+        * bin/aix_shr: Add the error number patterns for VA 6's multiple
+          template instantiation warnings to the filter-out pattern.
+
 Mon Dec  9 15:42:39 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* examples/C++NPv1/Reactive_Logging_Server_Ex.cpp:  Removed
-	  duplicate template specilization for ACE_Hash<ACE_HANDLE> on
+	  duplicate template specialization for ACE_Hash<ACE_HANDLE> on
 	  Windows that's no longer needed.
 
 Mon Dec  9 07:41:39 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
diff --git a/bin/aix_shr b/bin/aix_shr
index a19ae9fe8d5..5ea5bed40fe 100755
--- a/bin/aix_shr
+++ b/bin/aix_shr
@@ -18,8 +18,10 @@ done
 $@ > "$usrtmp/$output" 2>&1
 status=$?
 
-## Print the output to stdout, but filter duplicate symbol warnings
-/bin/egrep -v '0711-(224|345)' "$usrtmp/$output"
+## Print the output to stdout, but filter duplicate symbol warnings from
+## Visual Age C++-using builds. The first pattern ends up coming from the
+## linker in Visual Age C++ 5 builds; the second is from Visual Age C++ 6.
+/bin/egrep -v '0711-(224|345)|1540-0(424|425|436)' "$usrtmp/$output"
 
 ## Clean up the temporary file
 /bin/rm -f "$usrtmp/$output"
diff --git a/include/makeinclude/platform_aix_ibm.GNU b/include/makeinclude/platform_aix_ibm.GNU
index e4ea0d61c74..910c85fb107 100644
--- a/include/makeinclude/platform_aix_ibm.GNU
+++ b/include/makeinclude/platform_aix_ibm.GNU
@@ -104,7 +104,8 @@ else    # Visual Age 5 and 6
     TEMPINCDIR  = tempinc
   else
     ifeq ($(XLCVERSION),0x0600)
-      CCFLAGS    += -qflag=w:w -qstaticinline -qfuncsect -qtemplateregistry
+      CCFLAGS    += -qflag=w:w -qstaticinline -qfuncsect -qtempinc
+      TEMPINCDIR = tempinc
     else
       CXX = echo "Unrecognized compiler version $(XLCVERSION)\n"
     endif