Fix compilation

diff --git a/libs/container/hashtable.h b/libs/container/hashtable.h
index 2c5677ce6d67f657e9d3b03268e921c4dbdef90c..0f174d20e87b813d27ac9cd983b161d0ffa54867 100644 (file)
--- a/libs/container/hashtable.h
+++ b/libs/container/hashtable.h
@@ -25,6 +25,7 @@
 #include <cstddef>
 #include <algorithm>
 #include <functional>
+#include <memory>
 #include "debugging/debugging.h"
 
 

diff --git a/libs/splines/q_shared.h b/libs/splines/q_shared.h
index 6cad80bc97eec9ac4f5e2b8cbaa6e7a1e57874d9..6ebfb99fa3ed25f8f1c2459de5b52806ac4b9d25 100644 (file)
--- a/libs/splines/q_shared.h
+++ b/libs/splines/q_shared.h
@@ -228,7 +228,7 @@ typedef enum {
 #define MAX_QINT            0x7fffffff
 #define MIN_QINT            ( -MAX_QINT - 1 )
 
-#ifndef max
+#if !defined(__cplusplus) && !defined(max)
 #define max( x, y ) ( ( ( x ) > ( y ) ) ? ( x ) : ( y ) )
 #define min( x, y ) ( ( ( x ) < ( y ) ) ? ( x ) : ( y ) )
 #endif