summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-08-27 11:15:38 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-08-27 11:15:38 +0200
commit62fe8b8980f5ae08dfdd74da4dca4c7cda38502c (patch)
tree705e35f687e4553dc1ac7eafd42cd8a0a6027cbe /src
parent0137c5b6a53c64d760b15e134095757a4e666c0b (diff)
some C++14 features are not supported by VS2013. VS2015 is free for home use so no need for legacy support (nw)
Diffstat (limited to 'src')
-rw-r--r--src/devices/cpu/m68000/m68kmake.cpp2
-rw-r--r--src/lib/formats/cassimg.cpp5
-rw-r--r--src/lib/util/coretmpl.h5
-rw-r--r--src/osd/eivc.h14
-rw-r--r--src/osd/osdcomm.h7
5 files changed, 1 insertions, 32 deletions
diff --git a/src/devices/cpu/m68000/m68kmake.cpp b/src/devices/cpu/m68000/m68kmake.cpp
index 46d8a46832e..8f29784a018 100644
--- a/src/devices/cpu/m68000/m68kmake.cpp
+++ b/src/devices/cpu/m68000/m68kmake.cpp
@@ -70,7 +70,7 @@ static const char g_version[] = "4.90";
#define ATTR_NORETURN __attribute__((noreturn))
#else
#define ATTR_PRINTF(x,y)
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
#define ATTR_NORETURN __declspec(noreturn)
#else
#define ATTR_NORETURN
diff --git a/src/lib/formats/cassimg.cpp b/src/lib/formats/cassimg.cpp
index 58add1aaed0..ad6ec84cf39 100644
--- a/src/lib/formats/cassimg.cpp
+++ b/src/lib/formats/cassimg.cpp
@@ -35,12 +35,7 @@ CASSETTE_FORMATLIST_END
static double map_double(double d, UINT64 low, UINT64 high, UINT64 value)
{
-#if defined(_MSC_VER) && (_MSC_VER <= 1200)
- /* casting unsigned __int64 to double is not supported on VC6 or before */
- return d * (INT64)(value - low) / (INT64)(high - low);
-#else
return d * (value - low) / (high - low);
-#endif
}
diff --git a/src/lib/util/coretmpl.h b/src/lib/util/coretmpl.h
index 81e9907ae29..c285f818b6a 100644
--- a/src/lib/util/coretmpl.h
+++ b/src/lib/util/coretmpl.h
@@ -18,11 +18,6 @@
#include <vector>
-#if defined(_MSC_VER) && (_MSC_VER < 1900)
-#include <yvals.h>
-#define noexcept _NOEXCEPT
-#endif
-
// TEMPORARY helper to catch is_pod assertions in the debugger
#if 0
#undef assert
diff --git a/src/osd/eivc.h b/src/osd/eivc.h
index bdd2eeb9407..1097e0b2111 100644
--- a/src/osd/eivc.h
+++ b/src/osd/eivc.h
@@ -11,21 +11,7 @@
#ifndef __EIVC__
#define __EIVC__
-#if (_MSC_VER >= 1400)
-
-// need to ignore 'nonstandard extension used' warning in setjmp.h
-#pragma warning(push)
-#pragma warning(disable: 4987)
-#include <intrin.h>
-#pragma warning(pop)
-
-#else
-extern "C" unsigned char _BitScanReverse(unsigned long *Index, unsigned long Mask);
-#endif
-
-#if (_MSC_VER >= 1310)
#pragma intrinsic(_BitScanReverse)
-#endif
/***************************************************************************
diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h
index a97920cff7f..bad84bf2b1c 100644
--- a/src/osd/osdcomm.h
+++ b/src/osd/osdcomm.h
@@ -167,16 +167,9 @@ constexpr UINT64 little_endianize_int64(UINT64 x) { return flipendian_int64(x);
#ifdef _MSC_VER
#include <malloc.h>
using ssize_t = std::make_signed_t<size_t>;
-#if _MSC_VER == 1900 // VS2015
#define __LINE__Var 0
-#endif // VS2015
-#if _MSC_VER < 1900 // VS2013 or earlier
-#define snprintf _snprintf
-#define __func__ __FUNCTION__
-#else // VS2015
#define _CRT_STDIO_LEGACY_WIDE_SPECIFIERS
#endif
-#endif
#ifdef __GNUC__
#ifndef alloca