CDRIVER-366: not is a reserved keyword in C++

Author: bjori

src/mongoc/mongoc-matcher-op-private.h

@@ -108,7 +108,7 @@ union _mongoc_matcher_op_t
    mongoc_matcher_op_compare_t compare;
    mongoc_matcher_op_exists_t exists;
    mongoc_matcher_op_type_t type;
-   mongoc_matcher_op_not_t not;
+   mongoc_matcher_op_not_t not_;
 };
 
 

src/mongoc/mongoc-matcher-op.c

@@ -210,9 +210,9 @@ _mongoc_matcher_op_not_new (const char          *path,  /* IN */
    BSON_ASSERT (child);
 
    op = (mongoc_matcher_op_t *)bson_malloc0 (sizeof *op);
-   op->not.base.opcode = MONGOC_MATCHER_OPCODE_NOT;
-   op->not.path = bson_strdup (path);
-   op->not.child = child;
+   op->not_.base.opcode = MONGOC_MATCHER_OPCODE_NOT;
+   op->not_.path = bson_strdup (path);
+   op->not_.child = child;
 
    return op;
 }
@@ -258,8 +258,8 @@ _mongoc_matcher_op_destroy (mongoc_matcher_op_t *op) /* IN */
          _mongoc_matcher_op_destroy (op->logical.right);
       break;
    case MONGOC_MATCHER_OPCODE_NOT:
-      _mongoc_matcher_op_destroy (op->not.child);
-      bson_free (op->not.path);
+      _mongoc_matcher_op_destroy (op->not_.child);
+      bson_free (op->not_.path);
       break;
    case MONGOC_MATCHER_OPCODE_EXISTS:
       bson_free (op->exists.path);
@@ -369,13 +369,13 @@ _mongoc_matcher_op_type_match (mongoc_matcher_op_type_t *type, /* IN */
  */
 
 static bool
-_mongoc_matcher_op_not_match (mongoc_matcher_op_not_t *not,  /* IN */
+_mongoc_matcher_op_not_match (mongoc_matcher_op_not_t *not_,  /* IN */
                               const bson_t            *bson) /* IN */
 {
-   BSON_ASSERT (not);
+   BSON_ASSERT (not_);
    BSON_ASSERT (bson);
 
-   return !_mongoc_matcher_op_match (not->child, bson);
+   return !_mongoc_matcher_op_match (not_->child, bson);
 }
 
 
@@ -1081,7 +1081,7 @@ _mongoc_matcher_op_match (mongoc_matcher_op_t *op,   /* IN */
    case MONGOC_MATCHER_OPCODE_NOR:
       return _mongoc_matcher_op_logical_match (&op->logical, bson);
    case MONGOC_MATCHER_OPCODE_NOT:
-      return _mongoc_matcher_op_not_match (&op->not, bson);
+      return _mongoc_matcher_op_not_match (&op->not_, bson);
    case MONGOC_MATCHER_OPCODE_EXISTS:
       return _mongoc_matcher_op_exists_match (&op->exists, bson);
    case MONGOC_MATCHER_OPCODE_TYPE:
@@ -1190,9 +1190,9 @@ _mongoc_matcher_op_to_bson (mongoc_matcher_op_t *op,   /* IN */
       bson_append_array_end (bson, &child);
       break;
    case MONGOC_MATCHER_OPCODE_NOT:
-      bson_append_document_begin (bson, op->not.path, -1, &child);
+      bson_append_document_begin (bson, op->not_.path, -1, &child);
       bson_append_document_begin (&child, "$not", 4, &child2);
-      _mongoc_matcher_op_to_bson (op->not.child, &child2);
+      _mongoc_matcher_op_to_bson (op->not_.child, &child2);
       bson_append_document_end (&child, &child2);
       bson_append_document_end (bson, &child);
       break;