Export of internal Abseil changes.
-- 4a21ad4ffa957d28b770de8717289fab7410f567 by Gennadiy Rozental <rogeeff@google.com>: Internal cleanup PiperOrigin-RevId: 252366381 -- b6b0f25439549c54f1537a16625be1fecd3c7d8c by Xiaoyi Zhang <zhangxy@google.com>: Fix C4245 compiler warning of visual studio. This allows using abseil headers in code requiring strict warning settings. This is an import of https://github.com/abseil/abseil-cpp/pull/321. PiperOrigin-RevId: 252101240 -- 0543b7861b658a5a665298e1d868e29968ff7b27 by CJ Johnson <johnsoncj@google.com>: Adds new benchmarks for the constructors of InlinedVector PiperOrigin-RevId: 251905349 -- c65a08507917e9f8f6450b8beb235fe1426d7954 by CJ Johnson <johnsoncj@google.com>: Updates the InlinedVector BatchedBenchmark abstractions to 1) provide the index of the instance back to the prepare and test functions so that callers may perform extra work on local state with a unique per-instance ID and 2) reduce the number of manually written calls to BENCHMARK_TEMPLATE. PiperOrigin-RevId: 251895546 -- 99a1ae2d786b80096172f6e018711e15c0c750b9 by Samuel Benzaquen <sbenza@google.com>: Fix ambiguous construction problem in absl::variant<> to make in line with std::variant. ImaginaryFun is hiding duplicate objects instead of causing ambiguity. Add a second unique argument to make sure all overloads exist in the final overload set. PiperOrigin-RevId: 251860694 -- b54d0a12673be6ebb6e77e24a556ce9b758b3a7e by Abseil Team <absl-team@google.com>: Import of CCTZ from GitHub. PiperOrigin-RevId: 251739183 -- f51b115e0dc3fc9a9c9c20b33a1f27027a700d48 by Abseil Team <absl-team@google.com>: Import of CCTZ from GitHub. PiperOrigin-RevId: 251686812 -- 30e868049282dc6a6fc77d923ca7d2a5d35a1658 by Xiaoyi Zhang <zhangxy@google.com>: Import of CCTZ from GitHub. PiperOrigin-RevId: 251652119 GitOrigin-RevId: 4a21ad4ffa957d28b770de8717289fab7410f567 Change-Id: I7171cb613793fa90e0eb0143b65ec8264a2a84db
This commit is contained in:
parent
0238ab0a83
commit
361cb8a9db
10 changed files with 184 additions and 80 deletions
|
@ -379,6 +379,10 @@ constexpr size_t kLargeSize = kInlinedCapacity * 2;
|
||||||
constexpr size_t kSmallSize = kInlinedCapacity / 2;
|
constexpr size_t kSmallSize = kInlinedCapacity / 2;
|
||||||
constexpr size_t kBatchSize = 100;
|
constexpr size_t kBatchSize = 100;
|
||||||
|
|
||||||
|
#define ABSL_INTERNAL_BENCHMARK_ONE_SIZE(BM_FunctionTemplate, T) \
|
||||||
|
BENCHMARK_TEMPLATE(BM_FunctionTemplate, T, kLargeSize); \
|
||||||
|
BENCHMARK_TEMPLATE(BM_FunctionTemplate, T, kSmallSize)
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
using InlVec = absl::InlinedVector<T, kInlinedCapacity>;
|
using InlVec = absl::InlinedVector<T, kInlinedCapacity>;
|
||||||
|
|
||||||
|
@ -420,29 +424,115 @@ void BatchedBenchmark(benchmark::State& state, PrepareVecFn prepare_vec,
|
||||||
while (state.KeepRunningBatch(kBatchSize)) {
|
while (state.KeepRunningBatch(kBatchSize)) {
|
||||||
// Prepare batch
|
// Prepare batch
|
||||||
state.PauseTiming();
|
state.PauseTiming();
|
||||||
for (auto& vec : vector_batch) {
|
for (size_t i = 0; i < kBatchSize; ++i) {
|
||||||
prepare_vec(&vec);
|
prepare_vec(vector_batch.data() + i, i);
|
||||||
}
|
}
|
||||||
benchmark::DoNotOptimize(vector_batch);
|
benchmark::DoNotOptimize(vector_batch);
|
||||||
state.ResumeTiming();
|
state.ResumeTiming();
|
||||||
|
|
||||||
// Test batch
|
// Test batch
|
||||||
for (auto& vec : vector_batch) {
|
for (size_t i = 0; i < kBatchSize; ++i) {
|
||||||
test_vec(&vec);
|
test_vec(vector_batch.data() + i, i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <typename T, size_t ToSize>
|
||||||
|
void BM_ConstructFromSize(benchmark::State& state) {
|
||||||
|
using VecT = InlVec<T>;
|
||||||
|
auto size = ToSize;
|
||||||
|
BatchedBenchmark<T>(
|
||||||
|
state,
|
||||||
|
/* prepare_vec = */ [](InlVec<T>* vec, size_t) { vec->~VecT(); },
|
||||||
|
/* test_vec = */
|
||||||
|
[&](void* ptr, size_t) {
|
||||||
|
benchmark::DoNotOptimize(size);
|
||||||
|
::new (ptr) VecT(size);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
ABSL_INTERNAL_BENCHMARK_ONE_SIZE(BM_ConstructFromSize, TrivialType);
|
||||||
|
ABSL_INTERNAL_BENCHMARK_ONE_SIZE(BM_ConstructFromSize, NontrivialType);
|
||||||
|
|
||||||
|
template <typename T, size_t ToSize>
|
||||||
|
void BM_ConstructFromSizeRef(benchmark::State& state) {
|
||||||
|
using VecT = InlVec<T>;
|
||||||
|
auto size = ToSize;
|
||||||
|
auto ref = T();
|
||||||
|
BatchedBenchmark<T>(
|
||||||
|
state,
|
||||||
|
/* prepare_vec = */ [](InlVec<T>* vec, size_t) { vec->~VecT(); },
|
||||||
|
/* test_vec = */
|
||||||
|
[&](void* ptr, size_t) {
|
||||||
|
benchmark::DoNotOptimize(size);
|
||||||
|
benchmark::DoNotOptimize(ref);
|
||||||
|
::new (ptr) VecT(size, ref);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
ABSL_INTERNAL_BENCHMARK_ONE_SIZE(BM_ConstructFromSizeRef, TrivialType);
|
||||||
|
ABSL_INTERNAL_BENCHMARK_ONE_SIZE(BM_ConstructFromSizeRef, NontrivialType);
|
||||||
|
|
||||||
|
template <typename T, size_t ToSize>
|
||||||
|
void BM_ConstructFromRange(benchmark::State& state) {
|
||||||
|
using VecT = InlVec<T>;
|
||||||
|
std::array<T, ToSize> arr{};
|
||||||
|
BatchedBenchmark<T>(
|
||||||
|
state,
|
||||||
|
/* prepare_vec = */ [](InlVec<T>* vec, size_t) { vec->~VecT(); },
|
||||||
|
/* test_vec = */
|
||||||
|
[&](void* ptr, size_t) {
|
||||||
|
benchmark::DoNotOptimize(arr);
|
||||||
|
::new (ptr) VecT(arr.begin(), arr.end());
|
||||||
|
});
|
||||||
|
}
|
||||||
|
ABSL_INTERNAL_BENCHMARK_ONE_SIZE(BM_ConstructFromRange, TrivialType);
|
||||||
|
ABSL_INTERNAL_BENCHMARK_ONE_SIZE(BM_ConstructFromRange, NontrivialType);
|
||||||
|
|
||||||
|
template <typename T, size_t ToSize>
|
||||||
|
void BM_ConstructFromCopy(benchmark::State& state) {
|
||||||
|
using VecT = InlVec<T>;
|
||||||
|
VecT other_vec(ToSize);
|
||||||
|
BatchedBenchmark<T>(
|
||||||
|
state,
|
||||||
|
/* prepare_vec = */
|
||||||
|
[](InlVec<T>* vec, size_t) { vec->~VecT(); },
|
||||||
|
/* test_vec = */
|
||||||
|
[&](void* ptr, size_t) {
|
||||||
|
benchmark::DoNotOptimize(other_vec);
|
||||||
|
::new (ptr) VecT(other_vec);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
ABSL_INTERNAL_BENCHMARK_ONE_SIZE(BM_ConstructFromCopy, TrivialType);
|
||||||
|
ABSL_INTERNAL_BENCHMARK_ONE_SIZE(BM_ConstructFromCopy, NontrivialType);
|
||||||
|
|
||||||
|
template <typename T, size_t ToSize>
|
||||||
|
void BM_ConstructFromMove(benchmark::State& state) {
|
||||||
|
using VecT = InlVec<T>;
|
||||||
|
std::array<VecT, kBatchSize> vector_batch{};
|
||||||
|
BatchedBenchmark<T>(
|
||||||
|
state,
|
||||||
|
/* prepare_vec = */
|
||||||
|
[&](InlVec<T>* vec, size_t i) {
|
||||||
|
vector_batch[i].clear();
|
||||||
|
vector_batch[i].resize(ToSize);
|
||||||
|
vec->~VecT();
|
||||||
|
},
|
||||||
|
/* test_vec = */
|
||||||
|
[&](void* ptr, size_t i) {
|
||||||
|
benchmark::DoNotOptimize(vector_batch[i]);
|
||||||
|
::new (ptr) VecT(std::move(vector_batch[i]));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
ABSL_INTERNAL_BENCHMARK_ONE_SIZE(BM_ConstructFromMove, TrivialType);
|
||||||
|
ABSL_INTERNAL_BENCHMARK_ONE_SIZE(BM_ConstructFromMove, NontrivialType);
|
||||||
|
|
||||||
template <typename T, size_t FromSize>
|
template <typename T, size_t FromSize>
|
||||||
void BM_Clear(benchmark::State& state) {
|
void BM_Clear(benchmark::State& state) {
|
||||||
BatchedBenchmark<T>(
|
BatchedBenchmark<T>(
|
||||||
state,
|
state,
|
||||||
/* prepare_vec = */ [](InlVec<T>* vec) { vec->resize(FromSize); },
|
/* prepare_vec = */ [](InlVec<T>* vec, size_t) { vec->resize(FromSize); },
|
||||||
/* test_vec = */ [](InlVec<T>* vec) { vec->clear(); });
|
/* test_vec = */ [](InlVec<T>* vec, size_t) { vec->clear(); });
|
||||||
}
|
}
|
||||||
BENCHMARK_TEMPLATE(BM_Clear, TrivialType, kLargeSize);
|
ABSL_INTERNAL_BENCHMARK_ONE_SIZE(BM_Clear, TrivialType);
|
||||||
BENCHMARK_TEMPLATE(BM_Clear, TrivialType, kSmallSize);
|
ABSL_INTERNAL_BENCHMARK_ONE_SIZE(BM_Clear, NontrivialType);
|
||||||
BENCHMARK_TEMPLATE(BM_Clear, NontrivialType, kLargeSize);
|
|
||||||
BENCHMARK_TEMPLATE(BM_Clear, NontrivialType, kSmallSize);
|
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
|
@ -56,7 +56,7 @@ class Flag {
|
||||||
// forward declared types.
|
// forward declared types.
|
||||||
// auto IsCopyConstructible(const T& v) -> decltype(T(v));
|
// auto IsCopyConstructible(const T& v) -> decltype(T(v));
|
||||||
// auto HasAbslParseFlag(absl::string_view in, T* dst, std::string* err)
|
// auto HasAbslParseFlag(absl::string_view in, T* dst, std::string* err)
|
||||||
// -> decltype(AbslParseFlag(in, dst, GlobalStringADLGuard(err)));
|
// -> decltype(AbslParseFlag(in, dst, err));
|
||||||
// auto HasAbslUnparseFlag(const T& v) -> decltype(AbslUnparseFlag(v));
|
// auto HasAbslUnparseFlag(const T& v) -> decltype(AbslUnparseFlag(v));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -185,18 +185,11 @@ bool AbslParseFlag(absl::string_view, double*, std::string*);
|
||||||
bool AbslParseFlag(absl::string_view, std::string*, std::string*);
|
bool AbslParseFlag(absl::string_view, std::string*, std::string*);
|
||||||
bool AbslParseFlag(absl::string_view, std::vector<std::string>*, std::string*);
|
bool AbslParseFlag(absl::string_view, std::vector<std::string>*, std::string*);
|
||||||
|
|
||||||
struct GlobalStringADLGuard {
|
|
||||||
explicit GlobalStringADLGuard(std::string* p) : ptr(p) {}
|
|
||||||
operator std::string*() { return ptr; } // NOLINT
|
|
||||||
std::string* ptr;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
bool InvokeParseFlag(absl::string_view input, T* dst, std::string* err) {
|
bool InvokeParseFlag(absl::string_view input, T* dst, std::string* err) {
|
||||||
// Comment on next line provides a good compiler error message if T
|
// Comment on next line provides a good compiler error message if T
|
||||||
// does not have AbslParseFlag(absl::string_view, T*, std::string*).
|
// does not have AbslParseFlag(absl::string_view, T*, std::string*).
|
||||||
return AbslParseFlag( // Is T missing AbslParseFlag?
|
return AbslParseFlag(input, dst, err); // Is T missing AbslParseFlag?
|
||||||
input, dst, GlobalStringADLGuard(err));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Strings and std:: containers do not have the same overload resolution
|
// Strings and std:: containers do not have the same overload resolution
|
||||||
|
|
|
@ -306,9 +306,9 @@ using detail::get_weekday;
|
||||||
//
|
//
|
||||||
// civil_day d = ...
|
// civil_day d = ...
|
||||||
// // Gets the following Thursday if d is not already Thursday
|
// // Gets the following Thursday if d is not already Thursday
|
||||||
// civil_day thurs1 = prev_weekday(d, weekday::thursday) + 7;
|
// civil_day thurs1 = next_weekday(d - 1, weekday::thursday);
|
||||||
// // Gets the previous Thursday if d is not already Thursday
|
// // Gets the previous Thursday if d is not already Thursday
|
||||||
// civil_day thurs2 = next_weekday(d, weekday::thursday) - 7;
|
// civil_day thurs2 = prev_weekday(d + 1, weekday::thursday);
|
||||||
//
|
//
|
||||||
using detail::next_weekday;
|
using detail::next_weekday;
|
||||||
using detail::prev_weekday;
|
using detail::prev_weekday;
|
||||||
|
|
|
@ -1035,7 +1035,7 @@ TEST(CivilTime, LeapYears) {
|
||||||
|
|
||||||
TEST(CivilTime, FirstThursdayInMonth) {
|
TEST(CivilTime, FirstThursdayInMonth) {
|
||||||
const civil_day nov1(2014, 11, 1);
|
const civil_day nov1(2014, 11, 1);
|
||||||
const civil_day thursday = prev_weekday(nov1, weekday::thursday) + 7;
|
const civil_day thursday = next_weekday(nov1 - 1, weekday::thursday);
|
||||||
EXPECT_EQ("2014-11-06", Format(thursday));
|
EXPECT_EQ("2014-11-06", Format(thursday));
|
||||||
|
|
||||||
// Bonus: Date of Thanksgiving in the United States
|
// Bonus: Date of Thanksgiving in the United States
|
||||||
|
|
|
@ -682,7 +682,6 @@ std::unique_ptr<ZoneInfoSource> AndroidZoneInfoSource::Open(
|
||||||
// Use of the "file:" prefix is intended for testing purposes only.
|
// Use of the "file:" prefix is intended for testing purposes only.
|
||||||
if (name.compare(0, 5, "file:") == 0) return Open(name.substr(5));
|
if (name.compare(0, 5, "file:") == 0) return Open(name.substr(5));
|
||||||
|
|
||||||
#if defined(__ANDROID__)
|
|
||||||
// See Android's libc/tzcode/bionic.cpp for additional information.
|
// See Android's libc/tzcode/bionic.cpp for additional information.
|
||||||
for (const char* tzdata : {"/data/misc/zoneinfo/current/tzdata",
|
for (const char* tzdata : {"/data/misc/zoneinfo/current/tzdata",
|
||||||
"/system/usr/share/zoneinfo/tzdata"}) {
|
"/system/usr/share/zoneinfo/tzdata"}) {
|
||||||
|
@ -717,7 +716,7 @@ std::unique_ptr<ZoneInfoSource> AndroidZoneInfoSource::Open(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif // __ANDROID__
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <tuple>
|
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
#include "absl/time/internal/cctz/include/cctz/civil_time.h"
|
#include "absl/time/internal/cctz/include/cctz/civil_time.h"
|
||||||
|
@ -33,57 +32,75 @@ namespace cctz {
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
// .first is seconds east of UTC; .second is the time-zone abbreviation.
|
|
||||||
using OffsetAbbr = std::pair<int, const char*>;
|
|
||||||
|
|
||||||
// Defines a function that can be called as follows:
|
|
||||||
//
|
|
||||||
// std::tm tm = ...;
|
|
||||||
// OffsetAbbr off_abbr = get_offset_abbr(tm);
|
|
||||||
//
|
|
||||||
#if defined(_WIN32) || defined(_WIN64)
|
#if defined(_WIN32) || defined(_WIN64)
|
||||||
// Uses the globals: '_timezone', '_dstbias' and '_tzname'.
|
// Uses the globals: '_timezone', '_dstbias' and '_tzname'.
|
||||||
OffsetAbbr get_offset_abbr(const std::tm& tm) {
|
auto tm_gmtoff(const std::tm& tm) -> decltype(_timezone + _dstbias) {
|
||||||
const bool is_dst = tm.tm_isdst > 0;
|
const bool is_dst = tm.tm_isdst > 0;
|
||||||
const int off = _timezone + (is_dst ? _dstbias : 0);
|
return _timezone + (is_dst ? _dstbias : 0);
|
||||||
const char* abbr = _tzname[is_dst];
|
}
|
||||||
return {off, abbr};
|
auto tm_zone(const std::tm& tm) -> decltype(_tzname[0]) {
|
||||||
|
const bool is_dst = tm.tm_isdst > 0;
|
||||||
|
return _tzname[is_dst];
|
||||||
}
|
}
|
||||||
#elif defined(__sun)
|
#elif defined(__sun)
|
||||||
// Uses the globals: 'timezone', 'altzone' and 'tzname'.
|
// Uses the globals: 'timezone', 'altzone' and 'tzname'.
|
||||||
OffsetAbbr get_offset_abbr(const std::tm& tm) {
|
auto tm_gmtoff(const std::tm& tm) -> decltype(timezone) {
|
||||||
const bool is_dst = tm.tm_isdst > 0;
|
const bool is_dst = tm.tm_isdst > 0;
|
||||||
const int off = is_dst ? altzone : timezone;
|
return is_dst ? altzone : timezone;
|
||||||
const char* abbr = tzname[is_dst];
|
}
|
||||||
return {off, abbr};
|
auto tm_zone(const std::tm& tm) -> decltype(tzname[0]) {
|
||||||
|
const bool is_dst = tm.tm_isdst > 0;
|
||||||
|
return tzname[is_dst];
|
||||||
}
|
}
|
||||||
#elif defined(__native_client__) || defined(__myriad2__) || \
|
#elif defined(__native_client__) || defined(__myriad2__) || \
|
||||||
defined(__EMSCRIPTEN__)
|
defined(__EMSCRIPTEN__)
|
||||||
// Uses the globals: 'timezone' and 'tzname'.
|
// Uses the globals: 'timezone' and 'tzname'.
|
||||||
OffsetAbbr get_offset_abbr(const std::tm& tm) {
|
auto tm_gmtoff(const std::tm& tm) -> decltype(_timezone + 0) {
|
||||||
const bool is_dst = tm.tm_isdst > 0;
|
const bool is_dst = tm.tm_isdst > 0;
|
||||||
const int off = _timezone + (is_dst ? 60 * 60 : 0);
|
return _timezone + (is_dst ? 60 * 60 : 0);
|
||||||
const char* abbr = tzname[is_dst];
|
}
|
||||||
return {off, abbr};
|
auto tm_zone(const std::tm& tm) -> decltype(tzname[0]) {
|
||||||
|
const bool is_dst = tm.tm_isdst > 0;
|
||||||
|
return tzname[is_dst];
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
//
|
// Adapt to different spellings of the struct std::tm extension fields.
|
||||||
// Returns an OffsetAbbr using std::tm fields with various spellings.
|
#if defined(tm_gmtoff)
|
||||||
//
|
auto tm_gmtoff(const std::tm& tm) -> decltype(tm.tm_gmtoff) {
|
||||||
#if !defined(tm_gmtoff) && !defined(tm_zone)
|
return tm.tm_gmtoff;
|
||||||
template <typename T>
|
|
||||||
OffsetAbbr get_offset_abbr(const T& tm, decltype(&T::tm_gmtoff) = nullptr,
|
|
||||||
decltype(&T::tm_zone) = nullptr) {
|
|
||||||
return {tm.tm_gmtoff, tm.tm_zone};
|
|
||||||
}
|
}
|
||||||
#endif // !defined(tm_gmtoff) && !defined(tm_zone)
|
#elif defined(__tm_gmtoff)
|
||||||
#if !defined(__tm_gmtoff) && !defined(__tm_zone)
|
auto tm_gmtoff(const std::tm& tm) -> decltype(tm.__tm_gmtoff) {
|
||||||
template <typename T>
|
return tm.__tm_gmtoff;
|
||||||
OffsetAbbr get_offset_abbr(const T& tm, decltype(&T::__tm_gmtoff) = nullptr,
|
|
||||||
decltype(&T::__tm_zone) = nullptr) {
|
|
||||||
return {tm.__tm_gmtoff, tm.__tm_zone};
|
|
||||||
}
|
}
|
||||||
#endif // !defined(__tm_gmtoff) && !defined(__tm_zone)
|
#else
|
||||||
|
template <typename T>
|
||||||
|
auto tm_gmtoff(const T& tm) -> decltype(tm.tm_gmtoff) {
|
||||||
|
return tm.tm_gmtoff;
|
||||||
|
}
|
||||||
|
template <typename T>
|
||||||
|
auto tm_gmtoff(const T& tm) -> decltype(tm.__tm_gmtoff) {
|
||||||
|
return tm.__tm_gmtoff;
|
||||||
|
}
|
||||||
|
#endif // tm_gmtoff
|
||||||
|
#if defined(tm_zone)
|
||||||
|
auto tm_zone(const std::tm& tm) -> decltype(tm.tm_zone) {
|
||||||
|
return tm.tm_zone;
|
||||||
|
}
|
||||||
|
#elif defined(__tm_zone)
|
||||||
|
auto tm_zone(const std::tm& tm) -> decltype(tm.__tm_zone) {
|
||||||
|
return tm.__tm_zone;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
template <typename T>
|
||||||
|
auto tm_zone(const T& tm) -> decltype(tm.tm_zone) {
|
||||||
|
return tm.tm_zone;
|
||||||
|
}
|
||||||
|
template <typename T>
|
||||||
|
auto tm_zone(const T& tm) -> decltype(tm.__tm_zone) {
|
||||||
|
return tm.__tm_zone;
|
||||||
|
}
|
||||||
|
#endif // tm_zone
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
inline std::tm* gm_time(const std::time_t *timep, std::tm *result) {
|
inline std::tm* gm_time(const std::time_t *timep, std::tm *result) {
|
||||||
|
@ -126,7 +143,7 @@ bool make_time(const civil_second& cs, int is_dst, std::time_t* t, int* off) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*off = get_offset_abbr(tm).first;
|
*off = static_cast<int>(tm_gmtoff(tm));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -137,7 +154,7 @@ std::time_t find_trans(std::time_t lo, std::time_t hi, int offset) {
|
||||||
while (lo + 1 != hi) {
|
while (lo + 1 != hi) {
|
||||||
const std::time_t mid = lo + (hi - lo) / 2;
|
const std::time_t mid = lo + (hi - lo) / 2;
|
||||||
if (std::tm* tmp = local_time(&mid, &tm)) {
|
if (std::tm* tmp = local_time(&mid, &tm)) {
|
||||||
if (get_offset_abbr(*tmp).first == offset) {
|
if (tm_gmtoff(*tmp) == offset) {
|
||||||
hi = mid;
|
hi = mid;
|
||||||
} else {
|
} else {
|
||||||
lo = mid;
|
lo = mid;
|
||||||
|
@ -147,7 +164,7 @@ std::time_t find_trans(std::time_t lo, std::time_t hi, int offset) {
|
||||||
// ignoring all failed conversions. Slow, but never really happens.
|
// ignoring all failed conversions. Slow, but never really happens.
|
||||||
while (++lo != hi) {
|
while (++lo != hi) {
|
||||||
if (std::tm* tmp = local_time(&lo, &tm)) {
|
if (std::tm* tmp = local_time(&lo, &tm)) {
|
||||||
if (get_offset_abbr(*tmp).first == offset) break;
|
if (tm_gmtoff(*tmp) == offset) break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return lo;
|
return lo;
|
||||||
|
@ -193,8 +210,8 @@ time_zone::absolute_lookup TimeZoneLibC::BreakTime(
|
||||||
const year_t year = tmp->tm_year + year_t{1900};
|
const year_t year = tmp->tm_year + year_t{1900};
|
||||||
al.cs = civil_second(year, tmp->tm_mon + 1, tmp->tm_mday,
|
al.cs = civil_second(year, tmp->tm_mon + 1, tmp->tm_mday,
|
||||||
tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
|
tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
|
||||||
std::tie(al.offset, al.abbr) = get_offset_abbr(*tmp);
|
al.offset = static_cast<int>(tm_gmtoff(*tmp));
|
||||||
if (!local_) al.abbr = "UTC"; // as expected by cctz
|
al.abbr = local_ ? tm_zone(*tmp) : "UTC"; // as expected by cctz
|
||||||
al.is_dst = tmp->tm_isdst > 0;
|
al.is_dst = tmp->tm_isdst > 0;
|
||||||
return al;
|
return al;
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,13 @@ std::unique_ptr<absl::time_internal::cctz::ZoneInfoSource> DefaultFactory(
|
||||||
// A "weak" definition for cctz_extension::zone_info_source_factory.
|
// A "weak" definition for cctz_extension::zone_info_source_factory.
|
||||||
// The user may override this with their own "strong" definition (see
|
// The user may override this with their own "strong" definition (see
|
||||||
// zone_info_source.h).
|
// zone_info_source.h).
|
||||||
#if defined(_MSC_VER)
|
#if !defined(__has_attribute)
|
||||||
|
#define __has_attribute(x) 0
|
||||||
|
#endif
|
||||||
|
#if __has_attribute(weak) || defined(__GNUC__)
|
||||||
|
ZoneInfoSourceFactory zone_info_source_factory
|
||||||
|
__attribute__((weak)) = DefaultFactory;
|
||||||
|
#elif defined(_MSC_VER) && !defined(_LIBCPP_VERSION)
|
||||||
extern ZoneInfoSourceFactory zone_info_source_factory;
|
extern ZoneInfoSourceFactory zone_info_source_factory;
|
||||||
extern ZoneInfoSourceFactory default_factory;
|
extern ZoneInfoSourceFactory default_factory;
|
||||||
ZoneInfoSourceFactory default_factory = DefaultFactory;
|
ZoneInfoSourceFactory default_factory = DefaultFactory;
|
||||||
|
@ -60,19 +66,11 @@ ZoneInfoSourceFactory default_factory = DefaultFactory;
|
||||||
"/alternatename:?zone_info_source_factory@cctz_extension@time_internal@absl@@3P6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@5@AEBV?$function@$$A6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@5@@ZEA=?default_factory@cctz_extension@time_internal@absl@@3P6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@5@AEBV?$function@$$A6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@5@@ZEA")
|
"/alternatename:?zone_info_source_factory@cctz_extension@time_internal@absl@@3P6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@5@AEBV?$function@$$A6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@5@@ZEA=?default_factory@cctz_extension@time_internal@absl@@3P6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@5@AEBV?$function@$$A6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@5@@ZEA")
|
||||||
#else
|
#else
|
||||||
#error Unsupported MSVC platform
|
#error Unsupported MSVC platform
|
||||||
#endif
|
#endif // _M_<PLATFORM>
|
||||||
#else // _MSC_VER
|
|
||||||
#if !defined(__has_attribute)
|
|
||||||
#define __has_attribute(x) 0
|
|
||||||
#endif
|
|
||||||
#if __has_attribute(weak) || defined(__GNUC__)
|
|
||||||
ZoneInfoSourceFactory zone_info_source_factory
|
|
||||||
__attribute__((weak)) = DefaultFactory;
|
|
||||||
#else
|
#else
|
||||||
// Make it a "strong" definition if we have no other choice.
|
// Make it a "strong" definition if we have no other choice.
|
||||||
ZoneInfoSourceFactory zone_info_source_factory = DefaultFactory;
|
ZoneInfoSourceFactory zone_info_source_factory = DefaultFactory;
|
||||||
#endif
|
#endif
|
||||||
#endif // _MSC_VER
|
|
||||||
|
|
||||||
} // namespace cctz_extension
|
} // namespace cctz_extension
|
||||||
} // namespace time_internal
|
} // namespace time_internal
|
||||||
|
|
|
@ -837,8 +837,8 @@ struct ImaginaryFun<variant<H, T...>, I> : ImaginaryFun<variant<T...>, I + 1> {
|
||||||
// NOTE: const& and && are used instead of by-value due to lack of guaranteed
|
// NOTE: const& and && are used instead of by-value due to lack of guaranteed
|
||||||
// move elision of C++17. This may have other minor differences, but tests
|
// move elision of C++17. This may have other minor differences, but tests
|
||||||
// pass.
|
// pass.
|
||||||
static SizeT<I> Run(const H&);
|
static SizeT<I> Run(const H&, SizeT<I>);
|
||||||
static SizeT<I> Run(H&&);
|
static SizeT<I> Run(H&&, SizeT<I>);
|
||||||
};
|
};
|
||||||
|
|
||||||
// The following metafunctions are used in constructor and assignment
|
// The following metafunctions are used in constructor and assignment
|
||||||
|
@ -860,7 +860,8 @@ struct ConversionIsPossibleImpl : std::false_type {};
|
||||||
|
|
||||||
template <class Variant, class T>
|
template <class Variant, class T>
|
||||||
struct ConversionIsPossibleImpl<
|
struct ConversionIsPossibleImpl<
|
||||||
Variant, T, void_t<decltype(ImaginaryFun<Variant>::Run(std::declval<T>()))>>
|
Variant, T,
|
||||||
|
void_t<decltype(ImaginaryFun<Variant>::Run(std::declval<T>(), {}))>>
|
||||||
: std::true_type {};
|
: std::true_type {};
|
||||||
|
|
||||||
template <class Variant, class T>
|
template <class Variant, class T>
|
||||||
|
@ -868,8 +869,9 @@ struct ConversionIsPossible : ConversionIsPossibleImpl<Variant, T>::type {};
|
||||||
|
|
||||||
template <class Variant, class T>
|
template <class Variant, class T>
|
||||||
struct IndexOfConstructedType<
|
struct IndexOfConstructedType<
|
||||||
Variant, T, void_t<decltype(ImaginaryFun<Variant>::Run(std::declval<T>()))>>
|
Variant, T,
|
||||||
: decltype(ImaginaryFun<Variant>::Run(std::declval<T>())) {};
|
void_t<decltype(ImaginaryFun<Variant>::Run(std::declval<T>(), {}))>>
|
||||||
|
: decltype(ImaginaryFun<Variant>::Run(std::declval<T>(), {})) {};
|
||||||
|
|
||||||
template <std::size_t... Is>
|
template <std::size_t... Is>
|
||||||
struct ContainsVariantNPos
|
struct ContainsVariantNPos
|
||||||
|
|
|
@ -460,6 +460,11 @@ TYPED_TEST(VariantTypesTest, TestValueCtor) {
|
||||||
EXPECT_EQ(value.value, mutable_valptr->value);
|
EXPECT_EQ(value.value, mutable_valptr->value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST(VariantTest, AmbiguousValueConstructor) {
|
||||||
|
EXPECT_FALSE((std::is_convertible<int, absl::variant<int, int>>::value));
|
||||||
|
EXPECT_FALSE((std::is_constructible<absl::variant<int, int>, int>::value));
|
||||||
|
}
|
||||||
|
|
||||||
TEST(VariantTest, InPlaceType) {
|
TEST(VariantTest, InPlaceType) {
|
||||||
using Var = variant<int, std::string, NonCopyable, std::vector<int>>;
|
using Var = variant<int, std::string, NonCopyable, std::vector<int>>;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue