From e964908e461df12073dd5683450a49f05edcd672 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Mon, 2 Nov 2026 21:09:07 -0500
Subject: [PATCH] Add vector to common.h

---
 src/fart/Image.h            | 3 +--
 src/fart/Parser.cpp         | 2 +-
 src/fart/PngImageWriter.cpp | 3 +--
 src/fart/common.h           | 2 ++
 src/fart/read_file.cpp      | 4 ++--
 src/fart/read_file.h        | 3 +--
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/fart/Image.h b/src/fart/Image.h
index f4c7078..239f8aa 100644
--- a/src/fart/Image.h
+++ b/src/fart/Image.h
@@ -2,13 +2,12 @@
 
 #include <fart/Color.h>
 #include <stddef.h>
-#include <vector>
 
 struct Image
 {
     size_t width;
     size_t height;
-    std::vector<Color> pixels;
+    vector<Color> pixels;
     Image(size_t width, size_t height);
 
     Color & operator[](size_t x, size_t y)
diff --git a/src/fart/Parser.cpp b/src/fart/Parser.cpp
index f7efe17..91dc6a0 100644
--- a/src/fart/Parser.cpp
+++ b/src/fart/Parser.cpp
@@ -3,7 +3,7 @@
 
 Scene * Parser::load_scene(const string_view & input_file)
 {
-    opt<std::vector<uint8_t>> input = read_file(input_file);
+    opt<vector<uint8_t>> input = read_file(input_file);
     if (!input)
     {
         return nullptr;
diff --git a/src/fart/PngImageWriter.cpp b/src/fart/PngImageWriter.cpp
index b6429e3..ea471d5 100644
--- a/src/fart/PngImageWriter.cpp
+++ b/src/fart/PngImageWriter.cpp
@@ -4,7 +4,6 @@
 #include <stdio.h>
 #include <algorithm>
 #include <cmath>
-#include <vector>
 
 static uint8_t to_byte(double v)
 {
@@ -13,7 +12,7 @@ static uint8_t to_byte(double v)
 
 bool PngImageWriter::write(const Image & image)
 {
-    std::vector<uint8_t> buffer(image.width * image.height * 4u);
+    vector<uint8_t> buffer(image.width * image.height * 4u);
     for (size_t i = 0u; i < image.pixels.size(); i++)
     {
         const Color & c = image.pixels[i];
diff --git a/src/fart/common.h b/src/fart/common.h
index f947d2f..d1c5188 100644
--- a/src/fart/common.h
+++ b/src/fart/common.h
@@ -3,7 +3,9 @@
 #include <optional>
 #include <string>
 #include <string_view>
+#include <vector>
 
 using string = std::string;
 using string_view = std::string_view;
 template <typename T> using opt = std::optional<T>;
+template <typename T> using vector = std::vector<T>;
diff --git a/src/fart/read_file.cpp b/src/fart/read_file.cpp
index f36bf7f..5092ce6 100644
--- a/src/fart/read_file.cpp
+++ b/src/fart/read_file.cpp
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 
-opt<std::vector<uint8_t>> read_file(string_view fname)
+opt<vector<uint8_t>> read_file(string_view fname)
 {
     string path(fname);
     FILE * fh = fopen(path.c_str(), "rb");
@@ -13,7 +13,7 @@ opt<std::vector<uint8_t>> read_file(string_view fname)
         return std::nullopt;
     }
 
-    std::vector<uint8_t> buffer;
+    vector<uint8_t> buffer;
     uint8_t chunk[4096];
     size_t n;
     while ((n = fread(chunk, 1u, sizeof(chunk), fh)) > 0u)
diff --git a/src/fart/read_file.h b/src/fart/read_file.h
index 74741f1..a251e6a 100644
--- a/src/fart/read_file.h
+++ b/src/fart/read_file.h
@@ -1,6 +1,5 @@
 #pragma once
 
 #include <stdint.h>
-#include <vector>
 
-opt<std::vector<uint8_t>> read_file(string_view fname);
+opt<vector<uint8_t>> read_file(string_view fname);