Merge pull request #112 from Fayti1703/patch-baseline

Apply a few simple fixes
WolfireGames · Sep 29, 2024 · 24eff4a · 24eff4a
2 parents 7d36c83 + 624b027
commit 24eff4a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/Source/Graphics/font_renderer.cpp b/Source/Graphics/font_renderer.cpp
@@ -221,10 +221,6 @@ FontRenderer::FontRenderer() {
     impl_ = new FontRendererImpl();
 }
 
-FontRenderer::FontRenderer(const FontRenderer &other) {
-    *impl_ = *other.impl_;
-}
-
 FontRenderer::~FontRenderer() {
     delete impl_;
 }

diff --git a/Source/Graphics/font_renderer.h b/Source/Graphics/font_renderer.h
@@ -54,9 +54,11 @@ class FontRenderer {
     }
     void GetKerning(int face_id, char character_a, char character_b, FT_Vector* vec);
     FontRenderer();
-    FontRenderer(const FontRenderer& other);
+    FontRenderer(const FontRenderer& other) = delete;
     ~FontRenderer();
 
+    FontRenderer& operator=(const FontRenderer& other) = delete;
+
    private:
     FontRendererImpl* impl_;
 };
diff --git a/Source/Internal/stopwatch.h b/Source/Internal/stopwatch.h
@@ -24,6 +24,7 @@
 
 #include <cstdint>
 #include <string>
+#include <cstdint>
 
 void BusyWaitMilliseconds(uint32_t how_many);
 

diff --git a/Source/Math/vec4.h b/Source/Math/vec4.h
@@ -65,6 +65,8 @@ class vec4 {
         entries[3] = val;
     }
 
+    inline vec4(const vec4& vec) = default;
+
     inline vec4& operator=(float param) {
         entries[0] = param;
         entries[1] = param;