Merge pull request #1439 from dgelessus/hsstream_api_cleanup

Clean up and consistently implement the `hsStream` API
H-uru · Aug 3, 2023 · 4e2ff6c · 4e2ff6c
2 parents 98b49a1 + 8b2f911
commit 4e2ff6c
Show file tree

Hide file tree

Showing 37 changed files with 177 additions and 1,227 deletions.
diff --git a/Sources/Plasma/Apps/plPageInfo/plPageInfo.cpp b/Sources/Plasma/Apps/plPageInfo/plPageInfo.cpp
@@ -44,6 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsStream.h"
 #include "hsTimer.h"
 
+#include <string_theory/format>
+
 #include "pnKeyedObject/plKeyImp.h"
 
 #include "plAgeDescription/plAgeManifest.h"

diff --git a/Sources/Plasma/CoreLib/CMakeLists.txt b/Sources/Plasma/CoreLib/CMakeLists.txt
@@ -9,10 +9,8 @@ set(CoreLib_SOURCES
     hsGeometry3.cpp
     hsMatrix33.cpp
     hsMatrix44.cpp
-    hsMemory.cpp
     hsQuat.cpp
     hsRefCnt.cpp
-    hsSTLStream.cpp
     hsStream.cpp
     hsStringTokenizer.cpp
     hsSystemInfo.cpp
@@ -49,13 +47,11 @@ set(CoreLib_HEADERS
     hsLockGuard.h
     hsMatrix44.h
     hsMatrixMath.h
-    hsMemory.h
     hsPoint2.h
     hsPoolVector.h
     hsQuat.h
     hsRefCnt.h
     hsSIMD.h
-    hsSTLStream.h
     hsStream.h
     hsStringTokenizer.h
     hsSystemInfo.h