Skip to content

Commit 5363ee9

Browse files
Cleanup code and cmake
1 parent 92656aa commit 5363ee9

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

contrib/libcxx-cmake/CMakeLists.txt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,8 @@ set(SRCS
7272
"${LIBCXX_SOURCE_DIR}/src/verbose_abort.cpp"
7373
)
7474

75-
# Hardening mode = none.
76-
# Maybe we can enable it for debug builds.
77-
set(_LIBCPP_HARDENING_MODE_DEFAULT 2)
78-
set(_LIBCPP_PSTL_CPU_BACKEND_SERIAL 1)
79-
set(_LIBCPP_ABI_VERSION 999)
80-
set(_LIBCPP_ABI_UNSTABLE ON)
81-
set(_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS ON)
82-
set(_LIBCPP_ABI_NAMESPACE __1)
83-
configure_file("${LIBCXX_SOURCE_DIR}/include/__config_site.in" "${LIBCXX_GENERATED_INCLUDE_DIR}/__config_site")
8475
configure_file("${LIBCXX_SOURCE_DIR}/include/module.modulemap.in" "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap" @ONLY)
85-
set(generate-cxx-headers "${LIBCXX_GENERATED_INCLUDE_DIR}/__config_site" "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap")
86-
76+
set(generate-cxx-headers "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap")
8777
add_library(cxx-headers INTERFACE)
8878
add_dependencies(cxx-headers generate-cxx-headers)
8979
target_include_directories(cxx-headers INTERFACE ${LIBCXX_GENERATED_INCLUDE_DIR})

src/Interpreters/JIT/CHJIT.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <llvm/Support/DynamicLibrary.h>
2727
#include <llvm/TargetParser/Host.h>
2828
#include <llvm/Support/TargetSelect.h>
29-
// #include <llvm/Transforms/IPO/PassManagerBuilder.h>
3029
#include <llvm/Support/SmallVectorMemoryBuffer.h>
3130

3231
#include <base/getPageSize.h>

src/Server/HTTPHandler.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
#include <base/getFQDNOrHostName.h>
3434
#include <base/scope_guard.h>
35+
#include <base/isSharedPtrUnique.h>
3536
#include <Server/HTTP/HTTPResponse.h>
3637
#include <Server/HTTP/authenticateUserByHTTP.h>
3738
#include <Server/HTTP/sendExceptionToHTTPClient.h>
@@ -622,7 +623,7 @@ try
622623
auto write_buffers = used_output.out_delayed_and_compressed_holder->getResultBuffers();
623624
/// cancel the rest unused buffers
624625
for (auto & wb : write_buffers)
625-
if (wb.use_count() == 1)
626+
if (isSharedPtrUnique(wb))
626627
wb->cancel();
627628

628629
used_output.out_maybe_delayed_and_compressed = used_output.out_maybe_compressed;

0 commit comments

Comments
 (0)