Skip to content

Commit

Permalink
Workaround for pragmas
Browse files Browse the repository at this point in the history
  • Loading branch information
jeroen committed Jul 25, 2018
1 parent 5de398b commit 7c8ce96
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Description: High-performance 'MongoDB' client based on 'libmongoc' and 'jsonlit
Includes support for aggregation, indexing, map-reduce, streaming, encryption,
enterprise authentication. The online user manual provides an overview of the
available methods in the package: <https://jeroen.github.io/mongolite/>.
Version: 1.6
Version: 1.6.9000
Authors@R: c(
person("Jeroen", "Ooms", ,"jeroen@berkeley.edu", role = c("aut", "cre")),
person("MongoDB, Inc", role = "cph", comment = "Bundled mongo-c-driver, see AUTHORS file")
Expand Down
12 changes: 6 additions & 6 deletions src/bson/bson-timegm.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,19 @@
#endif

#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wshift-negative-value"
/*IGNORE*/ #pragma clang diagnostic push
/*IGNORE*/ #pragma clang diagnostic ignored "-Wunknown-pragmas"
/*IGNORE*/ #pragma clang diagnostic push
/*IGNORE*/ #pragma clang diagnostic ignored "-Wshift-negative-value"
#endif

/* The minimum and maximum finite time values. */
static int64_t const time_t_min = INT64_MIN;
static int64_t const time_t_max = INT64_MAX;

#ifdef __clang__
#pragma clang diagnostic pop
#pragma clang diagnostic pop
/*IGNORE*/ #pragma clang diagnostic pop
/*IGNORE*/ #pragma clang diagnostic pop
#endif

#ifndef TZ_MAX_TIMES
Expand Down
6 changes: 3 additions & 3 deletions src/common/common-md5.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,12 @@ bson_md5_process (bson_md5_t *md5, const uint8_t *data)
if (!((data - (const uint8_t *) 0) & 3)) {
/* data are properly aligned */
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcast-align"
/*IGNORE*/ #pragma clang diagnostic push
/*IGNORE*/ #pragma clang diagnostic ignored "-Wcast-align"
#endif
X = (const uint32_t *) data;
#ifdef __clang__
#pragma clang diagnostic pop
/*IGNORE*/ #pragma clang diagnostic pop
#endif
} else {
/* not aligned */
Expand Down

0 comments on commit 7c8ce96

Please sign in to comment.