King_DuckZ/dindexer
1
0
Fork 0
mirror of https://github.com/KingDuckZ/dindexer.git synced 2025-07-03 14:14:11 +00:00
Code Issues Releases Wiki Activity

Adapt safe_ptr to build in this project

Browse source
This commit is contained in:
King_DuckZ 2016-02-18 19:16:50 +01:00
parent bc35e185e7
commit 5a2fd1e25e
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/kakoune/ref_ptr.hh
View file

@ -3,6 +3,10 @@
#include <utility> #include <utility>
#if !defined(NDEBUG) && !defined(KAK_DEBUG)
# define KAK_DEBUG
#endif
namespace Kakoune namespace Kakoune
{ {
@ -122,4 +126,8 @@ struct RefCountable
} }
#if defined(KAK_DEBUG)
# undef KAK_DEBUG
#endif
#endif // ref_ptr_hh_INCLUDED #endif // ref_ptr_hh_INCLUDED

25
include/kakoune/safe_ptr.hh
View file

@ -3,9 +3,7 @@
// #define SAFE_PTR_TRACK_CALLSTACKS // #define SAFE_PTR_TRACK_CALLSTACKS
#include "assert.hh"
#include "ref_ptr.hh" #include "ref_ptr.hh"
#include "backtrace.hh"
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
@ -15,6 +13,14 @@
#include <algorithm> #include <algorithm>
#endif #endif
#include <cassert>
#define kak_assert assert
#if !defined(NDEBUG) && !defined(KAK_DEBUG)
# define KAK_DEBUG
#endif
namespace Kakoune namespace Kakoune
{ {
@ -33,7 +39,7 @@ public:
#endif #endif
} }
friend void inc_ref_count(const SafeCountable* sc, void* ptr) friend void inc_ref_count(const SafeCountable* sc, void* /*ptr*/)
{ {
++sc->m_count; ++sc->m_count;
#ifdef SAFE_PTR_TRACK_CALLSTACKS #ifdef SAFE_PTR_TRACK_CALLSTACKS
@ -41,7 +47,7 @@ public:
#endif #endif
} }
friend void dec_ref_count(const SafeCountable* sc, void* ptr) friend void dec_ref_count(const SafeCountable* sc, void* /*ptr*/)
{ {
--sc->m_count; --sc->m_count;
kak_assert(sc->m_count >= 0); kak_assert(sc->m_count >= 0);
@ -53,7 +59,7 @@ public:
#endif #endif
} }
friend void ref_ptr_moved(const SafeCountable* sc, void* from, void* to) friend void ref_ptr_moved(const SafeCountable* /*sc*/, void* /*from*/, void* /*to*/)
{ {
#ifdef SAFE_PTR_TRACK_CALLSTACKS #ifdef SAFE_PTR_TRACK_CALLSTACKS
auto it = std::find_if(sc->m_callstacks.begin(), sc->m_callstacks.end(), auto it = std::find_if(sc->m_callstacks.begin(), sc->m_callstacks.end(),
@ -77,10 +83,10 @@ private:
mutable int m_count; mutable int m_count;
#else #else
[[gnu::always_inline]] [[gnu::always_inline]]
friend void inc_ref_count(const SafeCountable* sc, void* ptr) {} friend void inc_ref_count(const SafeCountable* /*sc*/, void* /*ptr*/) {}
[[gnu::always_inline]] [[gnu::always_inline]]
friend void dec_ref_count(const SafeCountable* sc, void* ptr) {} friend void dec_ref_count(const SafeCountable* /*sc*/, void* /*ptr*/) {}
#endif #endif
}; };
@ -92,4 +98,9 @@ using SafePtr = RefPtr<T, PropagateConst<T, SafeCountable>>;
} }
#if defined(KAK_DEBUG)
# undef KAK_DEBUG
#endif
#undef kak_assert
#endif // safe_ptr_hh_INCLUDED #endif // safe_ptr_hh_INCLUDED