v2.6.0

* Updated README * Updated Doxygen comments in cassandra.h to ignore deprecated macros
ewalsh · Mar 9, 2017 · 99b3ab2 · 99b3ab2
1 parent 1369b3b
commit 99b3ab2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -14,8  14,9 @@ Cassandra's native protocol and Cassandra Query Language v3.
 - Mailing List: https://groups.google.com/a/lists.datastax.com/forum/#!forum/cpp-driver-user
 - IRC: [#datastax-drivers on `irc.freenode.net <http://freenode.net>`](http://webchat.freenode.net/?channels=datastax-drivers)
 
-## What's New in 2.5
 ## What's New in 2.5/2.6
 
 - Support for [`duration`]
 - [Speculative execution]
 - [Idempotent statements]
 - [SSL] can be enabled without re-initializing the underlying library (e.g. OpenSSL)
@@ -214,3  215,4 @@ limitations under the License.
 [Reverse DNS]: http://datastax.github.io/cpp-driver/topics/security/ssl/#enabling-cassandra-identity-verification
 [Speculative execution]: http://datastax.github.io/cpp-driver/topics/configuration/#speculative-execution
 [Idempotent statements]: http://datastax.github.io/cpp-driver/topics/configuration/#query-idempotence
 [`duration`]: https://github.com/datastax/cpp-driver/tree/2.6.0/examples/duration/duration.c
diff --git a/include/cassandra.h b/include/cassandra.h
@@ -492,7  492,9 @@ typedef enum CassConsistency_ {
   XX(CASS_CONSISTENCY_LOCAL_SERIAL, "LOCAL_SERIAL") \
   XX(CASS_CONSISTENCY_LOCAL_ONE, "LOCAL_ONE")
 
 /* @cond IGNORE */
 #define CASS_CONSISTENCY_MAP CASS_CONSISTENCY_MAPPING /* Deprecated */
 /* @endcond */
 
 typedef enum CassWriteType_ {
   CASS_WRITE_TYPE_UKNOWN,
@@ -512,7  514,9 @@ typedef enum CassWriteType_ {
   XX(CASS_WRITE_TYPE_BATCH_LOG, "BATCH_LOG") \
   XX(CASS_WRITE_TYPE_CAS, "CAS")
 
 /* @cond IGNORE */
 #define CASS_WRITE_TYPE_MAP CASS_WRITE_TYPE_MAPPING /* Deprecated */
 /* @endcond */
 
 typedef enum CassColumnType_ {
   CASS_COLUMN_TYPE_REGULAR,
@@ -613,7  617,9 @@ typedef enum CassIteratorType_ {
   XX(CASS_LOG_DEBUG, "DEBUG") \
   XX(CASS_LOG_TRACE, "TRACE")
 
 /* @cond IGNORE */
 #define CASS_LOG_LEVEL_MAP CASS_LOG_LEVEL_MAPPING /* Deprecated */
 /* @endcond */
 
 typedef enum CassLogLevel_ {
 #define XX_LOG(log_level, _) log_level,
@@ -698,7  704,9 @@ typedef enum  CassErrorSource_ {
   XX(CASS_ERROR_SOURCE_SSL, CASS_ERROR_SSL_IDENTITY_MISMATCH, 5, "Certificate does not match host or IP address") \
   XX(CASS_ERROR_SOURCE_SSL, CASS_ERROR_SSL_PROTOCOL_ERROR, 6, "Protocol error")
 
 /* @cond IGNORE */
 #define CASS_ERROR_MAP CASS_ERROR_MAPPING /* Deprecated */
 /* @endcond*/
 
 #define CASS_ERROR(source, code) ((source << 24) | code)