From 8cbfe35bd41543bd3932dcfba3f1348625b067d8 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Fri, 4 May 2018 02:06:45 -0700
Subject: [PATCH] ntcore: Remove MSVC 2013 shim. (#1018)

---
 .../include/networktables/NetworkTableInstance.h | 16 ++--------------
 .../networktables/NetworkTableInstance.inl       |  4 ++--
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/ntcore/src/main/native/include/networktables/NetworkTableInstance.h b/ntcore/src/main/native/include/networktables/NetworkTableInstance.h
index 7b24612c35..c713d06f23 100644
--- a/ntcore/src/main/native/include/networktables/NetworkTableInstance.h
+++ b/ntcore/src/main/native/include/networktables/NetworkTableInstance.h
@@ -23,18 +23,6 @@
 #include "ntcore_c.h"
 #include "ntcore_cpp.h"
 
-#ifndef NT_NOEXCEPT
-#ifdef _MSC_VER
-#if _MSC_VER >= 1900
-#define NT_NOEXCEPT noexcept
-#else
-#define NT_NOEXCEPT throw()
-#endif
-#else
-#define NT_NOEXCEPT noexcept
-#endif
-#endif
-
 namespace nt {
 
 using wpi::ArrayRef;
@@ -96,13 +84,13 @@ class NetworkTableInstance final {
   /**
    * Construct invalid instance.
    */
-  NetworkTableInstance() NT_NOEXCEPT;
+  NetworkTableInstance() noexcept;
 
   /**
    * Construct from native handle.
    * @param handle Native handle
    */
-  explicit NetworkTableInstance(NT_Inst inst) NT_NOEXCEPT;
+  explicit NetworkTableInstance(NT_Inst inst) noexcept;
 
   /**
    * Determines if the native handle is valid.
diff --git a/ntcore/src/main/native/include/networktables/NetworkTableInstance.inl b/ntcore/src/main/native/include/networktables/NetworkTableInstance.inl
index 23a6c2201f..83616d978f 100644
--- a/ntcore/src/main/native/include/networktables/NetworkTableInstance.inl
+++ b/ntcore/src/main/native/include/networktables/NetworkTableInstance.inl
@@ -10,9 +10,9 @@
 
 namespace nt {
 
-inline NetworkTableInstance::NetworkTableInstance() NT_NOEXCEPT : m_handle{0} {}
+inline NetworkTableInstance::NetworkTableInstance() noexcept : m_handle{0} {}
 
-inline NetworkTableInstance::NetworkTableInstance(NT_Inst handle) NT_NOEXCEPT
+inline NetworkTableInstance::NetworkTableInstance(NT_Inst handle) noexcept
     : m_handle{handle} {}
 
 inline NetworkTableInstance NetworkTableInstance::GetDefault() {