From bb111df04c516362eb3fb5571bcbf57913d4264c Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@mongodb.com>
Date: Mon, 21 Jul 2014 20:51:20 +0000
Subject: [PATCH] Fix constant generator & regenerate

---
 docs/api/MongoDB/Query.php   | 34 +++++++++++++++++-----------------
 src/MongoDB/Query.c          | 16 ++++++++--------
 src/MongoDB/ReadPreference.c | 10 +++++-----
 src/MongoDB/WriteConcern.c   |  2 +-
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/docs/api/MongoDB/Query.php b/docs/api/MongoDB/Query.php
index 783c5e24..ea711b8c 100644
--- a/docs/api/MongoDB/Query.php
+++ b/docs/api/MongoDB/Query.php
@@ -1,14 +1,14 @@
 <?php
-
 namespace MongoDB;
-define("FLAG_NONE", "MONGOC_QUERY_NONE");
-define("FLAG_TAILABLE_CURSOR", MONGOC_QUERY_TAILABLE_CURSOR);
-define("FLAG_SLAVE_OK", MONGOC_QUERY_SLAVE_OK);
-define("FLAG_OPLOG_REPLAY", MONGOC_QUERY_OPLOG_REPLAY);
-define("FLAG_NO_CURSOR_TIMEOUT", MONGOC_QUERY_NO_CURSOR_TIMEOUT);
-define("FLAG_AWAIT_DATA", MONGOC_QUERY_AWAIT_DATA);
-define("FLAG_EXHAUST", MONGOC_QUERY_EXHAUST);
-define("FLAG_PARTIAL", MONGOC_QUERY_PARTIAL);
+
+define("MONGOC_QUERY_NONE", "MONGOC_QUERY_NONE");
+define("MONGOC_QUERY_TAILABLE_CURSOR", "MONGOC_QUERY_TAILABLE_CURSOR");
+define("MONGOC_QUERY_SLAVE_OK", "MONGOC_QUERY_SLAVE_OK");
+define("MONGOC_QUERY_OPLOG_REPLAY", "MONGOC_QUERY_OPLOG_REPLAY");
+define("MONGOC_QUERY_NO_CURSOR_TIMEOUT", "MONGOC_QUERY_NO_CURSOR_TIMEOUT");
+define("MONGOC_QUERY_AWAIT_DATA", "MONGOC_QUERY_AWAIT_DATA");
+define("MONGOC_QUERY_EXHAUST", "MONGOC_QUERY_EXHAUST");
+define("MONGOC_QUERY_PARTIAL", "MONGOC_QUERY_PARTIAL");
 
 /**
  * Value object corresponding to a wire protocol OP_QUERY message.
@@ -21,14 +21,14 @@ define("FLAG_PARTIAL", MONGOC_QUERY_PARTIAL);
 final class Query
 {
     // See: http://docs.mongodb.org/meta-driver/latest/legacy/mongodb-wire-protocol/#op-query
-    const FLAG_NONE              = FLAG_NONE;
-    const FLAG_TAILABLE_CURSOR   = FLAG_TAILABLE_CURSOR;
-    const FLAG_SLAVE_OK          = FLAG_SLAVE_OK;
-    const FLAG_OPLOG_REPLAY      = FLAG_OPLOG_REPLAY;
-    const FLAG_NO_CURSOR_TIMEOUT = FLAG_NO_CURSOR_TIMEOUT;
-    const FLAG_AWAIT_DATA        = FLAG_AWAIT_DATA;
-    const FLAG_EXHAUST           = FLAG_EXHAUST;
-    const FLAG_PARTIAL           = FLAG_PARTIAL;
+    const FLAG_NONE              = MONGOC_QUERY_NONE;
+    const FLAG_TAILABLE_CURSOR   = MONGOC_QUERY_TAILABLE_CURSOR;
+    const FLAG_SLAVE_OK          = MONGOC_QUERY_SLAVE_OK;
+    const FLAG_OPLOG_REPLAY      = MONGOC_QUERY_OPLOG_REPLAY;
+    const FLAG_NO_CURSOR_TIMEOUT = MONGOC_QUERY_NO_CURSOR_TIMEOUT;
+    const FLAG_AWAIT_DATA        = MONGOC_QUERY_AWAIT_DATA;
+    const FLAG_EXHAUST           = MONGOC_QUERY_EXHAUST;
+    const FLAG_PARTIAL           = MONGOC_QUERY_PARTIAL;
 
     private $query;
     private $selector;
diff --git a/src/MongoDB/Query.c b/src/MongoDB/Query.c
index a1144ad2..8f36fef5 100644
--- a/src/MongoDB/Query.c
+++ b/src/MongoDB/Query.c
@@ -137,14 +137,14 @@ PHP_MINIT_FUNCTION(Query)
 	php_phongo_query_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_query_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
 
-    zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_NONE"), MONGOC_QUERY_NONE TSRMLS_CC);
-    zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_TAILABLE_CURSOR"), MONGOC_QUERY_TAILABLE_CURSOR TSRMLS_CC);
-    zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_SLAVE_OK"), MONGOC_QUERY_SLAVE_OK TSRMLS_CC);
-    zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_OPLOG_REPLAY"), MONGOC_QUERY_OPLOG_REPLAY TSRMLS_CC);
-    zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_NO_CURSOR_TIMEOUT"), MONGOC_QUERY_NO_CURSOR_TIMEOUT TSRMLS_CC);
-    zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_AWAIT_DATA"), MONGOC_QUERY_AWAIT_DATA TSRMLS_CC);
-    zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_EXHAUST"), MONGOC_QUERY_EXHAUST TSRMLS_CC);
-    zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_PARTIAL"), MONGOC_QUERY_PARTIAL TSRMLS_CC);
+	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_NONE"), MONGOC_QUERY_NONE TSRMLS_CC);
+	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_TAILABLE_CURSOR"), MONGOC_QUERY_TAILABLE_CURSOR TSRMLS_CC);
+	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_SLAVE_OK"), MONGOC_QUERY_SLAVE_OK TSRMLS_CC);
+	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_OPLOG_REPLAY"), MONGOC_QUERY_OPLOG_REPLAY TSRMLS_CC);
+	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_NO_CURSOR_TIMEOUT"), MONGOC_QUERY_NO_CURSOR_TIMEOUT TSRMLS_CC);
+	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_AWAIT_DATA"), MONGOC_QUERY_AWAIT_DATA TSRMLS_CC);
+	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_EXHAUST"), MONGOC_QUERY_EXHAUST TSRMLS_CC);
+	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_PARTIAL"), MONGOC_QUERY_PARTIAL TSRMLS_CC);
 
 	return SUCCESS;
 }
diff --git a/src/MongoDB/ReadPreference.c b/src/MongoDB/ReadPreference.c
index f023bea2..cbcaef97 100644
--- a/src/MongoDB/ReadPreference.c
+++ b/src/MongoDB/ReadPreference.c
@@ -148,11 +148,11 @@ PHP_MINIT_FUNCTION(ReadPreference)
 	php_phongo_readpreference_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_readpreference_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
 
-	zend_declare_class_constant_string(php_phongo_readpreference_ce, ZEND_STRL("RP_PRIMARY"), "primary" TSRMLS_CC);
-	zend_declare_class_constant_string(php_phongo_readpreference_ce, ZEND_STRL("RP_PRIMARY_PREFERRED"), "primaryPreferred" TSRMLS_CC);
-	zend_declare_class_constant_string(php_phongo_readpreference_ce, ZEND_STRL("RP_SECONDARY"), "secondary" TSRMLS_CC);
-	zend_declare_class_constant_string(php_phongo_readpreference_ce, ZEND_STRL("RP_SECONDARY_PREFERRED"), "secondaryPreferred" TSRMLS_CC);
-	zend_declare_class_constant_string(php_phongo_readpreference_ce, ZEND_STRL("RP_NEAREST"), "nearest" TSRMLS_CC);
+	zend_declare_class_constant_long(php_phongo_readpreference_ce, ZEND_STRL("RP_PRIMARY"), MONGOC_READ_PRIMARY TSRMLS_CC);
+	zend_declare_class_constant_long(php_phongo_readpreference_ce, ZEND_STRL("RP_PRIMARY_PREFERRED"), MONGOC_READ_SECONDARY TSRMLS_CC);
+	zend_declare_class_constant_long(php_phongo_readpreference_ce, ZEND_STRL("RP_SECONDARY"), MONGOC_READ_PRIMARY_PREFERRED TSRMLS_CC);
+	zend_declare_class_constant_long(php_phongo_readpreference_ce, ZEND_STRL("RP_SECONDARY_PREFERRED"), MONGOC_READ_SECONDARY_PREFERRED TSRMLS_CC);
+	zend_declare_class_constant_long(php_phongo_readpreference_ce, ZEND_STRL("RP_NEAREST"), MONGOC_READ_NEAREST TSRMLS_CC);
 
 	return SUCCESS;
 }
diff --git a/src/MongoDB/WriteConcern.c b/src/MongoDB/WriteConcern.c
index 65b613d3..4ca36b8d 100644
--- a/src/MongoDB/WriteConcern.c
+++ b/src/MongoDB/WriteConcern.c
@@ -45,7 +45,7 @@
 PHONGO_API zend_class_entry *php_phongo_writeconcern_ce;
 
 /* {{{ proto MongoDB\WriteConcern WriteConcern::__construct(integer|string $w[, integer $wtimeout[, array $options = array()]])
-   Constructs a new ReadPreference */
+   Constructs a new WriteConcern */
 PHP_METHOD(WriteConcern, __construct)
 {
 	php_phongo_writeconcern_t *intern;