summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/firebird/Connection.cxx
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-01-31 12:29:46 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-01-31 21:03:22 +0100
commitb7c5ddcdd05ceba73acb1a298500892d6157f360 (patch)
tree03a7e22462bb653cb38bb0b747c72bbe1e81636f /connectivity/source/drivers/firebird/Connection.cxx
parent82e3833995d28b3a05ad539d331b47b210d1611f (diff)
connectivity: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: I22553d7cbbae7cfaac3f39a17db54dfe06e2e5bc Reviewed-on: https://gerrit.libreoffice.org/48989 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'connectivity/source/drivers/firebird/Connection.cxx')
-rw-r--r--connectivity/source/drivers/firebird/Connection.cxx12
1 files changed, 7 insertions, 5 deletions
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 619f324720e9..9cb9fc340cc8 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -55,11 +55,6 @@
#include <rtl/strbuf.hxx>
-#ifdef _WIN32
-// for ADD_SPB_NUMERIC
-#pragma warning(disable: 4310) // cast truncates data
-#endif
-
using namespace connectivity::firebird;
using namespace connectivity;
@@ -637,7 +632,14 @@ void Connection::runBackupService(const short nAction)
aRequest.append(char(isc_spb_options)); // 4-Byte bitmask
char sOptions[4];
char * pOptions = sOptions;
+#ifdef _WIN32
+#pragma warning(push)
+#pragma warning(disable: 4310) // cast truncates data
+#endif
ADD_SPB_NUMERIC(pOptions, isc_spb_res_create);
+#ifdef _WIN32
+#pragma warning(pop)
+#endif
aRequest.append(sOptions, 4);
}