diff options
author | Abseil Team <absl-team@google.com> | 2018-06-20 06:25:23 -0700 |
---|---|---|
committer | Shaindel Schwartz <shaindel@google.com> | 2018-06-20 10:15:31 -0400 |
commit | 6c7de165d1c82684359ccb630bb5f83263fa5ebc (patch) | |
tree | f271bc0005ad42773cc0140100699b8bfbaea124 /absl/time/internal | |
parent | e5be80532b5d998813f9db952d2cc5401b1532df (diff) |
Project import generated by Copybara.20180600
GitOrigin-RevId: d89dba27e35462d7457121b978fd79214205e686
Change-Id: I0eae80578a93a580820bc90d42e6b42faf7fde0a
Diffstat (limited to 'absl/time/internal')
28 files changed, 64 insertions, 2 deletions
diff --git a/absl/time/internal/cctz/include/cctz/civil_time.h b/absl/time/internal/cctz/include/cctz/civil_time.h index 898222b4..31a28cb7 100644 --- a/absl/time/internal/cctz/include/cctz/civil_time.h +++ b/absl/time/internal/cctz/include/cctz/civil_time.h @@ -18,6 +18,7 @@ #include "absl/time/internal/cctz/include/cctz/civil_time_detail.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -324,6 +325,7 @@ using detail::get_yearday; } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_TIME_INTERNAL_CCTZ_CIVIL_TIME_H_ diff --git a/absl/time/internal/cctz/include/cctz/civil_time_detail.h b/absl/time/internal/cctz/include/cctz/civil_time_detail.h index d52eddcd..78d1db1c 100644 --- a/absl/time/internal/cctz/include/cctz/civil_time_detail.h +++ b/absl/time/internal/cctz/include/cctz/civil_time_detail.h @@ -32,6 +32,7 @@ #endif namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -555,6 +556,7 @@ std::ostream& operator<<(std::ostream& os, weekday wd); } // namespace detail } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl #undef CONSTEXPR_M diff --git a/absl/time/internal/cctz/include/cctz/time_zone.h b/absl/time/internal/cctz/include/cctz/time_zone.h index 31abc2c4..52d69384 100644 --- a/absl/time/internal/cctz/include/cctz/time_zone.h +++ b/absl/time/internal/cctz/include/cctz/time_zone.h @@ -28,6 +28,7 @@ #include "absl/time/internal/cctz/include/cctz/civil_time.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -311,6 +312,7 @@ inline bool parse(const std::string& fmt, const std::string& input, } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_TIME_INTERNAL_CCTZ_TIME_ZONE_H_ diff --git a/absl/time/internal/cctz/include/cctz/zone_info_source.h b/absl/time/internal/cctz/include/cctz/zone_info_source.h index 4d9d8f87..b72a02cf 100644 --- a/absl/time/internal/cctz/include/cctz/zone_info_source.h +++ b/absl/time/internal/cctz/include/cctz/zone_info_source.h @@ -21,6 +21,7 @@ #include <string> namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -35,9 +36,11 @@ class ZoneInfoSource { } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz_extension { @@ -86,6 +89,7 @@ extern ZoneInfoSourceFactory zone_info_source_factory; } // namespace cctz_extension } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_TIME_INTERNAL_CCTZ_ZONE_INFO_SOURCE_H_ diff --git a/absl/time/internal/cctz/src/civil_time_detail.cc b/absl/time/internal/cctz/src/civil_time_detail.cc index 780d5c96..92a2e09c 100644 --- a/absl/time/internal/cctz/src/civil_time_detail.cc +++ b/absl/time/internal/cctz/src/civil_time_detail.cc @@ -19,6 +19,7 @@ #include <sstream> namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { namespace detail { @@ -87,4 +88,5 @@ std::ostream& operator<<(std::ostream& os, weekday wd) { } // namespace detail } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/cctz/src/civil_time_test.cc b/absl/time/internal/cctz/src/civil_time_test.cc index f6648c8f..d26c6498 100644 --- a/absl/time/internal/cctz/src/civil_time_test.cc +++ b/absl/time/internal/cctz/src/civil_time_test.cc @@ -23,6 +23,7 @@ #include "gtest/gtest.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -1046,4 +1047,5 @@ TEST(CivilTime, FirstThursdayInMonth) { } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/cctz/src/time_zone_fixed.cc b/absl/time/internal/cctz/src/time_zone_fixed.cc index 65eba356..4b608f68 100644 --- a/absl/time/internal/cctz/src/time_zone_fixed.cc +++ b/absl/time/internal/cctz/src/time_zone_fixed.cc @@ -21,6 +21,7 @@ #include <string> namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -120,4 +121,5 @@ std::string FixedOffsetToAbbr(const sys_seconds& offset) { } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/cctz/src/time_zone_fixed.h b/absl/time/internal/cctz/src/time_zone_fixed.h index 7c9d11db..15e9db1e 100644 --- a/absl/time/internal/cctz/src/time_zone_fixed.h +++ b/absl/time/internal/cctz/src/time_zone_fixed.h @@ -20,6 +20,7 @@ #include "absl/time/internal/cctz/include/cctz/time_zone.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -44,6 +45,7 @@ std::string FixedOffsetToAbbr(const sys_seconds& offset); } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_TIME_INTERNAL_CCTZ_TIME_ZONE_FIXED_H_ diff --git a/absl/time/internal/cctz/src/time_zone_format.cc b/absl/time/internal/cctz/src/time_zone_format.cc index 6d5ccba1..0efbbc79 100644 --- a/absl/time/internal/cctz/src/time_zone_format.cc +++ b/absl/time/internal/cctz/src/time_zone_format.cc @@ -38,6 +38,7 @@ #include "time_zone_if.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { namespace detail { @@ -845,4 +846,5 @@ bool parse(const std::string& format, const std::string& input, } // namespace detail } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/cctz/src/time_zone_format_test.cc b/absl/time/internal/cctz/src/time_zone_format_test.cc index 7d5b02ad..649e9b9a 100644 --- a/absl/time/internal/cctz/src/time_zone_format_test.cc +++ b/absl/time/internal/cctz/src/time_zone_format_test.cc @@ -34,6 +34,7 @@ using std::chrono::hours; using testing::HasSubstr; namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -1409,4 +1410,5 @@ TEST(FormatParse, RoundTripDistantPast) { } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/cctz/src/time_zone_if.cc b/absl/time/internal/cctz/src/time_zone_if.cc index 380834a1..d289a5c9 100644 --- a/absl/time/internal/cctz/src/time_zone_if.cc +++ b/absl/time/internal/cctz/src/time_zone_if.cc @@ -17,6 +17,7 @@ #include "time_zone_libc.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -38,4 +39,5 @@ TimeZoneIf::~TimeZoneIf() {} } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/cctz/src/time_zone_if.h b/absl/time/internal/cctz/src/time_zone_if.h index ce4da1b7..2d5f885d 100644 --- a/absl/time/internal/cctz/src/time_zone_if.h +++ b/absl/time/internal/cctz/src/time_zone_if.h @@ -24,6 +24,7 @@ #include "absl/time/internal/cctz/include/cctz/time_zone.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -65,6 +66,7 @@ inline time_point<sys_seconds> FromUnixSeconds(std::int_fast64_t t) { } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_TIME_INTERNAL_CCTZ_TIME_ZONE_IF_H_ diff --git a/absl/time/internal/cctz/src/time_zone_impl.cc b/absl/time/internal/cctz/src/time_zone_impl.cc index b3f635f7..3ba40ac2 100644 --- a/absl/time/internal/cctz/src/time_zone_impl.cc +++ b/absl/time/internal/cctz/src/time_zone_impl.cc @@ -22,6 +22,7 @@ #include "time_zone_fixed.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -114,4 +115,5 @@ const time_zone::Impl* time_zone::Impl::UTCImpl() { } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/cctz/src/time_zone_impl.h b/absl/time/internal/cctz/src/time_zone_impl.h index 2c1c30b6..a955e40e 100644 --- a/absl/time/internal/cctz/src/time_zone_impl.h +++ b/absl/time/internal/cctz/src/time_zone_impl.h @@ -24,6 +24,7 @@ #include "time_zone_info.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -92,6 +93,7 @@ class time_zone::Impl { } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_TIME_INTERNAL_CCTZ_TIME_ZONE_IMPL_H_ diff --git a/absl/time/internal/cctz/src/time_zone_info.cc b/absl/time/internal/cctz/src/time_zone_info.cc index 20bba28b..7f5a8fad 100644 --- a/absl/time/internal/cctz/src/time_zone_info.cc +++ b/absl/time/internal/cctz/src/time_zone_info.cc @@ -50,6 +50,7 @@ #include "time_zone_posix.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -953,4 +954,5 @@ bool TimeZoneInfo::PrevTransition(time_point<sys_seconds>* tp) const { } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/cctz/src/time_zone_info.h b/absl/time/internal/cctz/src/time_zone_info.h index b4d1696b..5abf2811 100644 --- a/absl/time/internal/cctz/src/time_zone_info.h +++ b/absl/time/internal/cctz/src/time_zone_info.h @@ -28,6 +28,7 @@ #include "tzfile.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -127,6 +128,7 @@ class TimeZoneInfo : public TimeZoneIf { } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_TIME_INTERNAL_CCTZ_TIME_ZONE_INFO_H_ diff --git a/absl/time/internal/cctz/src/time_zone_libc.cc b/absl/time/internal/cctz/src/time_zone_libc.cc index b0b56a52..32a7a927 100644 --- a/absl/time/internal/cctz/src/time_zone_libc.cc +++ b/absl/time/internal/cctz/src/time_zone_libc.cc @@ -27,6 +27,7 @@ #include "absl/time/internal/cctz/include/cctz/time_zone.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -153,4 +154,5 @@ bool TimeZoneLibC::PrevTransition(time_point<sys_seconds>* tp) const { } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/cctz/src/time_zone_libc.h b/absl/time/internal/cctz/src/time_zone_libc.h index 41f7dde2..0856b200 100644 --- a/absl/time/internal/cctz/src/time_zone_libc.h +++ b/absl/time/internal/cctz/src/time_zone_libc.h @@ -20,6 +20,7 @@ #include "time_zone_if.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -45,6 +46,7 @@ class TimeZoneLibC : public TimeZoneIf { } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_TIME_INTERNAL_CCTZ_TIME_ZONE_LIBC_H_ diff --git a/absl/time/internal/cctz/src/time_zone_lookup.cc b/absl/time/internal/cctz/src/time_zone_lookup.cc index d549d862..18d1565f 100644 --- a/absl/time/internal/cctz/src/time_zone_lookup.cc +++ b/absl/time/internal/cctz/src/time_zone_lookup.cc @@ -28,6 +28,7 @@ #include "time_zone_impl.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -142,4 +143,5 @@ time_zone local_time_zone() { } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/cctz/src/time_zone_lookup_test.cc b/absl/time/internal/cctz/src/time_zone_lookup_test.cc index 06b172a8..a1b6c687 100644 --- a/absl/time/internal/cctz/src/time_zone_lookup_test.cc +++ b/absl/time/internal/cctz/src/time_zone_lookup_test.cc @@ -34,6 +34,7 @@ using std::chrono::minutes; using std::chrono::hours; namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -1258,4 +1259,5 @@ TEST(TimeZoneEdgeCase, UTC5DigitYear) { } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/cctz/src/time_zone_posix.cc b/absl/time/internal/cctz/src/time_zone_posix.cc index 75ad8bcb..b6cf2875 100644 --- a/absl/time/internal/cctz/src/time_zone_posix.cc +++ b/absl/time/internal/cctz/src/time_zone_posix.cc @@ -20,6 +20,7 @@ #include <string> namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -152,4 +153,5 @@ bool ParsePosixSpec(const std::string& spec, PosixTimeZone* res) { } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/cctz/src/time_zone_posix.h b/absl/time/internal/cctz/src/time_zone_posix.h index 6619f27e..91443a21 100644 --- a/absl/time/internal/cctz/src/time_zone_posix.h +++ b/absl/time/internal/cctz/src/time_zone_posix.h @@ -56,6 +56,7 @@ #include <string> namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -113,6 +114,7 @@ bool ParsePosixSpec(const std::string& spec, PosixTimeZone* res); } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_TIME_INTERNAL_CCTZ_TIME_ZONE_POSIX_H_ diff --git a/absl/time/internal/cctz/src/zone_info_source.cc b/absl/time/internal/cctz/src/zone_info_source.cc index b77c0a58..a73e1c92 100644 --- a/absl/time/internal/cctz/src/zone_info_source.cc +++ b/absl/time/internal/cctz/src/zone_info_source.cc @@ -15,6 +15,7 @@ #include "absl/time/internal/cctz/include/cctz/zone_info_source.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz { @@ -23,9 +24,11 @@ ZoneInfoSource::~ZoneInfoSource() {} } // namespace cctz } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz_extension { @@ -52,11 +55,11 @@ ZoneInfoSourceFactory default_factory = DefaultFactory; #if defined(_M_IX86) #pragma comment( \ linker, \ - "/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@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@5@ABV?$function@$$A6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@std@@@std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@5@@ZA=?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@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@5@ABV?$function@$$A6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@std@@@std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@5@@ZA") + "/alternatename:?zone_info_source_factory@cctz_extension@time_internal@lts_2018_06_20@absl@@3P6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@@std@@@std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@6@ABV?$function@$$A6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@@std@@@std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@6@@ZA=?default_factory@cctz_extension@time_internal@lts_2018_06_20@absl@@3P6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@@std@@@std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@6@ABV?$function@$$A6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@@std@@@std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@6@@ZA") #elif defined(_M_IA_64) || defined(_M_AMD64) #pragma comment( \ linker, \ - "/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@lts_2018_06_20@absl@@3P6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@6@AEBV?$function@$$A6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@6@@ZEA=?default_factory@cctz_extension@time_internal@lts_2018_06_20@absl@@3P6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@6@AEBV?$function@$$A6A?AV?$unique_ptr@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@lts_2018_06_20@absl@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@6@@ZEA") #else #error Unsupported MSVC platform #endif @@ -67,4 +70,5 @@ ZoneInfoSourceFactory zone_info_source_factory } // namespace cctz_extension } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/get_current_time_ios.inc b/absl/time/internal/get_current_time_ios.inc index f3db32bf..abd43cb4 100644 --- a/absl/time/internal/get_current_time_ios.inc +++ b/absl/time/internal/get_current_time_ios.inc @@ -26,6 +26,7 @@ #endif namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { static int64_t GetCurrentTimeNanosFromSystem() { @@ -77,4 +78,5 @@ static int64_t GetCurrentTimeNanosFromSystem() { } } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/get_current_time_posix.inc b/absl/time/internal/get_current_time_posix.inc index 65474ca6..dfbcf8a6 100644 --- a/absl/time/internal/get_current_time_posix.inc +++ b/absl/time/internal/get_current_time_posix.inc @@ -7,6 +7,7 @@ #include "absl/base/internal/raw_logging.h" namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { static int64_t GetCurrentTimeNanosFromSystem() { @@ -19,4 +20,5 @@ static int64_t GetCurrentTimeNanosFromSystem() { } } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/get_current_time_windows.inc b/absl/time/internal/get_current_time_windows.inc index b22a9c9e..273d2d80 100644 --- a/absl/time/internal/get_current_time_windows.inc +++ b/absl/time/internal/get_current_time_windows.inc @@ -4,6 +4,7 @@ #include <cstdint> namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { static int64_t GetCurrentTimeNanosFromSystem() { @@ -14,4 +15,5 @@ static int64_t GetCurrentTimeNanosFromSystem() { } } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/test_util.cc b/absl/time/internal/test_util.cc index bbbef7da..1cc89b5e 100644 --- a/absl/time/internal/test_util.cc +++ b/absl/time/internal/test_util.cc @@ -24,6 +24,7 @@ namespace cctz = absl::time_internal::cctz; namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { #if GTEST_USES_SIMPLE_RE @@ -39,9 +40,11 @@ TimeZone LoadTimeZone(const std::string& name) { } } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { namespace cctz_extension { namespace { @@ -126,4 +129,5 @@ ZoneInfoSourceFactory zone_info_source_factory = TestFactory; } // namespace cctz_extension } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/time/internal/test_util.h b/absl/time/internal/test_util.h index 8fd5fb9f..fb65f9bd 100644 --- a/absl/time/internal/test_util.h +++ b/absl/time/internal/test_util.h @@ -41,6 +41,7 @@ } while (0) namespace absl { +inline namespace lts_2018_06_20 { namespace time_internal { // A regular expression that matches all zone abbreviations (%Z). @@ -50,6 +51,7 @@ extern const char kZoneAbbrRE[]; absl::TimeZone LoadTimeZone(const std::string& name); } // namespace time_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_TIME_INTERNAL_TEST_UTIL_H_ |