summaryrefslogtreecommitdiff
path: root/sal/rtl
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-01-31 20:49:32 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-02-02 06:02:48 +0100
commitee4a456d9129ebbf46aa89531e1e8ca3f9a8fa11 (patch)
tree8fe6e5139fd967ca0d7a8a360c1abf36c1e29a0c /sal/rtl
parentd297fad623d3b1c2b6604886f53b7fe8f8d33fbe (diff)
sal: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Ib7ad23257a966447d627b4f73698d9298790f759 Reviewed-on: https://gerrit.libreoffice.org/49042 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sal/rtl')
-rw-r--r--sal/rtl/alloc_impl.hxx6
-rw-r--r--sal/rtl/string.cxx4
-rw-r--r--sal/rtl/ustring.cxx4
3 files changed, 0 insertions, 14 deletions
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>