Updating minimum Boost version to 1.59.0 and other library versions

Author: Michael Fero

.travis.yml

@@ -16,8 +16,8 @@ env:
     - BOOST_VERSION=1.59.0
     - BOOST_FILE_VERSION=1_59_0
   matrix:
-    - LIBUV_VERSION=0.10.x EXACT_LIBUV_VERSION=0.10.36
-    - LIBUV_VERSION=1.x EXACT_LIBUV_VERSION=1.7.5
+    - LIBUV_VERSION=0.10.x EXACT_LIBUV_VERSION=0.10.37
+    - LIBUV_VERSION=1.x EXACT_LIBUV_VERSION=1.8.0
 install:
   - if [ ! -d "${HOME}/dependencies/libuv-${LIBUV_VERSION}" ]; then
       wget -q http://dist.libuv.org/dist/v${EXACT_LIBUV_VERSION}/libuv-v${EXACT_LIBUV_VERSION}.tar.gz;
@@ -44,7 +44,7 @@ install:
       wget -q http://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_FILE_VERSION}.tar.gz/download -O boost_${BOOST_FILE_VERSION}.tar.gz;
       tar xzf boost_${BOOST_FILE_VERSION}.tar.gz;
       cd boost_${BOOST_FILE_VERSION};
-      ./bootstrap.sh --with-libraries=atomic,chrono,date_time,log,program_options,random,system,thread,test --prefix=${HOME}/dependencies/boost_${BOOST_FILE_VERSION};
+      ./bootstrap.sh --with-libraries=atomic,chrono,system,thread,test --prefix=${HOME}/dependencies/boost_${BOOST_FILE_VERSION};
       ./b2 -j2 install;
       cd - 2&> /dev/null;
     else echo "Using Cached Boost v${BOOST_VERSION}. Dependency does not need to be re-compiled";

cmake/modules/CppDriver.cmake

@@ -88,7 +88,7 @@ endmacro()
 #------------------------
 
 # Minimum supported version of Boost
-set(CASS_MINIMUM_BOOST_VERSION 1.55.0)
+set(CASS_MINIMUM_BOOST_VERSION 1.59.0)
 
 #------------------------
 # CassUseBoost
@@ -138,7 +138,14 @@ macro(CassUseBoost)
   if(CASS_BUILD_UNIT_TESTS OR CASS_BUILD_INTEGRATION_TESTS)
     find_package(Boost ${CASS_MINIMUM_BOOST_VERSION} COMPONENTS chrono system thread unit_test_framework)
     if(NOT Boost_FOUND)
