diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-01 16:01:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 16:01:05 +0200 |
| commit | a8a2769bb6f7bc5231c06776300cbae7a9b2a4d6 (patch) | |
| tree | b5f366b586d412004ab9ce28a1c5f71695a95873 /main | |
| parent | 2abe858e1ccd202b7aee543f9846c1ccf7e51e2c (diff) | |
| parent | 25c978730bd6d09091ae0f148766f6833e6e1400 (diff) | |
Merge pull request #38713 from aaronfranke/string-64bit
Make all String integer conversion methods be 64-bit
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.cpp | 2 | ||||
| -rw-r--r-- | main/tests/test_string.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp index 79c8fe532d..76175780a3 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -856,7 +856,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph } } else if (I->get() == "--allow_focus_steal_pid") { // not exposed to user if (I->next()) { - allow_focus_steal_pid = I->next()->get().to_int64(); + allow_focus_steal_pid = I->next()->get().to_int(); N = I->next()->next(); } else { OS::get_singleton()->print("Missing editor PID argument, aborting.\n"); diff --git a/main/tests/test_string.cpp b/main/tests/test_string.cpp index 775c039282..5a14492be5 100644 --- a/main/tests/test_string.cpp +++ b/main/tests/test_string.cpp @@ -370,7 +370,7 @@ bool test_22() { static const int num[4] = { 1237461283, -22, 0, -1123412 }; for (int i = 0; i < 4; i++) { - OS::get_singleton()->print("\tString: \"%s\" as Int is %i\n", nums[i], String(nums[i]).to_int()); + OS::get_singleton()->print("\tString: \"%s\" as Int is %lli\n", nums[i], (long long)(String(nums[i]).to_int())); if (String(nums[i]).to_int() != num[i]) { return false; |