mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-21 01:01: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. */
|
||||
@@ -23,7 +23,7 @@ void raw_uv_ostream::write_impl(const char* data, size_t len) {
|
||||
assert(m_left != 0);
|
||||
}
|
||||
|
||||
size_t amt = std::min(m_left, len);
|
||||
size_t amt = (std::min)(m_left, len);
|
||||
auto& buf = m_bufs.back();
|
||||
std::memcpy(buf.base + buf.len, data, amt);
|
||||
data += amt;
|
||||
|
||||
Reference in New Issue
Block a user