Merge remote-tracking branch 'core/master' into 1.10.0_alpha_prep

Author: Michael Fero

cpp-driver/CMakeLists.txt

@@ -145,6 +145,18 @@ if(CASS_BUILD_STATIC)
   endif()
   CassConfigureStatic("CASS")
 
+  # Set pkg_config required libraries
+  set(PC_REQUIRED_LIBS "libuv")
+  if (CASS_USE_OPENSSL)
+    set(PC_REQUIRED_LIBS "${PC_REQUIRED_LIBS} openssl")
+  endif()
+
+  # Update the test flags to indicate the use of the static library
+  if(CASS_USE_STATIC_LIBS)
+    set(TEST_CXX_FLAGS "${TEST_CXX_FLAGS} -DCASS_STATIC")
+    set(CASS_TEST_CXX_FLAGS "${CASS_TEST_CXX_FLAGS} -DCASS_STATIC")
+  endif()
+
   set_property(TARGET ${PROJECT_LIB_NAME_STATIC} PROPERTY FOLDER "Driver/Cassandra")
 endif()
 

cpp-driver/README.md

@@ -184,7 +184,7 @@ specific language governing permissions and limitations under the License.
 [DSE C/C++ driver]: http://docs.datastax.com/en/developer/cpp-driver-dse/latest
 [DataStax Enterprise]: http://www.datastax.com/products/datastax-enterprise
 [Examples]: examples/
-[download server]: http://downloads.datastax.com/cpp-driver
+[download server]: http://downloads.datastax.com/cpp-driver/
 [GitHub]: https://github.com/datastax/cpp-driver
 [cpp-driver-compatability-matrix]: https://docs.datastax.com/en/developer/driver-matrix/doc/cppDrivers.html#cpp-drivers
 [Home]: http://docs.datastax.com/en/developer/cpp-driver/latest

cpp-driver/packaging/cassandra_static.pc.in

@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: cassandra
 Description: A C/C++ client driver for Apache Cassandra
 Version: @version@
-Requires: libuv
+Requires: @PC_REQUIRED_LIBS@
 Libs: -L${libdir} -l@PROJECT_LIB_NAME_STATIC@ -lstdc++
 Cflags:
 URL: https://github.com/datastax/cpp-driver/

cpp-driver/src/deque.hpp

@@ -28,9 +28,6 @@ class Deque : public std::deque<T, internal::Allocator<T> > {
   template <class InputIt>
   Deque(InputIt first, InputIt last, const Allocator& alloc = Allocator())
       : std::deque<T, Allocator>(first, last, alloc) {}
-
-  Deque(const Deque& other)
-      : std::deque<T, Allocator>(other) {}
 };
 
 }} // namespace datastax::internal

cpp-driver/src/map.hpp

@@ -25,9 +25,6 @@ class Map
   explicit Map(const Compare& compare = Compare(), const Allocator& alloc = Allocator())
       : std::map<K, V, Compare, Allocator>(compare, alloc) {}
 
-  Map(const Map& other)
-      : std::map<K, V, Compare, Allocator>(other) {}
-
   template <class InputIt>
   Map(InputIt first, InputIt last, const Compare& compare = Compare(),
       const Allocator& alloc = Allocator())

cpp-driver/src/random.cpp

@@ -53,6 +53,11 @@ Random::~Random() { uv_mutex_destroy(&mutex_); }
 
 uint64_t Random::next(uint64_t max) {
   ScopedMutex l(&mutex_);
+
+  if (max == 0) {
+    return 0;
+  }
+
   const uint64_t limit = CASS_UINT64_MAX - CASS_UINT64_MAX % max;
   uint64_t r;
   do {

cpp-driver/src/vector.hpp

@@ -28,9 +28,6 @@ class Vector
   explicit Vector(size_t count, const T& value = T())
       : std::vector<T, Allocator>(count, value) {}
 
-  Vector(const Vector& other)
-      : std::vector<T, Allocator>(other) {}
-
   template <class InputIt>
   Vector(InputIt first, InputIt last)
       : std::vector<T, Allocator>(first, last) {}