Added "CPP" to the driver version macro's name

Author: Michael Penick

ext/php_cassandra.h

@@ -100,11 +100,11 @@ void throw_invalid_argument(zval* object,
 
 #define ASSERT_SUCCESS_VALUE(rc, value) ASSERT_SUCCESS_BLOCK(rc, return value;)
 
-#define DRIVER_VERSION(major, minor, patch) \
+#define CPP_DRIVER_VERSION(major, minor, patch) \
   (((major) << 16) + ((minor) << 8) + (patch))
 
-#define CURRENT_DRIVER_VERSION \
-  DRIVER_VERSION(CASS_VERSION_MAJOR, CASS_VERSION_MINOR, CASS_VERSION_PATCH)
+#define CURRENT_CPP_DRIVER_VERSION \
+  CPP_DRIVER_VERSION(CASS_VERSION_MAJOR, CASS_VERSION_MINOR, CASS_VERSION_PATCH)
 
 #include "php_cassandra_types.h"
 

ext/php_cassandra_types.h

@@ -260,7 +260,7 @@ typedef struct {
   cassandra_ref* schema;
 } cassandra_schema;
 
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
 typedef const CassKeyspaceMeta cassandra_keyspace_meta;
 #else
 typedef const CassSchemaMeta cassandra_keyspace_meta;
@@ -272,7 +272,7 @@ typedef struct {
   cassandra_keyspace_meta* meta;
 } cassandra_keyspace;
 
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
 typedef const CassTableMeta cassandra_table_meta;
 #else
 typedef const CassSchemaMeta cassandra_table_meta;
@@ -284,7 +284,7 @@ typedef struct {
   cassandra_table_meta* meta;
 } cassandra_table;
 
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
 typedef const CassColumnMeta cassandra_column_meta;
 #else
 typedef const CassSchemaMeta cassandra_column_meta;

ext/src/Cassandra/DefaultColumn.c

@@ -50,7 +50,7 @@ PHP_METHOD(DefaultColumn, isStatic)
   const char*       str;
   size_t            str_len;
 
-#if CURRENT_DRIVER_VERSION < DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION < CPP_DRIVER_VERSION(2, 2, 0)
   const CassSchemaMetaField* field;
 #endif
 
@@ -60,7 +60,7 @@ PHP_METHOD(DefaultColumn, isStatic)
 
   self  = (cassandra_column*) zend_object_store_get_object(getThis() TSRMLS_CC);
 
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
   value = cass_column_meta_field_by_name(self->meta, "type");
 #else
   field = cass_schema_meta_get_field(self->meta, "type");

ext/src/Cassandra/DefaultKeyspace.c

@@ -73,7 +73,7 @@ PHP_METHOD(DefaultKeyspace, table)
   }
 
   self = (cassandra_keyspace*) zend_object_store_get_object(getThis() TSRMLS_CC);
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
   meta = cass_keyspace_meta_table_by_name(self->meta, name);
 #else
   meta = cass_schema_meta_get_entry(self->meta, name);
@@ -97,7 +97,7 @@ PHP_METHOD(DefaultKeyspace, tables)
     return;
 
   self     = (cassandra_keyspace*) zend_object_store_get_object(getThis() TSRMLS_CC);
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
   iterator = cass_iterator_tables_from_keyspace_meta(self->meta);
 #else
   iterator = cass_iterator_from_schema_meta(self->meta);
@@ -112,11 +112,11 @@ PHP_METHOD(DefaultKeyspace, tables)
     zval*                 zend_table;
     cassandra_table*      table;
 
-#if CURRENT_DRIVER_VERSION < DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION < CPP_DRIVER_VERSION(2, 2, 0)
     const CassSchemaMetaField* field;
 #endif
 
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
     meta = cass_iterator_get_table_meta(iterator);
     value = cass_table_meta_field_by_name(meta, "columnfamily_name");
 #else

ext/src/Cassandra/DefaultSchema.c

@@ -16,7 +16,7 @@ PHP_METHOD(DefaultSchema, keyspace)
   }
 
   self = (cassandra_schema*) zend_object_store_get_object(getThis() TSRMLS_CC);
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
   meta = cass_schema_meta_keyspace_by_name_n((CassSchemaMeta*) self->schema->data, name, name_len);
 #else
   meta = cass_schema_get_keyspace_n((CassSchema*) self->schema->data, name, name_len);
