CXX-638 Fixes required for VS2015 support

acmorrow · acmorrow · commit 025ebb2df0a8 · 2016-01-07T17:12:08.000-05:00
diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt
@@ -131,6 +131,7 @@ install(FILES
 
 install(TARGETS
     bsoncxx
+    RUNTIME DESTINATION bin COMPONENT runtime
     LIBRARY DESTINATION lib COMPONENT runtime
     ARCHIVE DESTINATION lib COMPONENT dev
 )
diff --git a/src/bsoncxx/builder/concatenate.hpp b/src/bsoncxx/builder/concatenate.hpp
@@ -27,9 +27,13 @@ namespace builder {
 /// Container to concatenate a document. Use it by constructing an instance with the
 /// document to be concatenated, and pass it into a document stream builder.
 ///
-struct BSONCXX_API concatenate_doc {
+struct concatenate_doc {
     document::view_or_value doc;
 
+    // MSVC seems to need a hint that it should always
+    // inline this destructor;
+    BSONCXX_INLINE ~concatenate_doc() = default;
+
     BSONCXX_INLINE operator document::view() const {
         return doc;
     }
@@ -43,9 +47,13 @@ struct BSONCXX_API concatenate_doc {
 /// Container to concatenate an array. Use this with the array stream builder in order
 /// to pass an array into a new builder and append its values to the stream.
 ///
-struct BSONCXX_API concatenate_array {
+struct concatenate_array {
     array::view_or_value array;
 
+    // MSVC seems to need a hint that it should always
+    // inline this destructor;
+    BSONCXX_INLINE ~concatenate_array() = default;
+
     BSONCXX_INLINE operator array::view() const {
         return array;
     }
diff --git a/src/bsoncxx/builder/stream/array_context.hpp b/src/bsoncxx/builder/stream/array_context.hpp
@@ -67,7 +67,9 @@ class array_context {
     BSONCXX_INLINE typename std::enable_if<
         std::is_same<base, closed_context>::value &&
             std::is_same<typename std::remove_reference<T>::type, const finalize_type>::value,
-        array::value>::type
+        // TODO(MSVC): This should just be 'array::value', but
+        // VS2015U1 can't resolve the name.
+        bsoncxx::array::value>::type
     operator<<(T&&) {
         return _core->extract_array();
     }
diff --git a/src/bsoncxx/builder/stream/key_context.hpp b/src/bsoncxx/builder/stream/key_context.hpp
@@ -64,7 +64,9 @@ class key_context {
     BSONCXX_INLINE typename std::enable_if<
         std::is_same<base, closed_context>::value &&
             std::is_same<typename std::remove_reference<T>::type, const finalize_type>::value,
-        document::value>::type
+        // TODO(MSVC): This should just be 'document::value', but
+        // VS2015U1 can't resolve the name.
+        bsoncxx::document::value>::type
     operator<<(T&&) {
         return _core->extract_document();
     }
diff --git a/src/bsoncxx/builder/stream/value_context.hpp b/src/bsoncxx/builder/stream/value_context.hpp
@@ -60,8 +60,11 @@ class value_context {
 
     operator single_context();
 
+#if !defined(_MSC_VER)
+    // TODO(MSVC): Causes an ICE under VS2015U1
     static_assert(std::is_same<value_context, decltype(std::declval<value_context>() << 1 << "str")>::value,
                   "value_context must be templatized on a key_context");
+#endif
 
    private:
     BSONCXX_INLINE base unwrap() { return base(_core); }
diff --git a/src/bsoncxx/config/compiler.hpp b/src/bsoncxx/config/compiler.hpp
@@ -19,8 +19,8 @@
 #pragma warning(push)
 #pragma warning(disable: 4251)
 
-#define BSONCXX_INLINE inline __forceinline
+#define BSONCXX_INLINE inline __forceinline BSONCXX_PRIVATE
 
 #else
-#define BSONCXX_INLINE inline __attribute__((__visibility__("hidden"), __always_inline__))
+#define BSONCXX_INLINE inline __attribute__((__always_inline__)) BSONCXX_PRIVATE
 #endif
diff --git a/src/bsoncxx/config/postlude.hpp b/src/bsoncxx/config/postlude.hpp
@@ -56,18 +56,20 @@ static_assert(false, "BSONCXX_ENUM must be undef'ed");
 // export.hpp (generated by cmake)
 #undef BSONCXX_API_H
 #pragma pop_macro("BSONCXX_API_H")
+#undef BSONCXX_API
+#pragma pop_macro("BSONCXX_API")
+#undef BSONCXX_PRIVATE
+#pragma pop_macro("BSONCXX_PRIVATE")
 #undef BSONCXX_DEPRECATED
 #pragma pop_macro("BSONCXX_DEPRECATED")
 #undef BSONCXX_DEPRECATED_EXPORT
 #pragma pop_macro("BSONCXX_DEPRECATED_EXPORT")
 #undef BSONCXX_DEPRECATED_NO_EXPORT
 #pragma pop_macro("BSONCXX_DEPRECATED_NO_EXPORT")
+#undef DEFINE_NO_DEPRECATED
+#pragma pop_macro("DEFINE_NO_DEPRECATED")
 #undef BSONCXX_NO_DEPRECATED
 #pragma pop_macro("BSONCXX_NO_DEPRECATED")
-#undef BSONCXX_PRIVATE
-#pragma pop_macro("BSONCXX_PRIVATE")
-#undef BSONCXX_API
-#pragma pop_macro("BSONCXX_API")
 
 // prelude.hpp
 #undef BSONCXX_UNREACHABLE
diff --git a/src/bsoncxx/config/prelude.hpp b/src/bsoncxx/config/prelude.hpp
@@ -51,23 +51,25 @@
 // export.hpp (generated by cmake)
 #pragma push_macro("BSONCXX_API_H")
 #undef BSONCXX_API_H
+#pragma push_macro("BSONCXX_API")
+#undef BSONCXX_API
+#pragma push_macro("BSONCXX_PRIVATE")
+#undef BSONCXX_PRIVATE
 #pragma push_macro("BSONCXX_DEPRECATED")
 #undef BSONCXX_DEPRECATED
 #pragma push_macro("BSONCXX_DEPRECATED_EXPORT")
 #undef BSONCXX_DEPRECATED_EXPORT
 #pragma push_macro("BSONCXX_DEPRECATED_NO_EXPORT")
 #undef BSONCXX_DEPRECATED_NO_EXPORT
+#pragma push_macro("DEFINE_NO_DEPRECATED")
+#undef DEFINE_NO_DEPRECATED
 #pragma push_macro("BSONCXX_NO_DEPRECATED")
 #undef BSONCXX_NO_DEPRECATED
-#pragma push_macro("BSONCXX_PRIVATE")
-#undef BSONCXX_PRIVATE
-#pragma push_macro("BSONCXX_API")
-#undef BSONCXX_API
 
-#include <bsoncxx/config/compiler.hpp>
 #include <bsoncxx/config/config.hpp>
 #include <bsoncxx/config/version.hpp>
 #include <bsoncxx/config/export.hpp>
+#include <bsoncxx/config/compiler.hpp>
 
 #pragma push_macro("BSONCXX_UNREACHABLE")
 #undef BSONCXX_UNREACHABLE
diff --git a/src/bsoncxx/oid.cpp b/src/bsoncxx/oid.cpp
@@ -24,6 +24,8 @@
 namespace bsoncxx {
 BSONCXX_INLINE_NAMESPACE_BEGIN
 
+const oid::init_tag_t oid::init_tag{};
+
 oid::oid() : _is_valid(false) {
 }
 
diff --git a/src/bsoncxx/oid.hpp b/src/bsoncxx/oid.hpp
@@ -38,7 +38,13 @@ BSONCXX_INLINE_NAMESPACE_BEGIN
 class BSONCXX_API oid {
    public:
     struct init_tag_t {};
-    static constexpr init_tag_t init_tag{};
+
+    // TODO(MSVC): Ideally this would be constexpr, but VS2015U1 can't
+    // handle it.
+    //
+    // See https://connect.microsoft.com/VisualStudio/feedback/details/2092790
+    //
+    static const init_tag_t init_tag;
 
     ///
     /// Constructs an uninitialized oid.
diff --git a/src/bsoncxx/private/stack.hpp b/src/bsoncxx/private/stack.hpp
@@ -69,7 +69,7 @@ class stack {
 
     std::list<T *> _buckets;
 
-    typename decltype(_buckets)::iterator _bucket_iter;
+    typename std::list<T*>::iterator _bucket_iter;
 
     int _bucket_index;
     int _bucket_size;
diff --git a/src/bsoncxx/stdx/optional.hpp b/src/bsoncxx/stdx/optional.hpp
@@ -44,7 +44,9 @@ namespace stdx {
 
 using ::boost::optional;
 using nullopt_t = ::boost::none_t;
-constexpr nullopt_t nullopt{};
+
+// TODO(MSVC): This would be better expressed as constexpr, but VS2015U1 can't do it.
+const nullopt_t nullopt{::boost::none};
 using ::boost::make_optional;
 
 }  // namespace stdx
diff --git a/src/bsoncxx/test/bson_util_itoa.cpp b/src/bsoncxx/test/bson_util_itoa.cpp
@@ -3,10 +3,8 @@
 #include <bsoncxx/private/itoa.hpp>
 
 TEST_CASE("util::itoa is equivalent to to_string(int)", "[bsoncxx::util::itoa]") {
-    using namespace bsoncxx;
-
     for (int i = 0; i <= 10000; i++) {
-        itoa val(i);
+        bsoncxx::itoa val(i);
         std::string str = std::to_string(i);
         REQUIRE(val.length() == str.length());
         REQUIRE(std::string(val.c_str()) == str);
diff --git a/src/bsoncxx/util/functor.hpp b/src/bsoncxx/util/functor.hpp
@@ -22,9 +22,90 @@ namespace bsoncxx {
 BSONCXX_INLINE_NAMESPACE_BEGIN
 namespace util {
 
+// TODO(MSVC): VS2015U1 Completely falls apart trying to honor the
+// simple definition of is_functor since is_convertible returns the
+// wrong results for std::function, so we fall back to a bunch of
+// other template metaprogramming there.
+
+#if !defined(_MSC_VER)
+
 template <typename FunctionLike, typename Signature>
 using is_functor = std::is_convertible<FunctionLike, std::function<Signature>>;
 
+#else
+
+namespace functor {
+
+template <typename, typename>
+struct build_free_function;
+
+template <typename F, typename R, typename... Args>
+struct build_free_function<F, R(Args...)> {
+    typedef R (*type)(Args...);
+};
+
+template <typename, typename>
+struct build_class_function;
+
+template <typename C, typename R, typename... Args>
+struct build_class_function<C, R(Args...)> {
+    typedef R (C::*type)(Args...);
+};
+
+template <typename>
+struct strip_cv_from_class_function;
+
+template <typename C, typename R, typename... Args>
+struct strip_cv_from_class_function<R (C::*)(Args...)> {
+    typedef R (C::*type)(Args...);
+};
+
+template <typename C, typename R, typename... Args>
+struct strip_cv_from_class_function<R (C::*)(Args...) const> {
+    typedef R (C::*type)(Args...);
+};
+
+template <typename C, typename R, typename... Args>
+struct strip_cv_from_class_function<R (C::*)(Args...) volatile> {
+    typedef R (C::*type)(Args...);
+};
+
+template <typename C, typename S>
+struct is_class_method_with_signature {
+    typedef int yes;
+    typedef char no;
+
+    // T stands for SFINAE
+    template <typename T>
+    static typename std::enable_if<std::is_convertible<typename build_class_function<C, S>::type,
+                                                       typename strip_cv_from_class_function<
+                                                           decltype(&T::operator())>::type>::value,
+                                   yes>::type
+        sfinae(void *);
+
+    template <typename>
+    static no sfinae(...);
+
+    static bool constexpr value = sizeof(sfinae<C>(nullptr)) == sizeof(yes);
+};
+
+template <typename F, typename S>
+struct is_function_with_signature
+    : std::is_convertible<F, typename build_free_function<F, S>::type> {};
+
+template <typename C, typename S, bool>
+struct is_functor_impl : is_class_method_with_signature<C, S> {};
+
+template <typename F, typename S>
+struct is_functor_impl<F, S, false> : is_function_with_signature<F, S> {};
+
+}  // namespace functor
+
+template <typename C, typename S>
+struct is_functor : functor::is_functor_impl<C, S, std::is_class<C>::value> {};
+
+#endif
+
 }  // namespace util
 BSONCXX_INLINE_NAMESPACE_END
 }  // namespace bsoncxx
diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt
@@ -143,8 +143,8 @@ generate_export_header (mongocxx
 
 set(mongocxx_libs ${LIBMONGOC_LIBRARIES} ${LIBBSON_LIBRARIES})
 
-target_link_libraries(mongocxx_static bsoncxx ${mongocxx_libs})
-target_link_libraries(mongocxx_mocked bsoncxx ${mongocxx_libs})
+target_link_libraries(mongocxx_static bsoncxx_static ${mongocxx_libs})
+target_link_libraries(mongocxx_mocked bsoncxx_static ${mongocxx_libs})
 target_link_libraries(mongocxx PUBLIC bsoncxx PRIVATE ${mongocxx_libs})
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -166,6 +166,7 @@ install(FILES
 
 install(TARGETS
     mongocxx
+    RUNTIME DESTINATION bin COMPONENT runtime
     LIBRARY DESTINATION lib COMPONENT runtime
     ARCHIVE DESTINATION lib COMPONENT dev
 )
diff --git a/src/mongocxx/client.cpp b/src/mongocxx/client.cpp
@@ -69,8 +69,8 @@ stdx::optional<class read_concern> client::read_concern() const {
     if (!libmongoc::read_concern_get_level(rc)) {
         return stdx::nullopt;
     }
-    return {(class read_concern){
-        stdx::make_unique<read_concern::impl>(libmongoc::read_concern_copy(rc))}};
+    return {(class read_concern)(
+        stdx::make_unique<read_concern::impl>(libmongoc::read_concern_copy(rc)))};
 }
 
 void client::read_preference(class read_preference rp) {
diff --git a/src/mongocxx/collection.cpp b/src/mongocxx/collection.cpp
@@ -756,8 +756,8 @@ stdx::optional<class read_concern> collection::read_concern() const {
     if (!libmongoc::read_concern_get_level(rc)) {
         return stdx::nullopt;
     }
-    return {(class read_concern){
-        stdx::make_unique<read_concern::impl>(libmongoc::read_concern_copy(rc))}};
+    return {(class read_concern)(
+        stdx::make_unique<read_concern::impl>(libmongoc::read_concern_copy(rc)))};
 }
 
 void collection::read_preference(class read_preference rp) {
diff --git a/src/mongocxx/config/compiler.hpp b/src/mongocxx/config/compiler.hpp
@@ -21,8 +21,8 @@
 #pragma warning(push)
 #pragma warning(disable: 4251)
 
-#define MONGOCXX_INLINE inline __forceinline
+#define MONGOCXX_INLINE inline __forceinline MONGOCXX_PRIVATE
 
 #else
-#define MONGOCXX_INLINE inline __attribute__((__visibility__("hidden"), __always_inline__))
+#define MONGOCXX_INLINE inline __attribute__((__always_inline__)) MONGOCXX_PRIVATE
 #endif
diff --git a/src/mongocxx/config/postlude.hpp b/src/mongocxx/config/postlude.hpp
@@ -36,24 +36,22 @@
 #pragma pop_macro("MONGOCXX_VERSION_PATCH")
 
 // export.hpp (generated by cmake)
-#undef DEFINE_NO_DEPRECATED
-#pragma pop_macro("DEFINE_NO_DEPRECATED")
-#undef MONGOCXX_API
-#pragma pop_macro("MONGOCXX_API")
 #undef MONGOCXX_API_H
 #pragma pop_macro("MONGOCXX_API_H")
+#undef MONGOCXX_API
+#pragma pop_macro("MONGOCXX_API")
+#undef MONGOCXX_PRIVATE
+#pragma pop_macro("MONGOCXX_PRIVATE")
 #undef MONGOCXX_DEPRECATED
 #pragma pop_macro("MONGOCXX_DEPRECATED")
 #undef MONGOCXX_DEPRECATED_EXPORT
 #pragma pop_macro("MONGOCXX_DEPRECATED_EXPORT")
 #undef MONGOCXX_DEPRECATED_NO_EXPORT
 #pragma pop_macro("MONGOCXX_DEPRECATED_NO_EXPORT")
+#undef DEFINE_NO_DEPRECATED
+#pragma pop_macro("DEFINE_NO_DEPRECATED")
 #undef MONGOCXX_NO_DEPRECATED
 #pragma pop_macro("MONGOCXX_NO_DEPRECATED")
-#undef MONGOCXX_PRIVATE
-#pragma pop_macro("MONGOCXX_PRIVATE")
-#undef MONGOCXX_API
-#pragma pop_macro("MONGOCXX_API")
 
 // prelude.hpp
 #undef MONGOCXX_UNREACHABLE
diff --git a/src/mongocxx/config/prelude.hpp b/src/mongocxx/config/prelude.hpp
diff --git a/src/mongocxx/cursor.hpp b/src/mongocxx/cursor.hpp
diff --git a/src/mongocxx/database.cpp b/src/mongocxx/database.cpp
diff --git a/src/mongocxx/test/CMakeLists.txt b/src/mongocxx/test/CMakeLists.txt
diff --git a/src/mongocxx/test/pool.cpp b/src/mongocxx/test/pool.cpp
diff --git a/src/mongocxx/uri.cpp b/src/mongocxx/uri.cpp
diff --git a/src/mongocxx/uri.hpp b/src/mongocxx/uri.hpp

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ install(FILES`
`131`	`131`
`132`	`132`	`install(TARGETS`
`133`	`133`	`bsoncxx`
	`134`	`+ RUNTIME DESTINATION bin COMPONENT runtime`
`134`	`135`	`LIBRARY DESTINATION lib COMPONENT runtime`
`135`	`136`	`ARCHIVE DESTINATION lib COMPONENT dev`
`136`	`137`	`)`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@`
`24`	`24`	`namespace bsoncxx {`
`25`	`25`	`BSONCXX_INLINE_NAMESPACE_BEGIN`
`26`	`26`
	`27`	`+const oid::init_tag_t oid::init_tag{};`
	`28`	`+`
`27`	`29`	`oid::oid() : _is_valid(false) {`
`28`	`30`	`}`
`29`	`31`