diff options
-rw-r--r-- | cli_ure/source/climaker/climaker_app.cxx | 8 | ||||
-rw-r--r-- | cli_ure/source/climaker/climaker_emit.cxx | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx index ba56b35fc27e..949ab220346c 100644 --- a/cli_ure/source/climaker/climaker_app.cxx +++ b/cli_ure/source/climaker/climaker_app.cxx @@ -572,10 +572,18 @@ SAL_IMPLEMENT_MAIN() // app domain ::System::AppDomain ^ current_appdomain = ::System::AppDomain::CurrentDomain; + +// Weird warning from this statement +// warning C4538: 'cli::array<Type> ^' : const/volatile qualifiers on this type are not supported +// Could be a compiler bug, says http://stackoverflow.com/questions/12151060/seemingly-inappropriate-compilation-warning-with-c-cli +#pragma warning (push) +#pragma warning (disable: 4538) // target assembly Emit::AssemblyBuilder ^ assembly_builder = current_appdomain->DefineDynamicAssembly( assembly_name, Emit::AssemblyBuilderAccess::Save, output_dir ); +#pragma warning (pop) + if (product.getLength() != 0) { array< ::System::Type^>^ params = gcnew array< ::System::Type^> (1); diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx index 8c3768e20495..1eb1f9f1e1eb 100644 --- a/cli_ure/source/climaker/climaker_emit.cxx +++ b/cli_ure/source/climaker/climaker_emit.cxx @@ -101,7 +101,10 @@ static inline void emit_ldarg( Emit::ILGenerator ^ code, ::System::Int32 index ) switch (index) { case 0: +#pragma warning (push) +#pragma warning (disable: 4538) code->Emit( Emit::OpCodes::Ldarg_0 ); +#pragma warning (pop) break; case 1: code->Emit( Emit::OpCodes::Ldarg_1 ); |