diff options
Diffstat (limited to 'mongo-c-driver-upstream.patch')
| -rw-r--r-- | mongo-c-driver-upstream.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/mongo-c-driver-upstream.patch b/mongo-c-driver-upstream.patch index 421af38..bb8239c 100644 --- a/mongo-c-driver-upstream.patch +++ b/mongo-c-driver-upstream.patch @@ -20,3 +20,34 @@ index fa02960..49bf1cc 100644 # error "Only <mongoc.h> can be included directly." #endif +From d5de834e40e157b34a6a384c5856917eb1b56cdc Mon Sep 17 00:00:00 2001 +From: Hannes Magnusson <bjori@php.net> +Date: Mon, 31 Aug 2015 10:36:38 -0700 +Subject: [PATCH] CDRIVER-820: error: #pragma GCC diagnostic not allowed inside + functions + +And remove the unhelpful (debug) assert that cause two tickets so far +--- + src/mongoc/mongoc-matcher-op.c | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/src/mongoc/mongoc-matcher-op.c b/src/mongoc/mongoc-matcher-op.c +index f098ec6..77f66e2 100644 +--- a/src/mongoc/mongoc-matcher-op.c ++++ b/src/mongoc/mongoc-matcher-op.c +@@ -162,15 +162,6 @@ _mongoc_matcher_op_compare_new (mongoc_matcher_opcode_t opcode, /* IN */ + { + mongoc_matcher_op_t *op; + +-#if defined(__GNUC__) +-# pragma GCC diagnostic push +-# pragma GCC diagnostic ignored "-Wtype-limits" +-#endif +- BSON_ASSERT ((opcode >= MONGOC_MATCHER_OPCODE_EQ) && +- (opcode <= MONGOC_MATCHER_OPCODE_NIN)); +-#if defined(__GNUC__) +-# pragma GCC diagnostic pop +-#endif + BSON_ASSERT (path); + BSON_ASSERT (iter); + |