mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-28 02:11:43 +00:00
Update for C++17 and fix MSVC warnings (#1694)
* 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:
committed by
Peter Johnson
parent
fb1239a2ad
commit
221011494d
@@ -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. */
|
||||
@@ -41,7 +41,6 @@ TEST_P(ADXL345_I2CAccelerometerTest, TestAccelerometer) {
|
||||
EXPECT_NEAR(0.11, accel.GetZ(), EPSILON);
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(ADXL345_I2CAccelerometerTest,
|
||||
ADXL345_I2CAccelerometerTest,
|
||||
::testing::Values(frc::I2C::kOnboard,
|
||||
frc::I2C::kMXP), );
|
||||
INSTANTIATE_TEST_SUITE_P(ADXL345_I2CAccelerometerTest,
|
||||
ADXL345_I2CAccelerometerTest,
|
||||
::testing::Values(frc::I2C::kOnboard, frc::I2C::kMXP));
|
||||
|
||||
@@ -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. */
|
||||
@@ -41,8 +41,8 @@ TEST_P(ADXL345_SpiAccelerometerTest, TestAccelerometer) {
|
||||
EXPECT_NEAR(0.11, accel.GetZ(), EPSILON);
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
INSTANTIATE_TEST_SUITE_P(
|
||||
ADXL345_SpiAccelerometerTest, ADXL345_SpiAccelerometerTest,
|
||||
::testing::Values(frc::SPI::kOnboardCS0, frc::SPI::kOnboardCS1,
|
||||
frc::SPI::kOnboardCS2, frc::SPI::kOnboardCS3,
|
||||
frc::SPI::kMXP), );
|
||||
frc::SPI::kMXP));
|
||||
|
||||
@@ -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. */
|
||||
@@ -41,8 +41,8 @@ TEST_P(ADXL362_SpiAccelerometerTest, TestAccelerometer) {
|
||||
EXPECT_NEAR(0.11, accel.GetZ(), EPSILON);
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
INSTANTIATE_TEST_SUITE_P(
|
||||
ADXL362_SpiAccelerometerTest, ADXL362_SpiAccelerometerTest,
|
||||
::testing::Values(frc::SPI::kOnboardCS0, frc::SPI::kOnboardCS1,
|
||||
frc::SPI::kOnboardCS2, frc::SPI::kOnboardCS3,
|
||||
frc::SPI::kMXP), );
|
||||
frc::SPI::kMXP));
|
||||
|
||||
@@ -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. */
|
||||
@@ -34,8 +34,8 @@ TEST_P(ADXRS450_SpiGyroWrapperTest, TestAccelerometer) {
|
||||
#endif
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
INSTANTIATE_TEST_SUITE_P(
|
||||
ADXRS450_SpiGyroWrapperTest, ADXRS450_SpiGyroWrapperTest,
|
||||
::testing::Values(frc::SPI::kOnboardCS0, frc::SPI::kOnboardCS1,
|
||||
frc::SPI::kOnboardCS2, frc::SPI::kOnboardCS3,
|
||||
frc::SPI::kMXP), );
|
||||
frc::SPI::kMXP));
|
||||
|
||||
Reference in New Issue
Block a user