Skip to content

Commit 80da89f

Browse files
committed
GEODE-10416: Bump to boost 1.80.0
- Add macro to fix linker errors.
1 parent 70185ee commit 80da89f

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

cppcache/test/statistics/HostStatSamplerTest.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <gmock/gmock.h>
1919

2020
#include <boost/filesystem.hpp>
21+
#include <boost/filesystem/fstream.hpp>
2122
#include <boost/process/environment.hpp>
2223

2324
#include <gtest/gtest.h>

dependencies/boost/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
project(boost VERSION 1.76.0 LANGUAGES NONE)
16+
project(boost VERSION 1.80.0 LANGUAGES NONE)
1717

18-
set(SHA256 7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca)
18+
set(SHA256 4b2136f98bdd1f5857f1c3dea9ac2018effe65286cf251534b6ae20cc45e1847)
1919

2020
if (WIN32)
2121
set(BOOTSTRAP_COMMAND bootstrap.bat)
@@ -164,7 +164,10 @@ target_compile_definitions(boost_asio INTERFACE
164164
if(WIN32)
165165
target_compile_definitions(boost INTERFACE
166166
# Required for Boost.WinAPI
167-
_WIN32_WINNT=0x06020000
167+
# Since boost 1.78.0, set value >= 0x0602 will cause linker errors
168+
_WIN32_WINNT=0x0602
169+
# Set this as 0x0601 to fix linking error independent of target Windows version like above
170+
BOOST_USE_WINAPI_VERSION=0x0601
168171
)
169172
endif()
170173

0 commit comments

Comments
 (0)