From 01e5179ec7aca61717f7c2cb9384b4f6798cb5ce Mon Sep 17 00:00:00 2001
From: Riyyi <riyyi3@gmail.com>
Date: Thu, 22 Sep 2022 15:49:13 +0200
Subject: [PATCH] Engine: Update std::stou, remove need for intToHex()

---
 src/inferno/io/gltffile.cpp |  3 +--
 src/inferno/util/integer.h  | 17 +++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/inferno/io/gltffile.cpp b/src/inferno/io/gltffile.cpp
index ce848bc..2e18b65 100644
--- a/src/inferno/io/gltffile.cpp
+++ b/src/inferno/io/gltffile.cpp
@@ -7,7 +7,6 @@
 
 #include "inferno/io/gltffile.h"
 #include "inferno/util/json.h"
-#include "inferno/util/string.h"
 
 namespace Inferno {
 
@@ -88,7 +87,7 @@ std::pair<std::shared_ptr<char[]>, uint32_t> GltfFile::readChunk(std::ifstream&
 	ifstream.read(chunkType, size);
 
 	uint32_t chunkTypeInt = *reinterpret_cast<uint32_t*>(chunkType);
-	VERIFY(chunkTypeInt == type, "Gltf invalid chunk type '{}' != '{}'", chunkType, intToHex(type));
+	VERIFY(chunkTypeInt == type, "Gltf invalid chunk type '{}' != '{:#08x}'", chunkType, type);
 
 	uint32_t chunkLengthInt = *reinterpret_cast<uint32_t*>(chunkLength);
 	// Allocate memory filled with zeros
diff --git a/src/inferno/util/integer.h b/src/inferno/util/integer.h
index 2035e3a..0e68617 100644
--- a/src/inferno/util/integer.h
+++ b/src/inferno/util/integer.h
@@ -1,7 +1,9 @@
 #pragma once
 
-#include <limits> // std::numeric_limits
-#include <string> // std::string, std::stoul
+#include <cstdint> // uint32_t
+#include <limits>  // std::numeric_limits
+#include <string>  // std::stoul
+#include <string_view>
 
 #include "ruc/meta/assert.h"
 
@@ -9,16 +11,11 @@ namespace std {
 
 // Can't believe this is not in the standard library
 
-inline uint32_t stou(const std::string& string)
+inline uint32_t stou(string_view string)
 {
-	unsigned long size = std::stoul(string);
-	VERIFY(size <= std::numeric_limits<uint32_t>::max(), "String util not in uint32_t range '{}'", string);
+	unsigned long size = std::stoul(string.data());
+	VERIFY(size <= std::numeric_limits<uint32_t>::max(), "string not in uint32_t range '{}'", string);
 	return static_cast<uint32_t>(size);
 }
 
-inline uint32_t stou(const char* string)
-{
-	return stou(std::string(string));
-}
-
 } // namespace std