diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-09-28 19:07:48 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-09-28 19:22:18 +0300 |
| commit | adcd08fbf4d96f8f52cef81895bda202c9e45896 (patch) | |
| tree | 3e8643d7d2b19c86d723c79042e8b528a9508dd1 /indra/llcommon/tests | |
| parent | e3b869e6f12a9d285ca3db4a2e7f4f0fa1ff8b26 (diff) | |
Revert "Merge branch 'c++17' into DRTVWR-522-maint"
This reverts commit 203ea3a70a775a09cbbffb1740ab7c58f1780baa, reversing
changes made to 8e3f0778863a5aa337d1148a243ea91d238a8ac5.
# Conflicts:
# indra/newview/llmachineid.cpp
Diffstat (limited to 'indra/llcommon/tests')
| -rw-r--r-- | indra/llcommon/tests/llleap_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp index fd96aa01d5..9d71e327d8 100644 --- a/indra/llcommon/tests/llleap_test.cpp +++ b/indra/llcommon/tests/llleap_test.cpp @@ -530,7 +530,7 @@ namespace tut result.ensure(); } - struct TestLargeMessage + struct TestLargeMessage: public std::binary_function<size_t, size_t, bool> { TestLargeMessage(const std::string& PYTHON_, const std::string& reader_module_, const std::string& test_name_): |