From 373441fb9fd4335020ef317e78856c449c9a437b Mon Sep 17 00:00:00 2001
From: Artem Dinaburg <artem@trailofbits.com>
Date: Wed, 1 Nov 2017 22:59:04 -0400
Subject: [PATCH 1/2] Allow for a user only install if CMAKE_INSTALL_PREFIX is
 set

---
 CMakeLists.txt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d31fa9..b157154 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,6 +76,14 @@ add_custom_command(
 add_custom_target(target ALL DEPENDS ${OUTPUT})
 
 # Install DeepState via PIP.
-install(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install)")
+
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    #if an install prefix is not set, assume a global install
+    install(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install)")
+else()
+    # and install prefix is set; assume a user install
+    # the "prefix=" is intentional
+    install(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --user --prefix=)")
+endif()
 
 add_subdirectory(examples)

From 07fb0fb4c82c18d305c95a8a3fd3d9089e756f5e Mon Sep 17 00:00:00 2001
From: Artem Dinaburg <artem@trailofbits.com>
Date: Wed, 1 Nov 2017 22:59:17 -0400
Subject: [PATCH 2/2] build using clang 4.0

---
 src/include/deepstate/Stream.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/include/deepstate/Stream.hpp b/src/include/deepstate/Stream.hpp
index 176b8a5..02321eb 100644
--- a/src/include/deepstate/Stream.hpp
+++ b/src/include/deepstate/Stream.hpp
@@ -69,7 +69,7 @@ class Stream {
   DEEPSTATE_DEFINE_STREAMER(CStr, const char *, val)
   DEEPSTATE_DEFINE_STREAMER(CStr, char *, const_cast<const char *>(val))
 
-  DEEPSTATE_DEFINE_STREAMER(Pointer, nullptr_t, nullptr)
+  DEEPSTATE_DEFINE_STREAMER(Pointer, std::nullptr_t, nullptr)
 
   template <typename T>
   DEEPSTATE_DEFINE_STREAMER(Pointer, T *, val);