Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-02 02:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update for C++17 and fix MSVC warnings (#1694)

Browse Source 
* Update MSVC arguments
* Fix json allocator
* Fix simulation diamond
* Bump gtest
* Remove empty varargs in unit tests
* Replace test case with test suite
* Remove deprecation warning in optional
* Remove need for NOMIXMAX to be defined in wpilib headers
This commit is contained in:
Thad House
2019-05-31 13:43:32 -07:00
committed by Peter Johnson
parent fb1239a2ad
commit 221011494d
99 changed files with 534 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibc/src/main/native/include/frc/RobotBase.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -131,8 +131,8 @@ class RobotBase {
// m_ds isn't moved in these because DriverStation is a singleton; every
// instance of RobotBase has a reference to the same object.
RobotBase(RobotBase&&);
RobotBase& operator=(RobotBase&&);
RobotBase(RobotBase&&) noexcept;
RobotBase& operator=(RobotBase&&) noexcept;
DriverStation& m_ds;

11
wpilibc/src/main/native/include/frc/shuffleboard/ShuffleboardLayout.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -16,6 +16,11 @@
#include "frc/shuffleboard/ShuffleboardContainer.h"
#include "frc/smartdashboard/Sendable.h"
#ifdef _WIN32
#pragma warning(push)
#pragma warning(disable : 4250)
#endif
namespace frc {
/**
@@ -33,3 +38,7 @@ class ShuffleboardLayout : public ShuffleboardComponent<ShuffleboardLayout>,
};
} // namespace frc
#ifdef _WIN32
#pragma warning(pop)
#endif