Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update expensify_prod branch #1799

Merged
merged 5 commits into from
Jul 8, 2024
Merged

Update expensify_prod branch #1799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
254924f
Use different typename to make clangd linter happy
tylerkaraszewski Jul 4, 2024
e7e8724
Explicitly add back deprecated default constructors
tylerkaraszewski Jul 4, 2024
89de92f
Merge branch 'main' into tyler-typename
tylerkaraszewski Jul 4, 2024
aae6dc3
Merge pull request #1796 from Expensify/tyler-typename
youssef-lr Jul 5, 2024
75f6ee0
Merge pull request #1797 from Expensify/tyler-implicit-copy-constructors
youssef-lr Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions libstuff/SQResult.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion libstuff/SRandom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion libstuff/SRandom.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down