[Libreoffice-commits] core.git: include/rtl include/systools sal/osl sal/rtl
Mike Kaganski
mike.kaganski at collabora.com
Fri Feb 2 05:03:14 UTC 2018
include/rtl/stringutils.hxx | 2 +-
include/systools/win32/comtools.hxx | 6 ------
sal/osl/w32/file_url.hxx | 8 --------
sal/osl/w32/module.cxx | 6 ------
sal/osl/w32/nlsupport.cxx | 7 +------
sal/osl/w32/process.cxx | 14 +-------------
sal/osl/w32/procimpl.cxx | 6 ------
sal/osl/w32/system.h | 3 ---
sal/rtl/alloc_impl.hxx | 6 ------
sal/rtl/string.cxx | 4 ----
sal/rtl/ustring.cxx | 4 ----
11 files changed, 3 insertions(+), 63 deletions(-)
New commits:
commit ee4a456d9129ebbf46aa89531e1e8ca3f9a8fa11
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Wed Jan 31 20:49:32 2018 +0300
sal: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Ib7ad23257a966447d627b4f73698d9298790f759
Reviewed-on: https://gerrit.libreoffice.org/49042
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx
index 0223e71d1d41..c6a5fcb64917 100644
--- a/include/rtl/stringutils.hxx
+++ b/include/rtl/stringutils.hxx
@@ -78,7 +78,7 @@ struct SAL_WARN_UNUSED OUStringLiteral1_ {
#if defined _MSC_VER && _MSC_VER <= 1900 && !defined __clang__
// Visual Studio 2015
using OUStringLiteral1 = OUStringLiteral1_;
-#pragma warning(disable: 4239)
+#pragma warning(disable: 4239) // nonstandard extension used: 'argument': conversion from 'rtl::OUStringLiteral1_' to 'rtl::OUStringLiteral1_ &'
#else
using OUStringLiteral1 = OUStringLiteral1_ const;
#endif
diff --git a/include/systools/win32/comtools.hxx b/include/systools/win32/comtools.hxx
index fffa5440fddc..8f7ce87e7636 100644
--- a/include/systools/win32/comtools.hxx
+++ b/include/systools/win32/comtools.hxx
@@ -22,13 +22,7 @@
#include <string>
#include <stdexcept>
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#include <objbase.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
namespace sal
{
diff --git a/sal/osl/w32/file_url.hxx b/sal/osl/w32/file_url.hxx
index 9661543639c9..37bf86ca3b12 100644
--- a/sal/osl/w32/file_url.hxx
+++ b/sal/osl/w32/file_url.hxx
@@ -25,19 +25,11 @@
#include <osl/file.h>
#include <osl/mutex.h>
-#ifdef _MSC_VER
-#pragma warning(push,1)
-#endif
-
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
#define PATHTYPE_ERROR 0
#define PATHTYPE_RELATIVE 1
#define PATHTYPE_ABSOLUTE_UNC 2
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index d75eed125ed6..5f1daf6ae59e 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -197,13 +197,7 @@ osl_getAsciiFunctionSymbol( oslModule Module, const sal_Char *pSymbol )
/* Implementation for Windows NT, 2K and XP (2K and XP could use the above method too) */
/***************************************************************************************/
-#ifdef _MSC_VER
-#pragma warning(push,1) /* disable warnings within system headers */
-#endif
#include <imagehlp.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
typedef BOOL (WINAPI *SymInitialize_PROC)(
HANDLE hProcess,
diff --git a/sal/osl/w32/nlsupport.cxx b/sal/osl/w32/nlsupport.cxx
index 1de8cb780dd1..d79d49bdd2f5 100644
--- a/sal/osl/w32/nlsupport.cxx
+++ b/sal/osl/w32/nlsupport.cxx
@@ -18,13 +18,8 @@
*/
#define WIN32_LEAN_AND_MEAN
-#ifdef _MSC_VER
-#pragma warning(push,1) /* disable warnings within system headers */
-#endif
#include <windows.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+
#include <wchar.h>
#include "nlsupport.hxx"
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 897b88a1767e..153df540c5ae 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -19,13 +19,8 @@
#include "system.h"
#include <string.h>
-#ifdef _MSC_VER
-#pragma warning(push,1) /* disable warnings within system headers */
-#endif
+
#include <shellapi.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
#include <cassert>
#include <memory>
@@ -320,10 +315,6 @@ static struct CommandArgs_Impl g_command_args =
nullptr
};
-#ifdef _MSC_VER
-#pragma warning( push )
-#pragma warning( disable: 4100 )
-#endif
static rtl_uString ** osl_createCommandArgs_Impl (int argc, char **)
{
rtl_uString ** ppArgs =
@@ -369,9 +360,6 @@ static rtl_uString ** osl_createCommandArgs_Impl (int argc, char **)
return ppArgs;
}
-#ifdef _MSC_VER
-#pragma warning( pop )
-#endif
oslProcessError SAL_CALL osl_getExecutableFile( rtl_uString **ppustrFile )
{
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index d537cd9c8d05..967fbd359d62 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -19,13 +19,7 @@
#ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
-# ifdef _MSC_VER
-# pragma warning(push,1) /* disable warnings within system headers */
-# endif
# include <windows.h>
-# ifdef _MSC_VER
-# pragma warning(pop)
-# endif
# undef WIN32_LEAN_AND_MEAN
#endif
diff --git a/sal/osl/w32/system.h b/sal/osl/w32/system.h
index 3d02d184fce6..e1896f13e23c 100644
--- a/sal/osl/w32/system.h
+++ b/sal/osl/w32/system.h
@@ -43,8 +43,6 @@
#define WIN32_LEAN_AND_MEAN
// winsock2.h includes windows.h
-#pragma warning(push,1) /* disable warnings within system headers */
-#pragma warning(disable:4917)
#include <winsock2.h>
#include <wsipx.h>
#include <ws2tcpip.h>
@@ -52,6 +50,5 @@
#ifndef NO_DEBUG_CRT
#include <crtdbg.h>
#endif
-#pragma warning(pop)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/alloc_impl.hxx b/sal/rtl/alloc_impl.hxx
index bb46a544f7b0..0c5340303ae5 100644
--- a/sal/rtl/alloc_impl.hxx
+++ b/sal/rtl/alloc_impl.hxx
@@ -193,13 +193,7 @@ typedef pthread_mutex_t rtl_memory_lock_type;
#elif defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
-#ifdef _MSC_VER
-#pragma warning(push,1) /* disable warnings within system headers */
-#endif
#include <windows.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
typedef CRITICAL_SECTION rtl_memory_lock_type;
diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx
index b9047b987fde..d9dfd51f4c51 100644
--- a/sal/rtl/string.cxx
+++ b/sal/rtl/string.cxx
@@ -19,10 +19,6 @@
#include <sal/config.h>
-#ifdef _MSC_VER
-#pragma warning(disable:4738) // storing 32-bit float result in memory, possible loss of performance
-#endif
-
#include <cassert>
#include <cstdlib>
diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index 64fb1c3edd39..069af06516cb 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -19,10 +19,6 @@
#include <sal/config.h>
-#ifdef _MSC_VER
-#pragma warning(disable:4738) // storing 32-bit float result in memory, possible loss of performance
-#endif
-
#include <cassert>
#include <cstdlib>
#include <limits>
More information about the Libreoffice-commits
mailing list