[Libreoffice-commits] core.git: include/com

[David Ostrovsky]

 include/com/sun/star/uno/Any.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7c7124a51e467b6ab4df4d0a38000aa657c35029
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Fri Jul 31 07:41:07 2015 +0200

    Any.h: Fix declaration hides class member warning
    
    This fixes warning C4458 issued by MSVC 14.0 (aka VS2015) compiler.
    
    Change-Id: I48ed50bb54232d70460495d6d6a9e100fb90b869
    Reviewed-on: https://gerrit.libreoffice.org/17444
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>
    Tested-by: David Ostrovsky <david at ostrovsky.org>

diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index b700a54..3122af3 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -97,9 +97,9 @@ public:
     /** Constructor: Sets a copy of the given data.
 
         @param pData_ value
-        @param pType type of value
+        @param pType_ type of value
     */
-    inline Any( const void * pData_, typelib_TypeDescriptionReference * pType );
+    inline Any( const void * pData_, typelib_TypeDescriptionReference * pType_ );
 
     /** Destructor: Destructs any content and frees memory.
     */
@@ -186,9 +186,9 @@ public:
         and its memory freed.
 
         @param pData_ pointer to value
-        @param pType type of value
+        @param pType_ type of value
     */
-    inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescriptionReference * pType );
+    inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescriptionReference * pType_ );
     /** Sets a value. If the any already contains a value, that value will be destructed
         and its memory freed.