Switch to using the standards-conforming preprocessor for C++

CMakeLists.txt

@@ -174,6 +174,8 @@ set(TILEDB_EP_INSTALL_PREFIX "${TILEDB_EP_BASE}/install")
 if (MSVC)
   # Turn on standards-conformance mode
   add_compile_options("/permissive-")
+  # Enable the conforming preprocessor instead of the traditional (non-conforming) preprocessor
+  add_compile_options("/Zc:preprocessor")
   # /EH: Enables standard C++ stack unwinding.
   # s: Catches only standard C++ exceptions when you use catch(...) syntax.
   # c: The compiler assumes that functions declared as extern "C" never throw a C++ exception

tiledb/common/exception/status.h

@@ -80,21 +80,12 @@ namespace common {
     }                                \
   } while (false)
 
-#define RETURN_NOT_OK_TUPLE(s, ...) \
-  do {                              \
-    Status _s = (s);                \
-    if (!_s.ok()) {                 \
-      return {_s, __VA_ARGS__};     \
-    }                               \
-  } while (false)
-
-#define RETURN_NOT_OK_ELSE_TUPLE(s, else_, ...) \
-  do {                                          \
-    Status _s = (s);                            \
-    if (!_s.ok()) {                             \
-      else_;                                    \
-      return {_s, __VA_ARGS__};                 \
-    }                                           \
+#define RETURN_NOT_OK_TUPLE(s, ...)           \
+  do {                                        \
+    Status _s = (s);                          \
+    if (!_s.ok()) {                           \
+      return {_s __VA_OPT__(, ) __VA_ARGS__}; \
+    }                                         \
   } while (false)
 
 /**

tiledb/common/heap_memory.h

@@ -152,13 +152,9 @@ using tiledb_unique_ptr = std::unique_ptr<T, TileDBUniquePtrDeleter<T>>;
 
 #define tdb_free(p) tiledb::common::tiledb_free(p)
 
-#ifdef _MSC_VER
-#define tdb_new(T, ...) \
-  tiledb::common::tiledb_new<T>(TILEDB_HEAP_MEM_LABEL, __VA_ARGS__)
-#else
-#define tdb_new(T, ...) \
-  tiledb::common::tiledb_new<T>(TILEDB_HEAP_MEM_LABEL, ##__VA_ARGS__)
-#endif
+#define tdb_new(T, ...)                                              \
+  tiledb::common::tiledb_new<T>(TILEDB_HEAP_MEM_LABEL __VA_OPT__(, ) \
+                                    __VA_ARGS__)
 
 #define tdb_delete(p) tiledb::common::tiledb_delete(p);