CPP-770 Fix header file include guards (__CASS_XXX to DATASTAX_XXX) (#234)

* Fix header include guards
* Move cassconfig.hpp.in to driver_config.hpp.in

Author: mpenick

cpp-driver/.gitignore

@@ -50,7 +50,7 @@ Testing
 Debug
 demo/cassandra_demo
 test/unit_tests/cassandra_test
-src/cassconfig.hpp
+src/driver_config.hpp
 
 # API docs files
 Doxyfile

cpp-driver/cmake/modules/CppDriver.cmake

@@ -998,7 +998,7 @@ endmacro()
 #------------------------
 # CassConfigure
 #
-# Generate cassconfig.hpp from cassconfig.hpp.in
+# Generate driver_config.hpp from driver_config.hpp.in
 #
 # Input: CASS_ROOT_DIR, CASS_SRC_DIR
 #------------------------
@@ -1034,6 +1034,6 @@ macro(CassConfigure)
     check_cxx_source_compiles("int main() { return __builtin_bswap64(42); }" HAVE_BUILTIN_BSWAP64)
   endif()
 
-  # Generate the cassconfig.hpp file
-  configure_file(${CASS_ROOT_DIR}/cassconfig.hpp.in ${CASS_SRC_DIR}/cassconfig.hpp)
+  # Generate the driver_config.hpp file
+  configure_file(${CASS_ROOT_DIR}/driver_config.hpp.in ${CASS_SRC_DIR}/driver_config.hpp)
 endmacro()

cpp-driver/cassconfig.hpp.in cpp-driver/driver_config.hpp.incpp-driver/cassconfig.hpp.in renamed to cpp-driver/driver_config.hpp.in

@@ -1,5 +1,5 @@
-#ifndef __CASSANDRA_CONFIG_HPP_INCLUDED__
-#define __CASSANDRA_CONFIG_HPP_INCLUDED__
+#ifndef DATASTAX_INTERNAL_DRIVER_CONFIG_HPP
+#define DATASTAX_INTERNAL_DRIVER_CONFIG_HPP
 
 #cmakedefine HAVE_OPENSSL
 #cmakedefine HAVE_STD_ATOMIC

cpp-driver/gtests/src/unit/test_token_map_utils.hpp

@@ -14,8 +14,8 @@
   limitations under the License.
 */
 
-#ifndef __CASS_TEST_TOKEN_MAP_UTILS_HPP_INCLUDED__
-#define __CASS_TEST_TOKEN_MAP_UTILS_HPP_INCLUDED__
+#ifndef DATASTAX_TEST_TOKEN_MAP_UTILS_HPP
+#define DATASTAX_TEST_TOKEN_MAP_UTILS_HPP
 
 #include "constants.hpp"
 #include "decoder.hpp"

cpp-driver/packaging/build_deb.sh

@@ -39,7 +39,7 @@ release=1
 dist=$(lsb_release -s -c)
 base="cassandra-cpp-driver-$version"
 archive="$base.tar.gz"
-files="CMakeLists.txt cmake cmake_uninstall.cmake.in cassconfig.hpp.in include src"
+files="CMakeLists.txt cmake cmake_uninstall.cmake.in driver_config.hpp.in include src"
 
 echo "Building version $version"
 

cpp-driver/packaging/build_rpm.sh

@@ -42,7 +42,7 @@ fi
 version=$(header_version "../include/cassandra.h")
 base="cassandra-cpp-driver-$version"
 archive="$base.tar.gz"
-files="CMakeLists.txt cmake cmake_uninstall.cmake.in cassconfig.hpp.in include src README.md LICENSE.txt"
+files="CMakeLists.txt cmake cmake_uninstall.cmake.in driver_config.hpp.in include src README.md LICENSE.txt"
 
 echo "Building version $version"
 

cpp-driver/src/abstract_data.hpp

@@ -14,8 +14,8 @@
   limitations under the License.
 */
 
-#ifndef __CASS_ABSTRACT_DATA_HPP_INCLUDED__
-#define __CASS_ABSTRACT_DATA_HPP_INCLUDED__
+#ifndef DATASTAX_INTERNAL_ABSTRACT_DATA_HPP
+#define DATASTAX_INTERNAL_ABSTRACT_DATA_HPP
 
 #include "allocated.hpp"
 #include "buffer.hpp"

cpp-driver/src/address.hpp

@@ -14,8 +14,8 @@
   limitations under the License.
 */
 
-#ifndef __CASS_ADDRESS_HPP_INCLUDED__
-#define __CASS_ADDRESS_HPP_INCLUDED__
+#ifndef DATASTAX_INTERNAL_ADDRESS_HPP
+#define DATASTAX_INTERNAL_ADDRESS_HPP
 
 #include "allocated.hpp"
 #include "hash.hpp"

cpp-driver/src/aligned_storage.hpp

@@ -14,8 +14,8 @@
   limitations under the License.
 */
 
-#ifndef __CASS_ALIGNED_STORAGE_HPP_INCLUDED__
-#define __CASS_ALIGNED_STORAGE_HPP_INCLUDED__
+#ifndef DATASTAX_INTERNAL_ALIGNED_STORAGE_HPP
+#define DATASTAX_INTERNAL_ALIGNED_STORAGE_HPP
 
 #include <stddef.h>
 

cpp-driver/src/allocated.hpp

@@ -14,8 +14,8 @@
   limitations under the License.
 */
 
-#ifndef __CASS_ALLOCATED_HPP_INCLUDED__
-#define __CASS_ALLOCATED_HPP_INCLUDED__
+#ifndef DATASTAX_INTERNAL_ALLOCATED_HPP
+#define DATASTAX_INTERNAL_ALLOCATED_HPP
 
 #include <cstddef>