clean up merge

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: Cyclops
 Type: Package
 Title: Cyclic Coordinate Descent for Logistic, Poisson and Survival Analysis
-Version: 3.4.0
+Version: 3.4.1
 Authors@R: c(
     person("Marc A.", "Suchard", email = "[email protected]", role = c("aut","cre")),
     person("Martijn J.", "Schuemie", role = "aut"),

NEWS.md

@@ -1,4 +1,11 @@
-develop
+jni
+==============
+
+Changes:
+
+1. add JNI interface for manipulating Cyclops objects in an across-language persistent cache
+
+Cyclops v3.4.1
 ==============
 
 Changes:

src/cyclops/Types.h

@@ -30,17 +30,10 @@
 //    }
 // #endif
 
-#ifdef WIN_BUILD
-    #include <tr1/unordered_map>
-    namespace bsccs {
-        using std::tr1::unordered_map;
-    }
-#else
-    #include <unordered_map>
-    namespace bsccs {
-        using std::unordered_map;
-    }
-#endif
+#include <unordered_map>
+namespace bsccs {
+    using std::unordered_map;
+}
 
 namespace bsccs {
 

tools/configure.R

@@ -48,7 +48,7 @@ if (length(java_home) == 0) {
 #################### CUDA Toolkit ####################
 
 cuda_home <- system2(command = "find", args = c("/usr/local/", "-maxdepth", "1" ,"-name", "cuda"), stdout  = TRUE)
-if (TRUE || length(cuda_home)==0) {
+if (TRUE || length(cuda_home)==0) { # By default, no CUDA build
     message("no CUDA installation found; only compile host code")
 } else {
     message(paste0("using CUDA_HOME=", cuda_home))