Update for R CMD check

qinwf · Aug 22, 2017 · 0a46185 · 0a46185
1 parent ba3f8bf
commit 0a46185
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/inst/include/re2/prog.h b/inst/include/re2/prog.h
@@ -140,12 +140,18 @@ class Prog {
 
       int32_t match_id_;    // opcode == kInstMatch
                             //   Match ID to identify this match (for re2::Set).
-
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
+#endif
       struct {              // opcode == kInstByteRange
         uint8_t lo_;        //   byte range is lo_-hi_ inclusive
         uint8_t hi_;        //
         uint8_t foldcase_;  //   convert A-Z to a-z before checking range.
       };
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
       EmptyOp empty_;       // opcode == kInstEmptyWidth
                             //   empty_ is bitwise OR of kEmpty* flags above.

diff --git a/inst/include/re2/regexp.h b/inst/include/re2/regexp.h
@@ -556,7 +556,10 @@ class Regexp {
 
   // Extra space for parse and teardown stacks.
   Regexp* down_;
-
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
+#endif
   // Arguments to operator.  See description of operators above.
   union {
     struct {  // Repeat
@@ -582,6 +585,9 @@ class Regexp {
     int match_id_;  // HaveMatch
     void *the_union_[2];  // as big as any other element, for memset
   };
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
   Regexp(const Regexp&) = delete;
   Regexp& operator=(const Regexp&) = delete;

diff --git a/src/dfa.cc b/src/dfa.cc
@@ -126,6 +126,10 @@ class DFA {
     uint32_t flag_;     // Empty string bitfield flags in effect on the way
                         // into this state, along with kFlagMatch if this
                         // is a matching state.
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
+#endif
 
 // Work around the bug affecting flexible array members in GCC 6.1 and 6.2.
 // (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70932)
@@ -135,6 +139,10 @@ class DFA {
     std::atomic<State*> next_[];    // Outgoing arrows from State,
 #endif
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
                         // one per input byte class
   };