Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-24 01:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

ntcore: Remove MSVC 2013 shim. (#1018)

Browse Source
This commit is contained in:
Peter Johnson
2018-05-04 02:06:45 -07:00
committed by GitHub
parent 954f8c40f5
commit 8cbfe35bd4
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ntcore/src/main/native/include/networktables/NetworkTableInstance.h
View File

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

4
ntcore/src/main/native/include/networktables/NetworkTableInstance.inl
View File

@@ -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() {