mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-21 01:01:43 +00:00
Update LLVM to latest upstream. (#1080)
Also change header guards to WPI header guards. Remove StringRef::c_str() customization, replacing the handful of uses with Twine or SmallString. TCPStream: Include errno.h and make Windows includes lowercase for consistency. Upstream LLVM version: eb4186cca7924fb1706357545311a2fa3de40c59
This commit is contained in:
@@ -39,6 +39,7 @@ SOFTWARE.
|
||||
#include <cstdlib>
|
||||
|
||||
#include "wpi/Format.h"
|
||||
#include "wpi/SmallString.h"
|
||||
#include "wpi/raw_istream.h"
|
||||
#include "wpi/raw_ostream.h"
|
||||
|
||||
@@ -1604,7 +1605,7 @@ void json::parser::parse_internal(bool keep, json& result)
|
||||
|
||||
if (keep and keep_tag and not value.is_discarded())
|
||||
{
|
||||
result.m_value.object->emplace_second(StringRef(key.data(), key.size()), std::move(value));
|
||||
result.m_value.object->try_emplace(StringRef(key.data(), key.size()), std::move(value));
|
||||
}
|
||||
|
||||
// comma -> next value
|
||||
|
||||
Reference in New Issue
Block a user