-      message(FATAL_ERROR "Boost [chrono, system, thread, and unit_test_framework] are required to build tests")
+      # Ensure Boost was not found due to minimum version requirement
+      set(CASS_FOUND_BOOST_VERSION "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
+      if((CASS_FOUND_BOOST_VERSION VERSION_GREATER "${CASS_MINIMUM_BOOST_VERSION}")
+        OR (CASS_FOUND_BOOST_VERSION VERSION_EQUAL "${CASS_MINIMUM_BOOST_VERSION}"))
+        message(FATAL_ERROR "Boost [chrono, system, thread, and unit_test_framework] are required to build tests")
+      else()
+        message(FATAL_ERROR "Boost v${CASS_FOUND_BOOST_VERSION} Found: v${CASS_MINIMUM_BOOST_VERSION} or greater required")
+      endif()
     endif()
 
     # Assign Boost include and libraries
@@ -147,15 +154,9 @@ macro(CassUseBoost)
   endif()
 
   # Determine if additional Boost definitions are required for driver/executables
-  set(CASS_FOUND_BOOST_VERSION "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
-  if((CASS_FOUND_BOOST_VERSION VERSION_GREATER "1.56.0") OR (CASS_FOUND_BOOST_VERSION VERSION_EQUAL "1.56.0"))
-    if(NOT WIN32)
-      # Handle explicit initialization warning in atomic/details/casts
-      add_definitions(-Wno-missing-field-initializers)
-    endif()
-  else()
-    # Handle redefinition warning of BOOST_NO_CXX11_RVALUE_REFERENCES
-    add_definitions(-DBOOST_NO_CXX11_RVALUE_REFERENCES)
+  if(NOT WIN32)
+    # Handle explicit initialization warning in atomic/details/casts
+    add_definitions(-Wno-missing-field-initializers)
   endif()
 endmacro()
 

test/integration_tests/src/test_prepared.cpp

@@ -56,50 +56,6 @@ struct AllTypes {
   CassTime time_sample;
 };
 
-// This crashes in Boost 1.57 and the test_utils::CassPreparedPtr version
-// doesn't compile against Boost 1.55 or 1.56
-
-#if BOOST_VERSION < 105700
-// Move emulation wrapper for CassPrepared. This has to be used
-// with boost::container's because they have boost move emulation support.
-class CassPreparedMovable {
-public:
-  CassPreparedMovable(const CassPrepared* prepared = NULL)
-    : prepared_(prepared) {}
-
-  CassPreparedMovable(BOOST_RV_REF(CassPreparedMovable) r)
-    : prepared_(r.prepared_) {
-    r.prepared_ = NULL;
-  }
-
-  CassPreparedMovable(const CassPreparedMovable& r)
-    : prepared_(r.prepared_) {
-  }
-
-  CassPreparedMovable& operator=(BOOST_RV_REF(CassPreparedMovable) r) {
-    if (prepared_ != NULL) {
-      cass_prepared_free(prepared_);
-    }
-    prepared_ = r.prepared_;
-    r.prepared_ = NULL;
-    return *this;
-  }
-
-  ~CassPreparedMovable() {
-    if (prepared_ != NULL) {
-      cass_prepared_free(prepared_);
-    }
-  }
-
-  const CassPrepared* get() const { return prepared_; }
-
-private:
-  BOOST_MOVABLE_BUT_NOT_COPYABLE(CassPreparedMovable)
-
-  const CassPrepared* prepared_;
-};
-#endif
-
 struct PreparedTests : public test_utils::SingleSessionTest {
   static const char* ALL_TYPE_TABLE_NAME;
   std::string columns_;

topics/building/README.md

@@ -21,7 +21,7 @@ dependencies being installed.
 
 ### Test Dependencies
 
-- [boost 1.55+](http://www.boost.org)
+- [boost 1.59+](http://www.boost.org)
 - [libssh2](http://www.libssh2.org) (optional)
 
 ## Linux/OS X
@@ -45,9 +45,9 @@ sudo yum -y install epel-release
 ```bash
 sudo yum install automake cmake gcc-c++ git libtool openssl-devel wget
 pushd /tmp
-wget http://dist.libuv.org/dist/v1.7.5/libuv-v1.7.5.tar.gz
-tar xzf libuv-v1.7.5.tar.gz
-pushd libuv-v1.7.5
+wget http://dist.libuv.org/dist/v1.8.0/libuv-v1.8.0.tar.gz
+tar xzf libuv-v1.8.0.tar.gz
+pushd libuv-v1.8.0
 sh autogen.sh
 ./configure
 sudo make install
@@ -114,7 +114,7 @@ make
 #### Obtaining Test Dependencies
 
 ##### CentOS/RHEL
-CentOS/RHEL does not contain Boost v1.55+ libraries in its repositories; however
+CentOS/RHEL does not contain Boost v1.59+ libraries in its repositories; however
 these can be easily installed from source. Ensure previous version of Boost has
 been removed by executing the command `sudo yum remove boost*` before
 proceeding.
@@ -125,7 +125,7 @@ pushd /tmp
 wget http://sourceforge.net/projects/boost/files/boost/1.59.0/boost_1_59_0.tar.gz/download -O boost_1_59_0.tar.gz
 tar xzf boost_1_59_0.tar.gz
 pushd boost_1_59_0
-./bootstrap.sh --with-libraries=atomic,chrono,date_time,log,program_options,random,regex,system,thread,test
+./bootstrap.sh --with-libraries=atomic,chrono,system,thread,test
 sudo ./b2 cxxflags="-fPIC" install
 popd
 popd
@@ -141,21 +141,19 @@ brew install boost libssh2
 ```
 
 ##### Ubuntu
-
-###### Additional Requirements for Ubuntu 12.04
-Ubuntu 12.04 does not contain Boost v1.55+ C++ libraries in its repositories;
-however it can be obtained from the Boost PPA which can be found
-[here](https://launchpad.net/~boost-latest/+archive/ubuntu/ppa).
-
-```bash
-sudo add-apt-repository ppa:boost-latest/ppa
-sudo apt-get update
-```
-
-##### Install Dependencies
+Ubuntu does not contain Boost v1.59+ libraries in its repositories; however
+these can be easily installed from source.
 
 ```bash
-sudo apt-get install libboost1.55-all-dev libssh2-1-dev
+sudo apt-get install libssh2-1-dev
+pushd /tmp
+wget http://sourceforge.net/projects/boost/files/boost/1.59.0/boost_1_59_0.tar.gz/download -O boost_1_59_0.tar.gz
+tar xzf boost_1_59_0.tar.gz
+pushd boost_1_59_0
+./bootstrap.sh --with-libraries=atomic,chrono,system,thread,test
+sudo ./b2 install
+popd
+popd
 ```
 
 #### Building the Driver with the Tests
@@ -294,7 +292,7 @@ driver dependencies will also be copied (e.g. C:\myproject\dependencies\libs)
 ### Test Dependencies and Building the Tests (_NOT REQUIRED_)
 
 #### Obtaining Test Dependencies
-Boost v1.55+ is the only external dependency that will need to be obtained in
+Boost v1.59+ is the only external dependency that will need to be obtained in
 order to build the unit and integration tests.
 
 To simplify the process; pre-built binaries can be obtained

vc_build.bat

@@ -118,7 +118,7 @@ SET LIBSSH2_BRANCH_TAG_VERSION=libssh2-1.7.0
 SET LIBSSH2_PACKAGE_VERSION=1.7.0
 SET OPENSSL_REPOSITORY_URL=https://github.com/openssl/openssl.git
 SET OPENSSL_DIRECTORY=openssl
-SET OPENSSL_BRANCH_TAG_VERSION=OpenSSL_1_0_2h
+SET OPENSSL_BRANCH_TAG_VERSION=OpenSSL_1_0_2j
 SET OPENSSL_PACKAGE_VERSION=1.0.2h
 SET ZLIB_REPOSITORY_URL=https://github.com/madler/zlib.git
 SET ZLIB_DIRECTORY=zlib