mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-28 02:11:43 +00:00
artf4107: clang-modernize was run on WPILib
Loops were converted to their range-based equivalents, variable types were replaced with auto where the type was already specified on the same line, the override keyword was added, and instances of NULL and assignments of 0 to pointers were replaced with nullptr. Change-Id: If281e46a2e2e1c37f278d56df9915236d4b2c864
This commit is contained in:
@@ -13,7 +13,7 @@ constexpr uint8_t CameraServer::kMagicNumber[];
|
||||
CameraServer* CameraServer::s_instance = nullptr;
|
||||
|
||||
CameraServer* CameraServer::GetInstance() {
|
||||
if (s_instance == NULL) {
|
||||
if (s_instance == nullptr) {
|
||||
s_instance = new CameraServer;
|
||||
}
|
||||
return s_instance;
|
||||
@@ -225,7 +225,7 @@ void CameraServer::Serve() {
|
||||
std::unique_lock<std::recursive_mutex> lock(m_imageMutex);
|
||||
m_newImageVariable.wait(lock);
|
||||
imageData = m_imageData;
|
||||
m_imageData = std::make_tuple(nullptr, 0, 0, false);
|
||||
m_imageData = std::make_tuple<uint8_t*>(nullptr, 0, 0, false);
|
||||
}
|
||||
|
||||
unsigned int size = std::get<1>(imageData);
|
||||
|
||||
Reference in New Issue
Block a user