Skip to content

Make generated C++ code compilable with C++/CLI in MSVC #3234

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

Closed
zsy056 wants to merge 2 commits into from
+14 −1
Closed

Make generated C++ code compilable with C++/CLI in MSVC #3234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db0e540
Make generated C++ code compilable with C++/CLI in MSVC
zsy056 Nov 13, 2025
45ef803
Merge branch 'apache:master' into cli
zsy056 Nov 21, 2025
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 lib/cpp/src/thrift/transport/TNonblockingServerSocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@
#endif // _WIN32
#endif

#if _WIN32
#include <thrift/windows/TWinsockSingleton.h>
#endif

template <class T>
inline const SOCKOPT_CAST_T* const_cast_sockopt(const T* v) {
return reinterpret_cast<const SOCKOPT_CAST_T*>(v);
Expand Down
1 change: 1 addition & 0 deletions lib/cpp/src/thrift/transport/TServerSocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
#include <windows.h>
#undef NOMINMAX
#undef WIN32_LEAN_AND_MEAN
#include <thrift/windows/TWinsockSingleton.h>
#endif

template <class T>
Expand Down
4 changes: 4 additions & 0 deletions lib/cpp/src/thrift/transport/TSocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@
#endif // _WIN32
#endif

#if _WIN32
#include <thrift/windows/TWinsockSingleton.h>
#endif

template <class T>
inline const SOCKOPT_CAST_T* const_cast_sockopt(const T* v) {
return reinterpret_cast<const SOCKOPT_CAST_T*>(v);
Expand Down
1 change: 0 additions & 1 deletion lib/cpp/src/thrift/windows/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
#include <thrift/transport/PlatformSocket.h>
#include <thrift/windows/GetTimeOfDay.h>
#include <thrift/windows/Operators.h>
#include <thrift/windows/TWinsockSingleton.h>
#include <thrift/windows/WinFcntl.h>
#include <thrift/windows/SocketPair.h>

Expand Down
5 changes: 5 additions & 0 deletions lib/cpp/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ set(testgencpp_cob_SOURCES
)
add_library(testgencpp_cob STATIC ${testgencpp_cob_SOURCES})

if (WIN32 AND MSVC)
add_library(testgencppCLI STATIC ${testgencpp_SOURCES})
set_target_properties(testgencppCLI PROPERTIES COMMON_LANGUAGE_RUNTIME "")
endif()

add_executable(Benchmark Benchmark.cpp)
target_link_libraries(Benchmark testgencpp)
target_link_libraries(Benchmark thrift)
Expand Down
Loading