Migrating to C++20.

shin1m · Feb 15, 2024 · 43437e4 · 43437e4
1 parent f8aaa7f
commit 43437e4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/include/xemmai/string.h b/include/xemmai/string.h
@@ -55,10 +55,6 @@ class t_string
 	{
 		return v_size == a_x.v_size && std::char_traits<wchar_t>::compare(*this, a_x, v_size) == 0;
 	}
-	bool operator!=(const t_string& a_x) const
-	{
-		return !(*this == a_x);
-	}
 	int f_compare(const t_string& a_x) const
 	{
 		int n = std::char_traits<wchar_t>::compare(*this, a_x, std::min(v_size, a_x.v_size));

diff --git a/include/xemmai/value.h b/include/xemmai/value.h
@@ -299,10 +299,6 @@ class t_value : public T_tag
 			return true;
 		}
 	}
-	bool operator!=(const t_value<t_pointer>& a_value) const
-	{
-		return !operator==(a_value);
-	}
 	uintptr_t f_tag() const
 	{
 		return reinterpret_cast<uintptr_t>(static_cast<t_object*>(*this));

diff --git a/src/type.cc b/src/type.cc
@@ -75,7 +75,7 @@ std::pair<std::vector<std::pair<t_root, t_rvalue>>, std::map<t_object*, size_t>>
 	std::vector<std::pair<t_root, t_rvalue>> fields{f_fields(), f_fields() + v_instance_fields};
 	std::map<t_object*, size_t> key2index{f_key2index(), f_key2index() + v_fields};
 	for (auto& x : a_fields.v_instance) {
-		if (key2index.find(x) != key2index.end()) f_throw(x->f_as<t_symbol>().f_string());
+		if (key2index.contains(x)) f_throw(x->f_as<t_symbol>().f_string());
 		key2index.emplace(x, fields.size());
 		fields.emplace_back(x, nullptr);
 	}