From a251fe4d48237a4d9c9530dafc7bbdce6028e9cf Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Thu, 19 Mar 2015 10:57:17 +0200
Subject: We require MSVC2013 (_MSC_VER == 1800) now

Change-Id: Ice8504041f22e00f2e5010813d9dff1d2987c8d6
---
 cli_ure/source/climaker/climaker_app.cxx  | 8 --------
 cli_ure/source/climaker/climaker_emit.cxx | 5 -----
 2 files changed, 13 deletions(-)

(limited to 'cli_ure')

diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx
index b8e3f0f7bb55..42381ad6e477 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -630,20 +630,12 @@ SAL_IMPLEMENT_MAIN()
 
         if (g_verbose)
         {
-#if _MSC_VER < 1700
-// Bogus: warning C4564: method 'CheckInvalidPathChars' of class 'System::IO::Path' defines unsupported default parameter 'checkAdditional'
-#pragma warning (push)
-#pragma warning (disable: 4564)
-#endif
             ::System::Console::Write(
                 "> saving assembly {0}{1}{2}...",
                 output_dir,
                 gcnew ::System::String(
                     ::System::IO::Path::DirectorySeparatorChar, 1 ),
                 output_file );
-#if _MSC_VER < 1700
-#pragma warning (pop)
-#endif
         }
         assembly_builder->Save( output_file );
         if (g_verbose)
diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx
index 6f0de95707d8..8706c3c91a39 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -876,11 +876,6 @@ Assembly ^ TypeEmitter::type_resolve(
              MethodAttributes::Virtual |
              MethodAttributes::NewSlot |
              MethodAttributes::HideBySig);
-//#if defined(_MSC_VER) && (_MSC_VER < 1400)
-//             MethodAttributes::Instance);
-//#else
-//       Instance);
-//#endif
 
         if (TypeClass_INTERFACE_METHOD == xMember->getTypeClass())
         {
-- 
cgit v1.2.3