Merge pull request #20 from biovault/fix_define_HNSWLIB_SUPPORTED

HNSWLIB_SUPPORTED was not correctly being defined
biovault · Jul 17, 2020 · b2d6b2c · b2d6b2c
2 parents 04d07db + a276ab3
commit b2d6b2c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/hdi/dimensionality_reduction/hierarchical_sne_inl.h b/hdi/dimensionality_reduction/hierarchical_sne_inl.h
@@ -53,15 +53,17 @@
 
 #ifdef HNSWLIB_FOUND
 #ifdef _MSC_VER
-#if (__cplusplus >=201103)
+#if(_MSC_VER >= 1900)
 #include "hnswlib/hnswlib.h"
 #include "hnswlib/space_l2.h"
 #define HNSWLIB_SUPPORTED
-#endif //__cplusplus >=201103
+#endif //(_MSC_VER >= 1900)
 #else // _MSC_VER
+#if (__cplusplus >=201103)
 #include "hnswlib/hnswlib.h"
 #include "hnswlib/space_l2.h"
 #define HNSWLIB_SUPPORTED
+#endif //(__cplusplus >=201103)
 #endif // _MSC_VER
 #endif //HNSWLIB_FOUND
 

diff --git a/hdi/dimensionality_reduction/knn_utils.cpp b/hdi/dimensionality_reduction/knn_utils.cpp
@@ -1,6 +1,17 @@
 #include "knn_utils.h"
 #include <stdexcept>
 
+#ifdef HNSWLIB_FOUND
+#ifdef _MSC_VER
+#if(_MSC_VER >= 1900)
+#define HNSWLIB_SUPPORTED
+#endif //(_MSC_VER >= 1900)
+#else // _MSC_VER
+#if (__cplusplus >=201103)
+#define HNSWLIB_SUPPORTED
+#endif //(__cplusplus >=201103)
+#endif // _MSC_VER
+#endif //HNSWLIB_FOUND
 
 namespace hdi {
   namespace dr {