aboutsummaryrefslogtreecommitdiff
path: root/zencore
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2023-04-20 12:09:47 +0200
committerStefan Boberg <[email protected]>2023-04-20 12:09:47 +0200
commit74ff3745511e80ad4529620858604890f222af74 (patch)
tree2b6c836442791d84bdedd5cc0e81154d9e36159d /zencore
parent#pragma once added to some headers (diff)
parentoops: clang-format (diff)
downloadzen-74ff3745511e80ad4529620858604890f222af74.tar.xz
zen-74ff3745511e80ad4529620858604890f222af74.zip
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'zencore')
-rw-r--r--zencore/include/zencore/scopeguard.h2
-rw-r--r--zencore/include/zencore/string.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/zencore/include/zencore/scopeguard.h b/zencore/include/zencore/scopeguard.h
index 00836f181..13fed4ac5 100644
--- a/zencore/include/zencore/scopeguard.h
+++ b/zencore/include/zencore/scopeguard.h
@@ -1,5 +1,7 @@
// Copyright Epic Games, Inc. All Rights Reserved.
+#pragma once
+
#include <type_traits>
#include "zencore.h"
diff --git a/zencore/include/zencore/string.h b/zencore/include/zencore/string.h
index 7ea8c029f..ab111ff81 100644
--- a/zencore/include/zencore/string.h
+++ b/zencore/include/zencore/string.h
@@ -691,7 +691,7 @@ template<Integral T>
std::optional<T>
ParseInt(const std::string_view& Input)
{
- T Out;
+ T Out = 0;
const std::from_chars_result Result = std::from_chars(Input.data(), Input.data() + Input.size(), Out);
if (Result.ec == std::errc::invalid_argument || Result.ec == std::errc::result_out_of_range)
{