Linux compilation no. 2

Author: IS4Code

plugins/src/natives/iter.cpp

@@ -7,19 +7,24 @@
 //#include <deque>
 #include <type_traits>
 
+#ifndef _DEBUG
+#ifdef _WIN32
 template <class Type>
 struct is_simple
 {
 	static constexpr const bool value = sizeof(Type) == sizeof(cell) && std::is_trivially_assignable<Type, Type>::value && std::is_trivially_destructible<Type>::value;
 };
-
+#else
 template <class Type>
-constexpr const bool is_simple_v = is_simple<Type>::value;
+struct is_simple
+{
+	static constexpr const bool value = sizeof(Type) == sizeof(cell);
+};
+#endif
 
 // Iterators fit inside a single cell, but not in debug in VC++.
-#ifndef _DEBUG
-static_assert(is_simple_v<std::vector<dyn_object>::iterator>, "Vector is not simple.");
-static_assert(is_simple_v<std::unordered_map<dyn_object, dyn_object>::iterator>, "Map is not simple.");
+static_assert(is_simple<std::vector<dyn_object>::iterator>::value, "Vector is not simple.");
+static_assert(is_simple<std::unordered_map<dyn_object, dyn_object>::iterator>::value, "Map is not simple.");
 //static_assert(is_simple_v<std::unordered_set<dyn_object>::iterator>, "Set is not simple.");
 #endif
 

plugins/src/natives/map.cpp

@@ -19,7 +19,7 @@ class key_at
 
 	public:
 		// native bool:map_add(Map:map, key, value, ...);
-		template <key_ftype KeyFactory, typename value_ftype ValueFactory>
+		template <key_ftype KeyFactory, value_ftype ValueFactory>
 		static cell AMX_NATIVE_CALL map_add(AMX *amx, cell *params)
 		{
 			auto ptr = reinterpret_cast<map_t*>(params[1]);
@@ -29,7 +29,7 @@ class key_at
 		}
 
 		// native bool:map_set(Map:map, key, value, ...);
-		template <key_ftype KeyFactory, typename value_ftype ValueFactory>
+		template <key_ftype KeyFactory, value_ftype ValueFactory>
 		static cell AMX_NATIVE_CALL map_set(AMX *amx, cell *params)
 		{
 			auto ptr = reinterpret_cast<map_t*>(params[1]);
@@ -39,7 +39,7 @@ class key_at
 		}
 
 		// native map_get(Map:map, key, ...);
-		template <key_ftype KeyFactory, typename result_ftype ValueFactory>
+		template <key_ftype KeyFactory, result_ftype ValueFactory>
 		static cell AMX_NATIVE_CALL map_get(AMX *amx, cell *params)
 		{
 			auto ptr = reinterpret_cast<map_t*>(params[1]);

plugins/src/utils/dyn_object.cpp

@@ -245,6 +245,23 @@ inline void hash_combine(size_t& seed, const T& v)
 	seed ^= hasher(v) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
 }
 
+namespace std
+{
+	template<>
+	struct hash<cell_string>
+	{
+		size_t operator()(const cell_string &obj) const
+		{
+			size_t seed = 0;
+			for(size_t i = 0; i < obj.size(); i++)
+			{
+				hash_combine(seed, obj[i]);
+			}
+			return seed;
+		}
+	};
+}
+
 template <class TagType>
 bool dyn_object::get_hash_tagged(size_t &result) const
 {

plugins/src/utils/dyn_op.cpp

@@ -1,4 +1,5 @@
 #include "dyn_op.h"
+#include <cmath>
 
 cell op_add<cell>::operator()(cell a, cell b) const
 {