mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli_ure: MSVC: pragma warning: make more specific, remove obsolete

Browse Source 
Change-Id: I63e12a22a46de27a8bd010e4d21bf36d3a7e9178
Reviewed-on: https://gerrit.libreoffice.org/48967
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2018-01-31 11:41:03 +03:00
parent e587def20d
commit acb3eeb6c2
4 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli_ure/source/climaker/climaker_emit.cxx
View File

@ -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;

3
cli_ure/source/uno_bridge/cli_bridge.cxx
View File

@ -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"

2
cli_ure/source/uno_bridge/cli_data.cxx
View File

@ -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>

2
cli_ure/source/uno_bridge/cli_proxy.h
View File

@ -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"