MONGOCRYPT-865 remove mc-check-conversions-private.h (#1124)

Author: kevinAlbs

src/mc-check-conversions-private.h

@@ -16,7 +16,6 @@
 
 #include "mc-fle2-rfds-private.h"
 
-#include "mc-check-conversions-private.h"
 #include "mc-fle-blob-subtype-private.h" // MC_SUBTYPE_FLE2EncryptionPlaceholder
 #include "mongocrypt-private.h"          // CLIENT_ERR
 

src/mc-fle2-rfds.c

@@ -18,7 +18,6 @@
 #include "mc-range-edge-generation-private.h"
 
 #include "mc-array-private.h"
-#include "mc-check-conversions-private.h"
 #include "mc-cmp-private.h"
 #include "mc-range-encoding-private.h"
 #include "mongocrypt-private.h"

src/mc-range-edge-generation.c

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include "mc-check-conversions-private.h"
 #include "mc-cmp-private.h"
 #include "mc-range-encoding-private.h"
 #include "mongocrypt-private.h"

src/mc-range-encoding.c

@@ -16,8 +16,6 @@
 
 #include <bson/bson.h>
 
-#include "mc-check-conversions-private.h"
-
 #include "mc-array-private.h"
 #include "mc-cmp-private.h"
 #include "mc-range-edge-generation-private.h" // mc_count_leading_zeros_u32

src/mc-range-mincover.c

@@ -17,7 +17,6 @@
 #include "mc-fle2-encryption-placeholder-private.h"
 #include "mc-rangeopts-private.h"
 
-#include "mc-check-conversions-private.h"
 #include "mc-cmp-private.h"
 #include "mc-range-edge-generation-private.h" // mc_count_leading_zeros_XX
 #include "mc-range-encoding-private.h"        // mc_getTypeInfoXX

src/mc-rangeopts.c

@@ -32,7 +32,6 @@
 #endif
 #endif
 
-#include "mc-check-conversions-private.h"
 #include "mongocrypt-dll-private.h"
 #include "mongocrypt-private.h" // CLIENT_ERR
 #include "mongocrypt-util-private.h"
@@ -153,7 +152,14 @@ bool mc_iter_document_as_bson(const bson_iter_t *iter, bson_t *bson, mongocrypt_
 
 /* Avoid a conversion warning on glibc for isnan, isinf, and isfinite. Refer:
  * MONGOCRYPT-501. */
-MC_BEGIN_CONVERSION_IGNORE
+#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+// gcc 4.6 added support for "diagnostic push".
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+#elif defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wconversion"
+#endif
 
 bool mc_isnan(double d) {
     return isnan(d);
@@ -167,4 +173,8 @@ bool mc_isfinite(double d) {
     return isfinite(d);
 }
 
-MC_END_CONVERSION_IGNORE
+#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#pragma GCC diagnostic pop
+#elif defined(__clang__)
+#pragma clang diagnostic pop
+#endif

src/mongocrypt-util.c

@@ -16,7 +16,6 @@
 
 #include "test-mongocrypt.h"
 
-#include "mc-check-conversions-private.h"
 #include "mc-optional-private.h"
 #include "mc-range-edge-generation-private.h"
 

test/test-mc-range-edge-generation.c

@@ -15,7 +15,6 @@
  */
 #include "test-mongocrypt.h"
 
-#include "mc-check-conversions-private.h"
 #include "mc-range-encoding-private.h"
 
 #include <float.h> // DBL_MAX

test/test-mc-range-encoding.c

@@ -17,7 +17,6 @@
 #include "test-mongocrypt.h"
 
 #include "mc-array-private.h"
-#include "mc-check-conversions-private.h"
 #include "mc-optional-private.h"
 #include "mc-range-encoding-private.h"
 #include "mc-range-mincover-private.h"