Export of internal Abseil changes.
-- 906c47420646d510edd2479d5542c56f5fa31b65 by CJ Johnson <johnsoncj@google.com>: Import of CCTZ from GitHub. PiperOrigin-RevId: 216573923 -- 74560d4afd2b605909e677c6fc3076049fb3010a by Eric Fiselier <ericwf@google.com>: Avoid -Wformat-pedantic in benchmark. PiperOrigin-RevId: 216523769 -- 9bcc9da8b03e6d1ea43ee78931256c5541cb9686 by Eric Fiselier <ericwf@google.com>: Delete unused CityHash functions. PiperOrigin-RevId: 216464492 -- a42563b394c89fbb4c55cb5a6a5edbf96d271eea by Abseil Team <absl-team@google.com>: Introduce new Abseil interfaces for converting between civil times and absolute times.s Deprecates absl::ConvertDateTime() and absl::FromDateTime(). PiperOrigin-RevId: 216424948 -- 088e11235124267517d7f137854fa5554679c24f by Eric Fiselier <ericwf@google.com>: Remove unneeded break statements in test. PiperOrigin-RevId: 216403321 GitOrigin-RevId: 906c47420646d510edd2479d5542c56f5fa31b65 Change-Id: Idb44420be623e369c66f5a9c92bdc9ab46d3ec92
This commit is contained in:
parent
445998d7ac
commit
f340f773ed
24 changed files with 2675 additions and 2592 deletions
|
@ -68,25 +68,35 @@ namespace cctz {
|
|||
// it would take us to another day, and perhaps week, or even month.
|
||||
struct PosixTransition {
|
||||
enum DateFormat { J, N, M };
|
||||
struct {
|
||||
DateFormat fmt;
|
||||
union {
|
||||
struct {
|
||||
std::int_fast16_t day; // day of non-leap year [1:365]
|
||||
} j;
|
||||
struct {
|
||||
std::int_fast16_t day; // day of year [0:365]
|
||||
} n;
|
||||
struct {
|
||||
std::int_fast8_t month; // month of year [1:12]
|
||||
std::int_fast8_t week; // week of month [1:5] (5==last)
|
||||
std::int_fast8_t weekday; // 0==Sun, ..., 6=Sat
|
||||
} m;
|
||||
|
||||
struct Date {
|
||||
struct NonLeapDay {
|
||||
std::int_fast16_t day; // day of non-leap year [1:365]
|
||||
};
|
||||
} date;
|
||||
struct {
|
||||
struct Day {
|
||||
std::int_fast16_t day; // day of year [0:365]
|
||||
};
|
||||
struct MonthWeekWeekday {
|
||||
std::int_fast8_t month; // month of year [1:12]
|
||||
std::int_fast8_t week; // week of month [1:5] (5==last)
|
||||
std::int_fast8_t weekday; // 0==Sun, ..., 6=Sat
|
||||
};
|
||||
|
||||
DateFormat fmt;
|
||||
|
||||
union {
|
||||
NonLeapDay j;
|
||||
Day n;
|
||||
MonthWeekWeekday m;
|
||||
};
|
||||
};
|
||||
|
||||
struct Time {
|
||||
std::int_fast32_t offset; // seconds before/after 00:00:00
|
||||
} time;
|
||||
};
|
||||
|
||||
Date date;
|
||||
Time time;
|
||||
};
|
||||
|
||||
// The entirety of a POSIX-string specified time-zone rule. The standard
|
||||
|
|
|
@ -26,12 +26,6 @@ namespace cctz = absl::time_internal::cctz;
|
|||
namespace absl {
|
||||
namespace time_internal {
|
||||
|
||||
#if GTEST_USES_SIMPLE_RE
|
||||
extern const char kZoneAbbrRE[] = ".*"; // just punt
|
||||
#else
|
||||
extern const char kZoneAbbrRE[] = "[A-Za-z]{3,4}|[-+][0-9]{2}([0-9]{2})?";
|
||||
#endif
|
||||
|
||||
TimeZone LoadTimeZone(const std::string& name) {
|
||||
TimeZone tz;
|
||||
ABSL_RAW_CHECK(LoadTimeZone(name, &tz), name.c_str());
|
||||
|
|
|
@ -17,35 +17,11 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#include "gmock/gmock.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include "absl/time/time.h"
|
||||
|
||||
// This helper is a macro so that failed expectations show up with the
|
||||
// correct line numbers.
|
||||
//
|
||||
// This is for internal testing of the Base Time library itself. This is not
|
||||
// part of a public API.
|
||||
#define ABSL_INTERNAL_EXPECT_TIME(bd, y, m, d, h, min, s, off, isdst) \
|
||||
do { \
|
||||
EXPECT_EQ(y, bd.year); \
|
||||
EXPECT_EQ(m, bd.month); \
|
||||
EXPECT_EQ(d, bd.day); \
|
||||
EXPECT_EQ(h, bd.hour); \
|
||||
EXPECT_EQ(min, bd.minute); \
|
||||
EXPECT_EQ(s, bd.second); \
|
||||
EXPECT_EQ(off, bd.offset); \
|
||||
EXPECT_EQ(isdst, bd.is_dst); \
|
||||
EXPECT_THAT(bd.zone_abbr, \
|
||||
testing::MatchesRegex(absl::time_internal::kZoneAbbrRE)); \
|
||||
} while (0)
|
||||
|
||||
namespace absl {
|
||||
namespace time_internal {
|
||||
|
||||
// A regular expression that matches all zone abbreviations (%Z).
|
||||
extern const char kZoneAbbrRE[];
|
||||
|
||||
// Loads the named timezone, but dies on any failure.
|
||||
absl::TimeZone LoadTimeZone(const std::string& name);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue