xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add noexcept spec to move constructor and move assign

Browse Source
This commit is contained in:
Maxime Coste 2014-10-28 20:01:27 +00:00
parent 00aede6e57
commit d3091cb553
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/interned_string.cc
View File

@ -40,7 +40,7 @@ void StringRegistry::acquire(size_t slot)
++m_storage[slot].second; ++m_storage[slot].second;
} }
void StringRegistry::release(size_t slot) void StringRegistry::release(size_t slot) noexcept
{ {
if (--m_storage[slot].second == 0) if (--m_storage[slot].second == 0)
{ {

8
src/interned_string.hh
View File

@ -18,7 +18,7 @@ private:
InternedString acquire(StringView str); InternedString acquire(StringView str);
void acquire(size_t slot); void acquire(size_t slot);
void release(size_t slot); void release(size_t slot) noexcept;
std::unordered_map<StringView, size_t> m_slot_map; std::unordered_map<StringView, size_t> m_slot_map;
std::vector<size_t> m_free_slots; std::vector<size_t> m_free_slots;
@ -62,8 +62,10 @@ public:
return *this; return *this;
} }
InternedString& operator=(InternedString&& str) InternedString& operator=(InternedString&& str) noexcept
{ {
release_ifn();
static_cast<StringView&>(*this) = str; static_cast<StringView&>(*this) = str;
m_slot = str.m_slot; m_slot = str.m_slot;
str.m_slot = -1; str.m_slot = -1;
@ -110,7 +112,7 @@ private:
*this = StringRegistry::instance().acquire(str); *this = StringRegistry::instance().acquire(str);
} }
void release_ifn() void release_ifn() noexcept
{ {
if (m_slot != -1) if (m_slot != -1)
StringRegistry::instance().release(m_slot); StringRegistry::instance().release(m_slot);

1
src/optional.hh
View File

@ -20,6 +20,7 @@ public:
} }
Optional(Optional&& other) Optional(Optional&& other)
noexcept(noexcept(new ((void*)0) T(std::move(other.m_value))))
: m_valid(other.m_valid) : m_valid(other.m_valid)
{ {
if (m_valid) if (m_valid)

4
src/safe_ptr.hh
View File

@ -29,7 +29,7 @@ public:
#endif #endif
} }
safe_ptr(const safe_ptr& other) : safe_ptr(other.m_ptr) {} safe_ptr(const safe_ptr& other) : safe_ptr(other.m_ptr) {}
safe_ptr(safe_ptr&& other) : m_ptr(other.m_ptr) safe_ptr(safe_ptr&& other) noexcept : m_ptr(other.m_ptr)
{ {
other.m_ptr = nullptr; other.m_ptr = nullptr;
#ifdef KAK_DEBUG #ifdef KAK_DEBUG
@ -60,7 +60,7 @@ public:
return *this; return *this;
} }
safe_ptr& operator=(safe_ptr&& other) safe_ptr& operator=(safe_ptr&& other) noexcept
{ {
#ifdef KAK_DEBUG #ifdef KAK_DEBUG
if (m_ptr) if (m_ptr)