Browse Source

Fix nanodbc build with clang and gcc stdlib

This should really be fixed upstream somehow, but the upstream build
with clang is broken on Fedora 38 right now anyway due to header issues.
newinvert
Ian McInerney 3 years ago
parent
commit
45b8dced92
  1. 4
      thirdparty/nanodbc/README.txt
  2. 2
      thirdparty/nanodbc/nanodbc/nanodbc.cpp
  3. 2
      thirdparty/nanodbc/nanodbc/nanodbc.h

4
thirdparty/nanodbc/README.txt

@ -6,3 +6,7 @@ It is licensed under MIT, with the license text in this directory.
Note: The CMakeLists.txt file has been modified to remove the CXX flags nanodbc is
adding to the build. These flags were interfering with the Clang build, and also
including Werror is a bad idea.
Note: The cpp and header file have been modified to remove the #ifdef _clang_ from the
includes. This was needed when nanodbc changed the standard library, but now with GCC 13,
this is needed when building with the GCC standard library and clang.

2
thirdparty/nanodbc/nanodbc/nanodbc.cpp

@ -27,9 +27,7 @@
#include <map>
#include <type_traits>
#ifndef __clang__
#include <cstdint>
#endif
// User may redefine NANODBC_ASSERT macro in nanodbc/nanodbc.h
#ifndef NANODBC_ASSERT

2
thirdparty/nanodbc/nanodbc/nanodbc.h

@ -84,9 +84,7 @@
#include <string>
#include <vector>
#ifndef __clang__
#include <cstdint>
#endif
/// \brief The entirety of nanodbc can be found within this one namespace.
///

Loading…
Cancel
Save