Merge branch 'master' of github.com:trailofbits/deepstate

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)

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);