From 254924f2fe8625e322cd90f7819ef306bf870cfb Mon Sep 17 00:00:00 2001
From: Tyler Karaszewski <tyler@expensify.com>
Date: Thu, 4 Jul 2024 12:42:33 -0700
Subject: [PATCH 1/2] Use different typename to make clangd linter happy

---
 libstuff/SRandom.cpp | 2 +-
 libstuff/SRandom.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libstuff/SRandom.cpp b/libstuff/SRandom.cpp
index b6900dac6..c84dd8469 100644
--- a/libstuff/SRandom.cpp
+++ b/libstuff/SRandom.cpp
@@ -18,7 +18,7 @@ uint64_t SRandom::rand64() {
     return _distribution64(_generator);
 }
 
-string SRandom::randStr(uint& length) {
+string SRandom::randStr(unsigned& length) {
     string str = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
     string newstr;
     int pos;
diff --git a/libstuff/SRandom.h b/libstuff/SRandom.h
index a718a04cd..e2c59b1c3 100644
--- a/libstuff/SRandom.h
+++ b/libstuff/SRandom.h
@@ -10,7 +10,7 @@ class SRandom {
   public:
     static uint64_t rand64();
     static uint64_t limitedRand64(uint64_t min, uint64_t max);
-    static string randStr(uint& length);
+    static string randStr(unsigned& length);
 
   private:
     static mt19937_64 _generator;

From e7e872436f489fc97cd793133151b0a7329ec0fa Mon Sep 17 00:00:00 2001
From: Tyler Karaszewski <tyler@expensify.com>
Date: Thu, 4 Jul 2024 12:59:20 -0700
Subject: [PATCH 2/2] Explicitly add back deprecated default constructors

---
 libstuff/SQResult.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libstuff/SQResult.h b/libstuff/SQResult.h
index 1ecd3560f..f76da34ae 100644
--- a/libstuff/SQResult.h
+++ b/libstuff/SQResult.h
@@ -10,6 +10,7 @@ class SQResultRow : public vector<string> {
   public:
     SQResultRow();
     SQResultRow(SQResult& result, size_t count = 0);
+    SQResultRow(SQResultRow const&) = default;
     void push_back(const string& s);
     string& operator[](const size_t& key);
     const string& operator[](const size_t& key) const;
@@ -27,6 +28,9 @@ class SQResult {
     vector<string> headers;
     vector<SQResultRow> rows;
 
+    SQResult() = default;
+    SQResult(SQResult const&) = default;
+
     // Accessors
     bool empty() const;
     size_t size() const;