src/cctz: Fix warning about anonymous unions (CRAN) (#440)

* src/cctz: Fix warning about anonymous unions (CRAN)

Addresses #438

Used:

find src/ -type f | xargs -I {} sed -i 's/date\.\(m\|j\|n\)/date\.data\.\1/' {}

* Add note to news

Co-authored-by: Jim Hester <[email protected]>

Author: detule

NEWS.md

@@ -1,5 +1,6 @@
 # odbc (development version)
 
+* Fixed warnings about anonymous unions (@detule, #440)
 * Fixed `invalid descriptor` issues when retrieving results from SQL Server +
   Microsoft's ODBC driver, using parametrized queries. (@detule, #414)
 * Fixed null handling in SQL Server / Azure result sets retrieved with

src/cctz/src/time_zone_info.cc

@@ -230,24 +230,24 @@ int64_t TransOffset(bool leap_year, int jan1_weekday,
   int days = 0;
   switch (pt.date.fmt) {
     case PosixTransition::J: {
-      days = pt.date.j.day;
+      days = pt.date.data.j.day;
       if (!leap_year || days < kMonthOffsets[1][TM_MARCH + 1]) days -= 1;
       break;
     }
     case PosixTransition::N: {
-      days = pt.date.n.day;
+      days = pt.date.data.n.day;
       break;
     }
     case PosixTransition::M: {
-      const bool last_week = (pt.date.m.week == 5);
-      days = kMonthOffsets[leap_year][pt.date.m.month + last_week];
+      const bool last_week = (pt.date.data.m.week == 5);
+      days = kMonthOffsets[leap_year][pt.date.data.m.month + last_week];
       const int weekday = (jan1_weekday + days) % DAYSPERWEEK;
       if (last_week) {
         days -=
-            (weekday + DAYSPERWEEK - 1 - pt.date.m.weekday) % DAYSPERWEEK + 1;
+            (weekday + DAYSPERWEEK - 1 - pt.date.data.m.weekday) % DAYSPERWEEK + 1;
       } else {
-        days += (pt.date.m.weekday + DAYSPERWEEK - weekday) % DAYSPERWEEK;
-        days += (pt.date.m.week - 1) * DAYSPERWEEK;
+        days += (pt.date.data.m.weekday + DAYSPERWEEK - weekday) % DAYSPERWEEK;
+        days += (pt.date.data.m.week - 1) * DAYSPERWEEK;
       }
       break;
     }

src/cctz/src/time_zone_posix.cc

@@ -96,23 +96,23 @@ const char* ParseDateTime(const char* p, PosixTransition* res) {
           int weekday = 0;
           if ((p = ParseInt(p + 1, 0, 6, &weekday)) != nullptr) {
             res->date.fmt = PosixTransition::M;
-            res->date.m.month = month;
-            res->date.m.week = week;
-            res->date.m.weekday = weekday;
+            res->date.data.m.month = month;
+            res->date.data.m.week = week;
+            res->date.data.m.weekday = weekday;
           }
         }
       }
     } else if (*p == 'J') {
       int day = 0;
       if ((p = ParseInt(p + 1, 1, 365, &day)) != nullptr) {
         res->date.fmt = PosixTransition::J;
-        res->date.j.day = day;
+        res->date.data.j.day = day;
       }
     } else {
       int day = 0;
       if ((p = ParseInt(p, 0, 365, &day)) != nullptr) {
         res->date.fmt = PosixTransition::N;
-        res->date.j.day = day;
+        res->date.data.j.day = day;
       }
     }
   }

src/cctz/src/time_zone_posix.h

@@ -80,7 +80,7 @@ struct PosixTransition {
         int8_t week;     // week of month [1:5] (5==last)
         int8_t weekday;  // 0==Sun, ..., 6=Sat
       } m;
-    };
+    } data;
   } date;
   struct {
     int offset;  // seconds before/after 00:00:00