[Libreoffice-commits] core.git: 2 commits - sal/cpprt sal/qa

[Stephan Bergmann]

 sal/cpprt/operators_new_delete.cxx   |    2 +-
 sal/qa/osl/security/osl_Security.cxx |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 78cc97405be83aaea6bf47102c2465233bbcd25f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 23 11:13:56 2016 +0200

    -Werror,-Wunused-variable (clang-cl)
    
    Change-Id: I829e2d45ac9fabc8fe1a26bebd9e6ce8c2af29c7

diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 396959be..1ebdbea 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -368,7 +368,6 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
     /// Get user home directory.
     HKEY hRegKey;
     sal_Char PathA[_MAX_PATH];
-    ::rtl::OUString strHome;
     if (RegOpenKey(HKEY_CURRENT_USER,  "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders",  &hRegKey) == ERROR_SUCCESS)
     {
         LONG lRet, lSize = sizeof(PathA);
commit 73a346d3e94509e00932080bb9c3b385d26627d2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 23 11:13:03 2016 +0200

    This is fixed with MSVC 2015
    
    Change-Id: I032b872f75b59904c1c81e8932ad8058ece301b0

diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx
index 6f681e1..a8d77eb 100644
--- a/sal/cpprt/operators_new_delete.cxx
+++ b/sal/cpprt/operators_new_delete.cxx
@@ -196,7 +196,7 @@ void* SAL_CALL operator new[] (std::size_t n) throw (std::bad_alloc)
 }
 
 void SAL_CALL operator delete[] (void * p)
-#if !defined _MSC_VER
+#if !defined _MSC_VER || _MSC_VER >= 1900
     throw ()
 #endif
 {