summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cli_ure/source/climaker/climaker_emit.cxx2
-rw-r--r--cli_ure/source/uno_bridge/cli_bridge.cxx3
-rw-r--r--cli_ure/source/uno_bridge/cli_data.cxx2
-rw-r--r--cli_ure/source/uno_bridge/cli_proxy.h2
4 files changed, 1 insertions, 8 deletions
diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx
index 9a6c7f3f6764..af66a246eca5 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -97,7 +97,7 @@ static inline void emit_ldarg( Emit::ILGenerator ^ code, ::System::Int32 index )
{
case 0:
#pragma warning (push)
-#pragma warning (disable: 4538)
+#pragma warning (disable: 4538) // const/volatile qualifiers on this type are not supported
code->Emit( Emit::OpCodes::Ldarg_0 );
#pragma warning (pop)
break;
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx
index 93e51058a170..92368f1236dd 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.cxx
+++ b/cli_ure/source/uno_bridge/cli_bridge.cxx
@@ -18,14 +18,11 @@
*/
#include <vcclr.h>
-//ToDo: remove when build with .NET 2
-#pragma warning(push, 1)
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include "uno/environment.hxx"
-#pragma warning(pop)
#include "uno/lbnames.h"
#include "uno/mapping.hxx"
#include "typelib/typedescription.hxx"
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index 452d0af474d2..722536a3057d 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -17,13 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#pragma warning(push, 1)
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include "windows.h"
#include <ole2.h>
-#pragma warning(pop)
#include <memory>
diff --git a/cli_ure/source/uno_bridge/cli_proxy.h b/cli_ure/source/uno_bridge/cli_proxy.h
index 8937daf290f4..25f7d2801314 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.h
+++ b/cli_ure/source/uno_bridge/cli_proxy.h
@@ -20,9 +20,7 @@
#ifndef INCLUDED_CLI_URE_SOURCE_UNO_BRIDGE_CLI_PROXY_H
#define INCLUDED_CLI_URE_SOURCE_UNO_BRIDGE_CLI_PROXY_H
-#pragma warning(push, 1)
#include "uno/environment.hxx"
-#pragma warning(pop)
#include "uno/mapping.hxx"
#include "uno/dispatcher.h"
#include "cli_bridge.h"