+ fix for folly compile in linux

+ docker fixes
moja-global · Jul 30, 2019 · 63139ba · 63139ba
1 parent 22db564
commit 63139ba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Examples/docker/Dockerfile.base.ubuntu.18.04 b/Examples/docker/Dockerfile.base.ubuntu.18.04
@@ -132,4 +132,3 @@ RUN    cmake .. \
     && make install \
     && make clean  \
     && cd $ROOTDIR
-
diff --git a/Source/moja.core/include/moja/hash.h b/Source/moja.core/include/moja/hash.h
@@ -4,10 +4,19 @@
 
 #include "moja/_core_exports.h"
 
-//#include "moja/types.h"
-//#include "moja/applytuple.h"
+#include <Poco/Nullable.h>
 
+// clang-format off
+#include <functional>  // needed by folly
 #include <folly/hash/Hash.h>
+// clang-format on
+
+namespace folly {
+	template <typename T>
+	struct hasher<Poco::Nullable<T>> {
+	size_t operator()(const Poco::Nullable<T>& key) const { return key.isNull() ? 0 : Hash()(key.value()); }
+	};
+}  // namespace folly
 
 namespace moja {
 	using folly::hasher;