Fix bogus const_cast

tinloaf · Dec 6, 2019 · b585bed · b585bed
1 parent c43aecf
commit b585bed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/bst.cpp b/src/bst.cpp
@@ -672,7 +672,8 @@ typename BinarySearchTree<Node, Options, Tag, Compare,
 BinarySearchTree<Node, Options, Tag, Compare, ParentContainer>::find(
     const Comparable & query) const CMP_NOEXCEPT(query)
 {
-	return const_iterator<false>(const_cast<decltype(this)>(this)->find(query));
+	return const_iterator<false>(
+	    const_cast<std::remove_const_t<decltype(this)>>(this)->find(query));
 }
 
 template <class Node, class Options, class Tag, class Compare,

diff --git a/src/energy.cpp b/src/energy.cpp
@@ -3,6 +3,7 @@
 
 // Just to make this file compileable for clangd
 #include "energy.hpp"
+
 #include "debug.hpp"
 
 #include <cassert>
@@ -801,7 +802,8 @@ template <class Comparable>
 typename EnergyTree<Node, Options, Tag, Compare>::template const_iterator<false>
 EnergyTree<Node, Options, Tag, Compare>::find(const Comparable & query) const
 {
-	return const_iterator<false>(const_cast<decltype(this)>(this)->find(query));
+	return const_iterator<false>(
+	    const_cast<std::remove_const_t<decltype(this)>>(this)->find(query));
 }
 
 template <class Node, class Options, class Tag, class Compare>