Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix reinterpret_cast usage with clang.

Browse Source 
In FreeBSD with clang, NULL is redefined to nullptr since freebsd/freebsd-src@c8ed04c

static_cast should be used in this case.

This fixes build with clang on FreeBSD and should not cause any issues with other compilers.
This commit is contained in:
Guido Falsi 2021-04-30 10:47:30 +02:00
parent b15117ce2b
commit 545942981f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/utils/cpp_binding.h
View File

@ -14,7 +14,7 @@
#define arraysz(x) (sizeof(x)/sizeof(x[0]))
template<typename T, void free_T(void*), T null=reinterpret_cast<T>(NULL)>
template<typename T, void free_T(void*), T null=static_cast<T>(NULL)>
class generic_raii {
private:
generic_raii( const generic_raii & ) noexcept;
@ -45,7 +45,7 @@ typedef generic_raii<wchar_t*, PyMem_Free> wchar_raii;
static inline void python_object_destructor(void *p) { PyObject *x = reinterpret_cast<PyObject*>(p); Py_XDECREF(x); }
typedef generic_raii<PyObject*, python_object_destructor> pyobject_raii;
template<typename T, void free_T(void*), size_t sz, T null=reinterpret_cast<T>(NULL)>
template<typename T, void free_T(void*), size_t sz, T null=static_cast<T>(NULL)>
class generic_raii_array {
private:
generic_raii_array( const generic_raii_array & ) noexcept;