INTEGRATION: CWS warnings01 (1.12.2); FILE MERGED

2005/11/09 20:54:26 sb 1.12.2.1: #i53898# Avoid warnings about name hiding from template code, when instantiated for certain class arguments.

3 files changed, 42 insertions, 6 deletions

diff --git a/cppuhelper/inc/cppuhelper/compbase7.hxx b/cppuhelper/inc/cppuhelper/compbase7.hxx
index 10a6638d5b76..f0f3604999b7 100644
--- a/cppuhelper/inc/cppuhelper/compbase7.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase7.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: compbase7.hxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: hr $ $Date: 2005-10-27 17:15:59 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 10:30:06 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -48,6 +48,13 @@ __DEF_COMPIMPLHELPER_EX( 7 )
 
 namespace cppu
 {
+
+// Suppress warnings about hidden functions in case any of the IfcN has
+// functions named dispose, addEventListener, or removeEventListener:
+#if defined __SUNPRO_CC
+#pragma disable_warn
+#endif
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
@@ -91,6 +98,11 @@ namespace cppu
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
+
+#if defined __SUNPRO_CC
+#pragma enable_warn
+#endif
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
diff --git a/cppuhelper/inc/cppuhelper/compbase8.hxx b/cppuhelper/inc/cppuhelper/compbase8.hxx
index 30ca974b8944..8fd8c964fc80 100644
--- a/cppuhelper/inc/cppuhelper/compbase8.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase8.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: compbase8.hxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: hr $ $Date: 2005-10-27 17:16:13 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 10:30:19 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -48,6 +48,13 @@ __DEF_COMPIMPLHELPER_EX( 8 )
 
 namespace cppu
 {
+
+// Suppress warnings about hidden functions in case any of the IfcN has
+// functions named dispose, addEventListener, or removeEventListener:
+#if defined __SUNPRO_CC
+#pragma disable_warn
+#endif
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
@@ -91,6 +98,11 @@ namespace cppu
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
+
+#if defined __SUNPRO_CC
+#pragma enable_warn
+#endif
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
diff --git a/cppuhelper/inc/cppuhelper/compbase9.hxx b/cppuhelper/inc/cppuhelper/compbase9.hxx
index ac52452469f9..4abf172183a7 100644
--- a/cppuhelper/inc/cppuhelper/compbase9.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase9.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: compbase9.hxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: hr $ $Date: 2005-10-27 17:16:25 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 10:30:40 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -48,6 +48,13 @@ __DEF_COMPIMPLHELPER_EX( 9 )
 
 namespace cppu
 {
+
+// Suppress warnings about hidden functions in case any of the IfcN has
+// functions named dispose, addEventListener, or removeEventListener:
+#if defined __SUNPRO_CC
+#pragma disable_warn
+#endif
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
@@ -91,6 +98,11 @@ namespace cppu
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
+
+#if defined __SUNPRO_CC
+#pragma enable_warn
+#endif
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
         Upon disposing objects of this class, sub-classes receive a disposing()