@@ -41,7 +41,7 @@ PHP_METHOD(DefaultSchema, keyspaces)
     return;
 
   self     = (cassandra_schema*) zend_object_store_get_object(getThis() TSRMLS_CC);
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
   iterator = cass_iterator_keyspaces_from_schema_meta((CassSchemaMeta*) self->schema->data);
 #else
   iterator = cass_iterator_from_schema((CassSchema*) self->schema->data);
@@ -56,11 +56,11 @@ PHP_METHOD(DefaultSchema, keyspaces)
     zval*                    zend_keyspace;
     cassandra_keyspace*      keyspace;
 
-#if CURRENT_DRIVER_VERSION < DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION < CPP_DRIVER_VERSION(2, 2, 0)
     const CassSchemaMetaField* field;
 #endif
 
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
     meta = cass_iterator_get_keyspace_meta(iterator);
     value = cass_keyspace_meta_field_by_name(meta, "keyspace_name");
 #else

ext/src/Cassandra/DefaultSession.c

@@ -685,7 +685,7 @@ PHP_METHOD(DefaultSession, closeAsync)
 static void
 free_schema(void* schema)
 {
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
   cass_schema_meta_free((CassSchemaMeta*) schema);
 #else
   cass_schema_free((CassSchema*) schema);
@@ -704,7 +704,7 @@ PHP_METHOD(DefaultSession, schema)
   object_init_ex(return_value, cassandra_default_schema_ce);
   schema = (cassandra_schema*) zend_object_store_get_object(return_value TSRMLS_CC);
 
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
   schema->schema = php_cassandra_new_ref((void*) cass_session_get_schema_meta(self->session),
                                          free_schema);
 #else

ext/src/Cassandra/DefaultTable.c

@@ -209,15 +209,15 @@ php_cassandra_create_column(cassandra_ref*         schema,
   zval*             zcolumn;
   cassandra_column* column;
 
-#if CURRENT_DRIVER_VERSION < DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION < CPP_DRIVER_VERSION(2, 2, 0)
   const CassSchemaMetaField* field;
 #endif
   const CassValue*           value;
 
   const char* validator;
   size_t      validator_length;
 
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
   value = cass_column_meta_field_by_name(meta, "validator");
 #else
   field = cass_schema_meta_get_field(meta, "validator");
@@ -264,7 +264,7 @@ PHP_METHOD(DefaultTable, column)
   }
 
   self     = (cassandra_table*) zend_object_store_get_object(getThis() TSRMLS_CC);
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
   meta = cass_table_meta_column_by_name(self->meta, name);
 #else
   meta = cass_schema_meta_get_entry(self->meta, name);
@@ -292,7 +292,7 @@ PHP_METHOD(DefaultTable, columns)
     return;
 
   self     = (cassandra_table*) zend_object_store_get_object(getThis() TSRMLS_CC);
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
   iterator = cass_iterator_columns_from_table_meta(self->meta);
 #else
   iterator = cass_iterator_from_schema_meta(self->meta);
@@ -304,7 +304,7 @@ PHP_METHOD(DefaultTable, columns)
     zval*                  zcolumn;
     cassandra_column*      column;
 
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
     meta    = cass_iterator_get_column_meta(iterator);
 #else
     meta    = cass_iterator_get_schema_meta(iterator);

ext/util/result.c

@@ -233,7 +233,7 @@ php_cassandra_value(const CassValue* value, CassValueType type, zval** out TSRML
   return SUCCESS;
 }
 
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
 int
 php_cassandra_get_keyspace_field(const CassKeyspaceMeta* metadata, const char* field_name, zval** out TSRMLS_DC)
 {

ext/util/result.h

@@ -1,7 +1,7 @@
 #ifndef PHP_CASSANDRA_RESULT_H
 #define PHP_CASSANDRA_RESULT_H
 
-#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
+#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
 int php_cassandra_get_keyspace_field(const CassKeyspaceMeta* metadata, const char* field_name, zval** out TSRMLS_DC);
 int php_cassandra_get_table_field(const CassTableMeta* metadata, const char* field_name, zval** out TSRMLS_DC);
 int php_cassandra_get_column_field(const CassColumnMeta* metadata, const char* field_name, zval** out TSRMLS_DC);