diff options
| author | James E. King III <jking@apache.org> | 2018-12-17 16:21:14 -0500 |
|---|---|---|
| committer | James E. King III <jking@apache.org> | 2018-12-18 10:17:57 -0500 |
| commit | 9b75e4fe745a9b08e6ccdc0998ec7a69272f5b4c (patch) | |
| tree | 747d56c669ceafbea6dc5955e8622cc39e6fa1cf /lib/cpp/test | |
| parent | 56ac72e74ae354c286c41f5d5a3c0b8723feb587 (diff) | |
| download | thrift-9b75e4fe745a9b08e6ccdc0998ec7a69272f5b4c.tar.gz | |
THRIFT-4680: fix up std::min, std::max, and numeric limits min/max on Windows; remove NOMINMAX from cmake build
Diffstat (limited to 'lib/cpp/test')
| -rw-r--r-- | lib/cpp/test/TMemoryBufferTest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/cpp/test/TMemoryBufferTest.cpp b/lib/cpp/test/TMemoryBufferTest.cpp index 9492f6961..d81b1d804 100644 --- a/lib/cpp/test/TMemoryBufferTest.cpp +++ b/lib/cpp/test/TMemoryBufferTest.cpp @@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE(test_exceptions) { BOOST_AUTO_TEST_CASE(test_default_maximum_buffer_size) { - BOOST_CHECK_EQUAL(std::numeric_limits<uint32_t>::max(), TMemoryBuffer().getMaxBufferSize()); + BOOST_CHECK_EQUAL((std::numeric_limits<uint32_t>::max)(), TMemoryBuffer().getMaxBufferSize()); } BOOST_AUTO_TEST_CASE(test_default_buffer_size) |