From bb4552f0808dceed806561ca014eecc4f7ae1387 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 31 Dec 2020 10:16:29 -0800 Subject: [PATCH 01/74] src/ZoneManager.h: Reformat BasicZoneManager and ExtendedZoneManager class declarations for better readability --- src/ace_time/ZoneManager.h | 64 +++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/src/ace_time/ZoneManager.h b/src/ace_time/ZoneManager.h index 840466f50..cf4132933 100644 --- a/src/ace_time/ZoneManager.h +++ b/src/ace_time/ZoneManager.h @@ -70,7 +70,7 @@ class ZoneManager { * DST offsets. This is useful in applications designed to run on * microcontrollers with small memory where a full BasicZoneManager or * ExtendedZoneManager generate too much code. This object can be used anywhere - * a ZoneManager is expected, which reduces the need for C-precessor + * a ZoneManager is expected, which reduces the need for C-preprocessor * conditional code. */ class ManualZoneManager : public ZoneManager { @@ -219,13 +219,26 @@ class ZoneManagerImpl : public ZoneManager { * @tparam SIZE size of the BasicZoneProcessorCache */ template -class BasicZoneManager: public ZoneManagerImpl> { +class BasicZoneManager: public ZoneManagerImpl< + basic::ZoneInfo, + BasicZoneRegistrar, + BasicZoneProcessorCache + > { + public: - BasicZoneManager(uint16_t registrySize, - const basic::ZoneInfo* const* zoneRegistry): - ZoneManagerImpl>(registrySize, zoneRegistry) {} + BasicZoneManager( + uint16_t registrySize, + const basic::ZoneInfo* const* zoneRegistry + ): + ZoneManagerImpl< + basic::ZoneInfo, + BasicZoneRegistrar, + BasicZoneProcessorCache + >( + registrySize, + zoneRegistry + ) + {} }; /** @@ -235,22 +248,37 @@ class BasicZoneManager: public ZoneManagerImpl -class ExtendedZoneManager: public ZoneManagerImpl> { +class ExtendedZoneManager: public ZoneManagerImpl< + extended::ZoneInfo, + ExtendedZoneRegistrar, + ExtendedZoneProcessorCache + > { + public: - ExtendedZoneManager(uint16_t registrySize, - const extended::ZoneInfo* const* zoneRegistry): - ZoneManagerImpl>(registrySize, zoneRegistry) {} + ExtendedZoneManager( + uint16_t registrySize, + const extended::ZoneInfo* const* zoneRegistry + ): + ZoneManagerImpl< + extended::ZoneInfo, + ExtendedZoneRegistrar, + ExtendedZoneProcessorCache + >( + registrySize, + zoneRegistry + ) + {} }; #else -// NOTE: The following typedef seems shorter and easier to maintain. The -// problem is that it makes error messages basically impossible to decipher -// because the immensely long full template class name is printed out. There -// seems to be no difference in code size between the two. The compiler seems -// to optimize away the vtables of the parent and child classes. +// NOTE: The following typedefs seem shorter and easier to maintain. The +// problem is that they make error messages basically impossible to decipher +// because the template class names are far too long for human comprehension. +// Fortunatley, there seems to be no difference in code size between the above +// solution using subclasses and this solution using typedefs. The compiler +// seems to optimize away the vtables of the parent and child classes. So we'll +// use the above subclassing solution to get better error messages. template using BasicZoneManager = ZoneManagerImpl Date: Thu, 31 Dec 2020 10:19:17 -0800 Subject: [PATCH 02/74] README.md: Add references to ZoneManager, ManualZoneManager, StmRtcClock --- README.md | 10 +++++++--- keywords.txt | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 141da772e..eee2c886e 100644 --- a/README.md +++ b/README.md @@ -37,15 +37,18 @@ C++ namespaces: * `ace_time::TimePeriod` * `ace_time::BasicZone` * `ace_time::ExtendedZone` - * `ace_time::BasicZoneManager` - * `ace_time::ExtendedZoneManager` + * `ace_time::ZoneManager` + * `ace_time::BasicZoneManager` + * `ace_time::ExtendedZoneManager` + * `ace_time::ManualZoneManager` * mutation helpers * `ace_time::local_date_mutation::` * `ace_time::time_offset_mutation::` * `ace_time::time_period_mutation::` * `ace_time::zoned_date_time_mutation::` * TZ Database zone files - * C++ files generated by a code-generator from the TZ Database zone files + * data structures generated from the TZ Database zone files + * intended to be used as opaque data objects * `ace_time::zonedb` (270 zones and 182 links) * `ace_time::zonedb::kZoneAfrica_Abidjan` * `ace_time::zonedb::kZoneAfrica_Accra` @@ -62,6 +65,7 @@ C++ namespaces: * `ace_time::clock::Clock` * `ace_time::clock::DS3231Clock` * `ace_time::clock::NtpClock` + * `ace_time::clock::StmRtcClock` (experimental as of v1.4) * `ace_time::clock::SystemClock` * `ace_time::clock::SystemClockCoroutine` * `ace_time::clock::SystemClockLoop` diff --git a/keywords.txt b/keywords.txt index 3d7b69d96..01aecdb4b 100644 --- a/keywords.txt +++ b/keywords.txt @@ -22,8 +22,10 @@ BasicZone KEYWORD1 ExtendedZone KEYWORD1 TimeZone KEYWORD1 ZonedDateTime KEYWORD1 +ZoneManager KEYWORD1 BasicZoneManager KEYWORD1 ExtendedZoneManager KEYWORD1 +ManualZoneManager KEYWORD1 TimePeriod KEYWORD1 # src/ace_time/clock From b34ee497043a8698885ab9cbea612fd1e792133c Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 31 Dec 2020 10:39:29 -0800 Subject: [PATCH 03/74] DEVELOPER.md: No longer need to update BasicZoneProcessorTest and ExtendedZoneProcessorTest upon TZ DB version update --- DEVELOPER.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/DEVELOPER.md b/DEVELOPER.md index d9d97bc27..8aec0508f 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -136,7 +136,7 @@ available. * `$ make` * `tools/zonedbpy` * `$ cd tools/zonedbpy` - * Edit the Makefile and update the `TZ_VERSION`. + * Edit the `Makefile` and update the `TZ_VERSION`. * `$ make` * Update the CHANGELOG.md. * Commit the changes to git @@ -159,9 +159,6 @@ will fail until the underying timezone database of the OS is updated. * `docs/doxygen.cfg` * `library.properties` * `CHANGELOG.md` - * Bump the version numbers in the unit tests: - * `BasicZoneProcessorTest/BasicZoneProcessorTest.ino` - * `ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino` * `$ git commit -m "..."` * Update and commit the Doxygen docs. This is done as a separate git commit because the Doxygen changes are often so large that they obscure all other From aa823e04709fae78985ed4bd79f94dea0d242b6b Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 31 Dec 2020 15:59:31 -0800 Subject: [PATCH 04/74] tools/at_types.py: Add num_policies and num_links to JSON output, mostly for human verification --- tools/data_types/at_types.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/data_types/at_types.py b/tools/data_types/at_types.py index af22be04e..68f46dccb 100644 --- a/tools/data_types/at_types.py +++ b/tools/data_types/at_types.py @@ -263,6 +263,8 @@ class ZoneInfoDatabase(TypedDict): delta_granularity: int strict: bool num_zones: int + num_policies: int + num_links: int # Data from Extractor filtered through Transformer zones_map: ZonesMap @@ -315,9 +317,11 @@ def create_zone_info_database( 'offset_granularity': offset_granularity, 'delta_granularity': delta_granularity, 'strict': strict, - 'num_zones': len(tresult.zones_map), # Data from Extractor filtered through Transformer. + 'num_zones': len(tresult.zones_map), + 'num_policies': len(tresult.policies_map), + 'num_links': len(tresult.links_map), 'zones_map': tresult.zones_map, 'policies_map': tresult.policies_map, 'links_map': tresult.links_map, From 449fa6defa0d1100c8c44e9c77006ff380fbef5f Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 31 Dec 2020 13:07:00 -0800 Subject: [PATCH 05/74] tools: Generate link_ids in zonedb.json; generate fat links in zone_info.{h,cpp} files if --fat_links given --- src/ace_time/zonedb/Makefile | 7 +- src/ace_time/zonedbx/Makefile | 5 +- tools/Makefile | 10 +- tools/data_types/at_types.py | 4 + tools/generator/argenerator.py | 146 ++++++++++++++++++++++------- tools/transformer/artransformer.py | 24 ++++- tools/transformer/transformer.py | 3 +- tools/tzcompiler.py | 13 +++ tools/validate.py | 1 + 9 files changed, 162 insertions(+), 51 deletions(-) diff --git a/src/ace_time/zonedb/Makefile b/src/ace_time/zonedb/Makefile index 90a63774c..67642ac24 100644 --- a/src/ace_time/zonedb/Makefile +++ b/src/ace_time/zonedb/Makefile @@ -7,16 +7,15 @@ UNTIL_YEAR = 2050 all: ../../../tools/tzcompiler.sh \ --tag $(TZ_VERSION) \ - --action zonedb \ --language arduino \ --scope basic \ --start_year $(START_YEAR) \ --until_year $(UNTIL_YEAR) -tzdb.json: +zonedb.json: ../../../tools/tzcompiler.sh \ --tag $(TZ_VERSION) \ - --action tzdb \ - --scope extended \ + --language json \ + --scope basic \ --start_year $(START_YEAR) \ --until_year $(UNTIL_YEAR) diff --git a/src/ace_time/zonedbx/Makefile b/src/ace_time/zonedbx/Makefile index 5b2a8cbf7..19225f9f5 100644 --- a/src/ace_time/zonedbx/Makefile +++ b/src/ace_time/zonedbx/Makefile @@ -7,16 +7,15 @@ UNTIL_YEAR = 2050 all: ../../../tools/tzcompiler.sh \ --tag $(TZ_VERSION) \ - --action zonedb \ --language arduino \ --scope extended \ --start_year $(START_YEAR) \ --until_year $(UNTIL_YEAR) -tzdb.json: +zonedbx.json: ../../../tools/tzcompiler.sh \ --tag $(TZ_VERSION) \ - --action tzdb \ + --language json \ --scope extended \ --start_year $(START_YEAR) \ --until_year $(UNTIL_YEAR) diff --git a/tools/Makefile b/tools/Makefile index 8c7c8a348..f23dccb6d 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,4 +1,4 @@ -TZ_VERSION := 2020d +TZ_VERSION := 2020f # Files which pass 'mypy --strict'. SRC := \ @@ -55,11 +55,11 @@ validate: $(TZ_VERSION) # Generate zonedb.json for testing purposes. zonedb.json: $(SRC) $(TZ_VERSION) ./tzcompiler.py \ - --tz_version \ - $(TZ_VERSION) \ + --tz_version $(TZ_VERSION) \ --input_dir $(TZ_VERSION) \ --scope basic \ --language json \ + --fat_links \ --json_file $@ \ --start_year 2000 \ --until_year 2050 @@ -67,11 +67,11 @@ zonedb.json: $(SRC) $(TZ_VERSION) # Generate zonedbx.json for testing purposes. zonedbx.json: $(SRC) $(TZ_VERSION) ./tzcompiler.py \ - --tz_version \ - $(TZ_VERSION) \ + --tz_version $(TZ_VERSION) \ --input_dir $(TZ_VERSION) \ --scope extended \ --language json \ + --fat_links \ --json_file $@ \ --start_year 2000 \ --until_year 2050 diff --git a/tools/data_types/at_types.py b/tools/data_types/at_types.py index 68f46dccb..33a6d5333 100644 --- a/tools/data_types/at_types.py +++ b/tools/data_types/at_types.py @@ -187,6 +187,7 @@ class TransformerResult(NamedTuple): * notable_policies: {policyName -> reasons[]} * notable_links: {linkName -> reasons[]} * zone_ids: {zoneName -> zoneHash} + * link_ids: {linkName -> zoneHash} * letters_per_policy: {policyName -> {letter -> index}} * letters_map: {letter -> index} * formats_map: {format -> index} @@ -201,6 +202,7 @@ class TransformerResult(NamedTuple): notable_policies: CommentsMap notable_links: CommentsMap zone_ids: Dict[str, int] + link_ids: Dict[str, int] letters_per_policy: LettersPerPolicy letters_map: IndexMap formats_map: IndexMap @@ -285,6 +287,7 @@ class ZoneInfoDatabase(TypedDict): # Data from ArduinoTransformer zone_ids: Dict[str, int] # hash(zoneName) + link_ids: Dict[str, int] # hash(linkName) letters_per_policy: LettersPerPolicy # multi-char letters by zonePolicy letters_map: IndexMap # all multi-character letters formats_map: IndexMap # shortened format strings. @@ -340,6 +343,7 @@ def create_zone_info_database( # Data from ArduinoTransformer 'zone_ids': tresult.zone_ids, + 'link_ids': tresult.link_ids, 'letters_per_policy': tresult.letters_per_policy, 'letters_map': tresult.letters_map, 'formats_map': tresult.formats_map, diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index d4f0c0152..c0533eca3 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -40,6 +40,7 @@ def __init__( invocation: str, db_namespace: str, zidb: ZoneInfoDatabase, + fat_links: bool, ): # If I add a backslash (\) at the end of each line (which is needed if I # want to copy and paste the shell command), the C++ compiler spews out @@ -62,9 +63,9 @@ def __init__( self.zone_policies_generator = ZonePoliciesGenerator( invocation=wrapped_invocation, tz_files=wrapped_tzfiles, + db_namespace=db_namespace, tz_version=zidb['tz_version'], scope=zidb['scope'], - db_namespace=db_namespace, zones_map=zidb['zones_map'], policies_map=zidb['policies_map'], removed_zones=zidb['removed_zones'], @@ -76,9 +77,10 @@ def __init__( self.zone_infos_generator = ZoneInfosGenerator( invocation=wrapped_invocation, tz_files=wrapped_tzfiles, + db_namespace=db_namespace, + fat_links=fat_links, tz_version=zidb['tz_version'], scope=zidb['scope'], - db_namespace=db_namespace, start_year=zidb['start_year'], until_year=zidb['until_year'], zones_map=zidb['zones_map'], @@ -92,13 +94,14 @@ def __init__( notable_policies=zidb['notable_policies'], buf_sizes=zidb['buf_sizes'], zone_ids=zidb['zone_ids'], + link_ids=zidb['link_ids'], ) self.zone_registry_generator = ZoneRegistryGenerator( invocation=wrapped_invocation, tz_files=wrapped_tzfiles, + db_namespace=db_namespace, tz_version=zidb['tz_version'], scope=zidb['scope'], - db_namespace=db_namespace, zones_map=zidb['zones_map'], ) @@ -500,7 +503,7 @@ class ZoneInfosGenerator: {infoItems} -{infoZoneIds} +{zoneIds} //--------------------------------------------------------------------------- // Supported links: {numLinks} @@ -508,6 +511,8 @@ class ZoneInfosGenerator: {linkItems} +{linkIds} + //--------------------------------------------------------------------------- // Unsupported zones: {numRemovedInfos} //--------------------------------------------------------------------------- @@ -544,6 +549,20 @@ class ZoneInfosGenerator: ZONE_INFOS_H_INFO_ZONE_ID = """\ const uint32_t kZoneId{zoneNormalizedName} = 0x{zoneId:08x}; // {zoneFullName} +""" + + ZONE_INFOS_H_FAT_LINK_ITEM = """\ +extern const {scope}::ZoneInfo kZone{linkNormalizedName}; \ +// {linkFullName} -> {zoneFullName} +""" + + ZONE_INFOS_H_LINK_ITEM = """\ +extern const {scope}::ZoneInfo& kZone{linkNormalizedName}; \ +// {linkFullName} -> {zoneFullName} +""" + + ZONE_INFOS_H_LINK_ID = """\ +const uint32_t kZoneId{linkNormalizedName} = 0x{linkId:08x}; // {linkFullName} """ ZONE_INFOS_H_REMOVED_INFO_ITEM = """\ @@ -552,11 +571,6 @@ class ZoneInfosGenerator: ZONE_INFOS_H_NOTABLE_INFO_ITEM = """\ // {zoneFullName} ({reason}) -""" - - ZONE_INFOS_H_LINK_ITEM = """\ -extern const {scope}::ZoneInfo& kZone{linkNormalizedName}; \ -// {linkFullName} -> {zoneFullName} """ ZONE_INFOS_H_REMOVED_LINK_ITEM = """\ @@ -663,6 +677,24 @@ class ZoneInfosGenerator: ZONE_INFOS_CPP_LINK_ITEM = """\ const {scope}::ZoneInfo& kZone{linkNormalizedName} = kZone{zoneNormalizedName}; +""" + + ZONE_INFOS_CPP_FAT_LINK_ITEM = """\ +//--------------------------------------------------------------------------- +// Link name: {linkFullName} -> {zoneFullName} +//--------------------------------------------------------------------------- + +static const char kZoneName{linkNormalizedName}[] {progmem} = "{linkFullName}"; + +const {scope}::ZoneInfo kZone{linkNormalizedName} {progmem} = {{ + kZoneName{linkNormalizedName} /*name*/, + 0x{linkId:08x} /*zoneId*/, + &kZoneContext /*zoneContext*/, + {transitionBufSize} /*transitionBufSize*/, + {numEras} /*numEras*/, + kZoneEra{zoneNormalizedName} /*eras*/, +}}; + """ SIZEOF_ZONE_ERA_8 = 11 @@ -673,10 +705,11 @@ class ZoneInfosGenerator: def __init__( self, invocation: str, + db_namespace: str, + fat_links: bool, tz_version: str, tz_files: str, scope: str, - db_namespace: str, start_year: int, until_year: int, zones_map: ZonesMap, @@ -690,12 +723,14 @@ def __init__( notable_policies: CommentsMap, buf_sizes: BufSizeMap, zone_ids: Dict[str, int], + link_ids: Dict[str, int], ): self.invocation = invocation + self.db_namespace = db_namespace + self.fat_links = fat_links self.tz_version = tz_version self.tz_files = tz_files self.scope = scope - self.db_namespace = db_namespace self.start_year = start_year self.until_year = until_year self.zones_map = zones_map @@ -709,6 +744,7 @@ def __init__( self.notable_policies = notable_policies self.buf_sizes = buf_sizes self.zone_ids = zone_ids + self.link_ids = link_ids self.db_header_namespace = self.db_namespace.upper() @@ -722,12 +758,33 @@ def generate_infos_h(self) -> str: zoneFullName=zone_name, ) info_zone_ids += self.ZONE_INFOS_H_INFO_ZONE_ID.format( - scope=self.scope, zoneNormalizedName=normalize_name(zone_name), zoneFullName=zone_name, zoneId=self.zone_ids[zone_name], ) + link_items = '' + link_ids = '' + if self.fat_links: + for link_name, zone_name in sorted(self.links_map.items()): + link_items += self.ZONE_INFOS_H_FAT_LINK_ITEM.format( + scope=self.scope, + linkNormalizedName=normalize_name(link_name), + linkFullName=link_name, + zoneFullName=zone_name) + link_ids += self.ZONE_INFOS_H_LINK_ID.format( + linkNormalizedName=normalize_name(link_name), + linkFullName=link_name, + linkId=self.link_ids[link_name], + ) + else: + for link_name, zone_name in sorted(self.links_map.items()): + link_items += self.ZONE_INFOS_H_LINK_ITEM.format( + scope=self.scope, + linkNormalizedName=normalize_name(link_name), + linkFullName=link_name, + zoneFullName=zone_name) + removed_info_items = '' for zone_name, reasons in sorted(self.removed_zones.items()): removed_info_items += self.ZONE_INFOS_H_REMOVED_INFO_ITEM.format( @@ -738,14 +795,6 @@ def generate_infos_h(self) -> str: notable_info_items += self.ZONE_INFOS_H_NOTABLE_INFO_ITEM.format( zoneFullName=zone_name, reason=', '.join(reasons)) - link_items = '' - for link_name, zone_name in sorted(self.links_map.items()): - link_items += self.ZONE_INFOS_H_LINK_ITEM.format( - scope=self.scope, - linkNormalizedName=normalize_name(link_name), - linkFullName=link_name, - zoneFullName=zone_name) - removed_link_items = '' for link_name, reasons in sorted(self.removed_links.items()): removed_link_items += self.ZONE_INFOS_H_REMOVED_LINK_ITEM.format( @@ -765,9 +814,10 @@ def generate_infos_h(self) -> str: dbHeaderNamespace=self.db_header_namespace, numInfos=len(self.zones_map), infoItems=info_items, - infoZoneIds=info_zone_ids, + zoneIds=info_zone_ids, numLinks=len(self.links_map), linkItems=link_items, + linkIds=link_ids, numRemovedInfos=len(self.removed_zones), removedInfoItems=removed_info_items, numNotableInfos=len(self.notable_zones), @@ -784,7 +834,7 @@ def generate_infos_cpp(self) -> str: info_items = '' num_eras = 0 for zone_name, eras in sorted(self.zones_map.items()): - (info_item, info_string_length) = self._generate_info_item( + info_item, info_string_length = self._generate_info_item( zone_name, eras) info_items += info_item string_length += info_string_length @@ -793,8 +843,10 @@ def generate_infos_cpp(self) -> str: # Generate links references. link_items = '' for link_name, zone_name in sorted(self.links_map.items()): - eras = self.zones_map[zone_name] - link_items += self._generate_link_item(link_name, zone_name) + link_item, link_string_length = self._generate_link_item( + link_name, zone_name) + link_items += link_item + string_length += link_string_length # Estimate size of entire zone info database. num_infos = len(self.zones_map) @@ -802,11 +854,16 @@ def generate_infos_cpp(self) -> str: memory8 = ( string_length + num_eras * self.SIZEOF_ZONE_ERA_8 - + num_infos * self.SIZEOF_ZONE_INFO_8) + + num_infos * self.SIZEOF_ZONE_INFO_8 + ) memory32 = ( string_length + num_eras * self.SIZEOF_ZONE_ERA_32 - + num_infos * self.SIZEOF_ZONE_INFO_32) + + num_infos * self.SIZEOF_ZONE_INFO_32 + ) + if self.fat_links: + memory8 += num_links * self.SIZEOF_ZONE_INFO_8 + memory32 += num_links * self.SIZEOF_ZONE_INFO_32 return self.ZONE_INFOS_CPP_FILE.format( invocation=self.invocation, @@ -910,13 +967,36 @@ def _generate_era_item( return (era_item, string_length) - def _generate_link_item(self, link_name: str, zone_name: str) -> str: - return self.ZONE_INFOS_CPP_LINK_ITEM.format( - scope=self.scope, - linkFullName=link_name, - linkNormalizedName=normalize_name(link_name), - zoneFullName=zone_name, - zoneNormalizedName=normalize_name(zone_name)) + def _generate_link_item( + self, link_name: str, zone_name: str, + ) -> Tuple[str, int]: + """Return the Link item (whose format depends on --fat_link), + and the amount of string space consumed by this Link entry. + """ + if self.fat_links: + link_item = self.ZONE_INFOS_CPP_FAT_LINK_ITEM.format( + scope=self.scope, + linkFullName=link_name, + linkNormalizedName=normalize_name(link_name), + linkId=self.link_ids[link_name], + zoneFullName=zone_name, + zoneNormalizedName=normalize_name(zone_name), + transitionBufSize=self.buf_sizes[zone_name], + numEras=len(self.zones_map[zone_name]), + progmem='ACE_TIME_PROGMEM', + ) + string_length = len(link_name) + 1 + else: + link_item = self.ZONE_INFOS_CPP_LINK_ITEM.format( + scope=self.scope, + linkFullName=link_name, + linkNormalizedName=normalize_name(link_name), + zoneFullName=zone_name, + zoneNormalizedName=normalize_name(zone_name), + ) + string_length = 0 + + return link_item, string_length class ZoneRegistryGenerator: diff --git a/tools/transformer/artransformer.py b/tools/transformer/artransformer.py index 910d1c0c3..cd5dc4d4c 100644 --- a/tools/transformer/artransformer.py +++ b/tools/transformer/artransformer.py @@ -12,6 +12,7 @@ from transformer.transformer import hash_name from data_types.at_types import ZonesMap from data_types.at_types import PoliciesMap +from data_types.at_types import LinksMap from data_types.at_types import LettersPerPolicy from data_types.at_types import IndexMap from data_types.at_types import TransformerResult @@ -39,13 +40,14 @@ def __init__( until_year: int, ) -> None: self.tresult = tresult - self.zones_map = tresult.zones_map - self.policies_map = tresult.policies_map - self.links_map = tresult.links_map self.scope = scope self.start_year = start_year self.until_year = until_year + self.zones_map = tresult.zones_map + self.policies_map = tresult.policies_map + self.links_map = tresult.links_map + def transform(self) -> None: self.letters_per_policy, self.letters_map = \ _collect_letter_strings(self.policies_map) @@ -53,6 +55,7 @@ def transform(self) -> None: self.policies_map = self._process_rules(self.policies_map) self.zones_map = self._process_eras(self.zones_map) self.zone_ids = _generate_zone_ids(self.zones_map) + self.link_ids = _generate_link_ids(self.links_map) def get_data(self) -> TransformerResult: return TransformerResult( @@ -66,6 +69,7 @@ def get_data(self) -> TransformerResult: notable_policies=self.tresult.notable_policies, notable_links=self.tresult.notable_links, zone_ids=self.zone_ids, + link_ids=self.link_ids, letters_per_policy=self.letters_per_policy, letters_map=self.letters_map, formats_map=self.formats_map, @@ -443,7 +447,17 @@ def _to_letter_index( return letter_index -def _generate_zone_ids(zones_map: ZonesMap) -> Dict[str, int]: - """Generate {zoneName -> zoneId} map.""" +def _generate_zone_ids( + zones_map: ZonesMap, +) -> Dict[str, int]: + """Generate {zoneName -> zoneId} map of zones.""" ids: Dict[str, int] = {name: hash_name(name) for name in zones_map.keys()} return OrderedDict(sorted(ids.items())) + + +def _generate_link_ids( + links_map: LinksMap, +) -> Dict[str, int]: + """Generate {linkName -> linkId} map of links.""" + ids: Dict[str, int] = {name: hash_name(name) for name in links_map.keys()} + return OrderedDict(sorted(ids.items())) diff --git a/tools/transformer/transformer.py b/tools/transformer/transformer.py index 4f12f5d70..d9850444b 100644 --- a/tools/transformer/transformer.py +++ b/tools/transformer/transformer.py @@ -178,10 +178,11 @@ def get_data(self) -> TransformerResult: notable_zones=self.tresult.notable_zones, notable_policies=self.tresult.notable_policies, notable_links=self.tresult.notable_links, + zone_ids=self.tresult.zone_ids, + link_ids=self.tresult.link_ids, letters_per_policy=self.tresult.letters_per_policy, letters_map=self.tresult.letters_map, formats_map=self.tresult.formats_map, - zone_ids=self.tresult.zone_ids, ) def print_summary(self) -> None: diff --git a/tools/tzcompiler.py b/tools/tzcompiler.py index e32bf6af0..5207b67f0 100755 --- a/tools/tzcompiler.py +++ b/tools/tzcompiler.py @@ -87,6 +87,7 @@ def generate_zonedb( output_dir: str, json_file: str, zidb: ZoneInfoDatabase, + fat_links: bool, ) -> None: """Generate the zonedb/ or zonedbx/ files for Python or Arduino, but probably mostly for Arduino. @@ -108,6 +109,7 @@ def generate_zonedb( invocation=invocation, db_namespace=db_namespace, zidb=zidb, + fat_links=fat_links, ) generator.generate_files(output_dir) @@ -266,6 +268,15 @@ def main() -> None: action='store_true', ) + # Enable fat links to create Link entries which have real ZoneInfo objects, + # instead of being just references to its corresponding Zone entry. The name + # of the Link is preserved, as well as an independent zoneId. + parser.add_argument( + '--fat_links', + help='Generate fat Link entries', + action='store_true', + ) + # Parse the command line arguments args = parser.parse_args() @@ -345,6 +356,7 @@ def main() -> None: notable_policies={}, notable_links={}, zone_ids={}, + link_ids={}, letters_per_policy={}, letters_map={}, formats_map={}, @@ -427,6 +439,7 @@ def main() -> None: output_dir=args.output_dir, zidb=zidb, json_file=args.json_file, + fat_links=args.fat_links, ) else: logging.error(f"Unrecognized action '{args.action}'") diff --git a/tools/validate.py b/tools/validate.py index 76ac65f3c..a7778da66 100755 --- a/tools/validate.py +++ b/tools/validate.py @@ -312,6 +312,7 @@ def main() -> None: notable_policies={}, notable_links={}, zone_ids={}, + link_ids={}, letters_per_policy={}, letters_map={}, formats_map={}, From d519deab97457dcffc737560c3ebf684f3d4060c Mon Sep 17 00:00:00 2001 From: Brian Park Date: Sat, 2 Jan 2021 14:56:06 -0800 Subject: [PATCH 06/74] tools/argenerator.py: Move small template fragments closer to the code that generates them, for easier maintenance --- tools/generator/argenerator.py | 213 +++++++++++++++------------------ 1 file changed, 98 insertions(+), 115 deletions(-) diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index c0533eca3..ad2d08f22 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -172,18 +172,6 @@ class ZonePoliciesGenerator: }} #endif -""" - - ZONE_POLICIES_H_POLICY_ITEM = """\ -extern const {scope}::ZonePolicy kPolicy{policyName}; -""" - - ZONE_POLICIES_H_REMOVED_POLICY_ITEM = """\ -// kPolicy{policyName} ({policyReason}) -""" - - ZONE_POLICIES_H_NOTABLE_POLICY_ITEM = """\ -// kPolicy{policyName} ({policyReason}) """ ZONE_POLICIES_CPP_FILE = """\ @@ -237,27 +225,6 @@ class ZonePoliciesGenerator: {numLetters} /*numLetters*/, }}; -""" - - ZONE_POLICIES_LETTER_ARRAY = """\ -static const char* const kLetters{policyName}[] {progmem} = {{ -{letterItems} -}}; -""" - - ZONE_POLICIES_CPP_RULE_ITEM = """\ - // {raw_line} - {{ - {from_year_tiny} /*fromYearTiny*/, - {to_year_tiny} /*toYearTiny*/, - {in_month} /*inMonth*/, - {on_day_of_week} /*onDayOfWeek*/, - {on_day_of_month} /*onDayOfMonth*/, - {at_time_code} /*atTimeCode*/, - {at_time_modifier} /*atTimeModifier ({at_time_modifier_comment})*/, - {delta_code} /*deltaCode ({delta_code_comment})*/, - {letter} /*letter{letterComment}*/, - }}, """ SIZEOF_ZONE_RULE_8 = 9 @@ -296,25 +263,32 @@ def __init__( self.db_header_namespace = self.db_namespace.upper() def generate_policies_h(self) -> str: + ZONE_POLICIES_H_POLICY_ITEM = """\ +extern const {scope}::ZonePolicy kPolicy{policyName}; +""" policy_items = '' for name, rules in sorted(self.policies_map.items()): - policy_items += self.ZONE_POLICIES_H_POLICY_ITEM.format( + policy_items += ZONE_POLICIES_H_POLICY_ITEM.format( policyName=normalize_name(name), scope=self.scope) + ZONE_POLICIES_H_REMOVED_POLICY_ITEM = """\ +// kPolicy{policyName} ({policyReason}) +""" removed_policy_items = '' for name, reasons in sorted(self.removed_policies.items()): - removed_policy_items += \ - self.ZONE_POLICIES_H_REMOVED_POLICY_ITEM.format( - policyName=name, - policyReason=', '.join(reasons)) + removed_policy_items += ZONE_POLICIES_H_REMOVED_POLICY_ITEM.format( + policyName=name, + policyReason=', '.join(reasons)) + ZONE_POLICIES_H_NOTABLE_POLICY_ITEM = """\ +// kPolicy{policyName} ({policyReason}) +""" notable_policy_items = '' for name, reasons in sorted(self.notable_policies.items()): - notable_policy_items += \ - self.ZONE_POLICIES_H_NOTABLE_POLICY_ITEM.format( - policyName=name, - policyReason=', '.join(reasons)) + notable_policy_items += ZONE_POLICIES_H_NOTABLE_POLICY_ITEM.format( + policyName=name, + policyReason=', '.join(reasons)) return self.ZONE_POLICIES_H_FILE.format( invocation=self.invocation, @@ -364,6 +338,25 @@ def _generate_policy_item( rules: List[ZoneRuleRaw], indexed_letters: Optional[IndexMap], ) -> Tuple[str, int, int]: + ZONE_POLICIES_CPP_RULE_ITEM = """\ + // {raw_line} + {{ + {from_year_tiny} /*fromYearTiny*/, + {to_year_tiny} /*toYearTiny*/, + {in_month} /*inMonth*/, + {on_day_of_week} /*onDayOfWeek*/, + {on_day_of_month} /*onDayOfMonth*/, + {at_time_code} /*atTimeCode*/, + {at_time_modifier} /*atTimeModifier ({at_time_modifier_comment})*/, + {delta_code} /*deltaCode ({delta_code_comment})*/, + {letter} /*letter{letterComment}*/, + }}, +""" + ZONE_POLICIES_LETTER_ARRAY = """\ +static const char* const kLetters{policyName}[] {progmem} = {{ +{letterItems} +}}; +""" # Generate kZoneRules*[] rule_items = '' @@ -403,7 +396,7 @@ def _generate_policy_item( 'len(%s) == 0; should not happen' % rule['letter']) - rule_items += self.ZONE_POLICIES_CPP_RULE_ITEM.format( + rule_items += ZONE_POLICIES_CPP_RULE_ITEM.format( raw_line=normalize_raw(rule['raw_line']), from_year_tiny=from_year_tiny, to_year_tiny=to_year_tiny, @@ -431,7 +424,7 @@ def _generate_policy_item( letterItems += f' /*{index}*/ "{name}",\n' memory_letters8 += len(name) + 1 + 2 # NUL terminated memory_letters32 += len(name) + 1 + 4 # NUL terminated - letter_array = self.ZONE_POLICIES_LETTER_ARRAY.format( + letter_array = ZONE_POLICIES_LETTER_ARRAY.format( policyName=policy_name, letterItems=letterItems, progmem='ACE_TIME_PROGMEM') @@ -541,44 +534,6 @@ class ZoneInfosGenerator: }} #endif -""" - - ZONE_INFOS_H_INFO_ITEM = """\ -extern const {scope}::ZoneInfo kZone{zoneNormalizedName}; // {zoneFullName} -""" - - ZONE_INFOS_H_INFO_ZONE_ID = """\ -const uint32_t kZoneId{zoneNormalizedName} = 0x{zoneId:08x}; // {zoneFullName} -""" - - ZONE_INFOS_H_FAT_LINK_ITEM = """\ -extern const {scope}::ZoneInfo kZone{linkNormalizedName}; \ -// {linkFullName} -> {zoneFullName} -""" - - ZONE_INFOS_H_LINK_ITEM = """\ -extern const {scope}::ZoneInfo& kZone{linkNormalizedName}; \ -// {linkFullName} -> {zoneFullName} -""" - - ZONE_INFOS_H_LINK_ID = """\ -const uint32_t kZoneId{linkNormalizedName} = 0x{linkId:08x}; // {linkFullName} -""" - - ZONE_INFOS_H_REMOVED_INFO_ITEM = """\ -// {zoneFullName} ({reason}) -""" - - ZONE_INFOS_H_NOTABLE_INFO_ITEM = """\ -// {zoneFullName} ({reason}) -""" - - ZONE_INFOS_H_REMOVED_LINK_ITEM = """\ -// {linkFullName} ({reason}) -""" - - ZONE_INFOS_H_NOTABLE_LINK_ITEM = """\ -// {linkFullName} ({reason}) """ ZONE_INFOS_CPP_FILE = """\ @@ -675,28 +630,6 @@ class ZoneInfosGenerator: }}, """ # noqa - ZONE_INFOS_CPP_LINK_ITEM = """\ -const {scope}::ZoneInfo& kZone{linkNormalizedName} = kZone{zoneNormalizedName}; -""" - - ZONE_INFOS_CPP_FAT_LINK_ITEM = """\ -//--------------------------------------------------------------------------- -// Link name: {linkFullName} -> {zoneFullName} -//--------------------------------------------------------------------------- - -static const char kZoneName{linkNormalizedName}[] {progmem} = "{linkFullName}"; - -const {scope}::ZoneInfo kZone{linkNormalizedName} {progmem} = {{ - kZoneName{linkNormalizedName} /*name*/, - 0x{linkId:08x} /*zoneId*/, - &kZoneContext /*zoneContext*/, - {transitionBufSize} /*transitionBufSize*/, - {numEras} /*numEras*/, - kZoneEra{zoneNormalizedName} /*eras*/, -}}; - -""" - SIZEOF_ZONE_ERA_8 = 11 SIZEOF_ZONE_ERA_32 = 16 SIZEOF_ZONE_INFO_8 = 12 @@ -749,60 +682,89 @@ def __init__( self.db_header_namespace = self.db_namespace.upper() def generate_infos_h(self) -> str: + ZONE_INFOS_H_INFO_ITEM = """\ +extern const {scope}::ZoneInfo kZone{zoneNormalizedName}; // {zoneFullName} +""" + ZONE_INFOS_H_INFO_ZONE_ID = """\ +const uint32_t kZoneId{zoneNormalizedName} = 0x{zoneId:08x}; // {zoneFullName} +""" info_items = '' info_zone_ids = '' for zone_name, eras in sorted(self.zones_map.items()): - info_items += self.ZONE_INFOS_H_INFO_ITEM.format( + info_items += ZONE_INFOS_H_INFO_ITEM.format( scope=self.scope, zoneNormalizedName=normalize_name(zone_name), zoneFullName=zone_name, ) - info_zone_ids += self.ZONE_INFOS_H_INFO_ZONE_ID.format( + info_zone_ids += ZONE_INFOS_H_INFO_ZONE_ID.format( zoneNormalizedName=normalize_name(zone_name), zoneFullName=zone_name, zoneId=self.zone_ids[zone_name], ) + ZONE_INFOS_H_FAT_LINK_ITEM = """\ +extern const {scope}::ZoneInfo kZone{linkNormalizedName}; \ +// {linkFullName} -> {zoneFullName} +""" + ZONE_INFOS_H_LINK_ID = """\ +const uint32_t kZoneId{linkNormalizedName} = 0x{linkId:08x}; // {linkFullName} +""" + ZONE_INFOS_H_LINK_ITEM = """\ +extern const {scope}::ZoneInfo& kZone{linkNormalizedName}; \ +// {linkFullName} -> {zoneFullName} +""" link_items = '' link_ids = '' if self.fat_links: for link_name, zone_name in sorted(self.links_map.items()): - link_items += self.ZONE_INFOS_H_FAT_LINK_ITEM.format( + link_items += ZONE_INFOS_H_FAT_LINK_ITEM.format( scope=self.scope, linkNormalizedName=normalize_name(link_name), linkFullName=link_name, zoneFullName=zone_name) - link_ids += self.ZONE_INFOS_H_LINK_ID.format( + link_ids += ZONE_INFOS_H_LINK_ID.format( linkNormalizedName=normalize_name(link_name), linkFullName=link_name, linkId=self.link_ids[link_name], ) else: for link_name, zone_name in sorted(self.links_map.items()): - link_items += self.ZONE_INFOS_H_LINK_ITEM.format( + link_items += ZONE_INFOS_H_LINK_ITEM.format( scope=self.scope, linkNormalizedName=normalize_name(link_name), linkFullName=link_name, zoneFullName=zone_name) + ZONE_INFOS_H_REMOVED_INFO_ITEM = """\ +// {zoneFullName} ({reason}) +""" removed_info_items = '' for zone_name, reasons in sorted(self.removed_zones.items()): - removed_info_items += self.ZONE_INFOS_H_REMOVED_INFO_ITEM.format( + removed_info_items += ZONE_INFOS_H_REMOVED_INFO_ITEM.format( zoneFullName=zone_name, reason=', '.join(reasons)) + ZONE_INFOS_H_NOTABLE_INFO_ITEM = """\ +// {zoneFullName} ({reason}) +""" notable_info_items = '' for zone_name, reasons in sorted(self.notable_zones.items()): - notable_info_items += self.ZONE_INFOS_H_NOTABLE_INFO_ITEM.format( + notable_info_items += ZONE_INFOS_H_NOTABLE_INFO_ITEM.format( zoneFullName=zone_name, reason=', '.join(reasons)) + ZONE_INFOS_H_REMOVED_LINK_ITEM = """\ +// {linkFullName} ({reason}) +""" removed_link_items = '' for link_name, reasons in sorted(self.removed_links.items()): - removed_link_items += self.ZONE_INFOS_H_REMOVED_LINK_ITEM.format( + removed_link_items += ZONE_INFOS_H_REMOVED_LINK_ITEM.format( linkFullName=link_name, reason=', '.join(reasons)) + ZONE_INFOS_H_NOTABLE_LINK_ITEM = """\ +// {linkFullName} ({reason}) +""" notable_link_items = '' for link_name, reasons in sorted(self.notable_links.items()): - notable_link_items += self.ZONE_INFOS_H_NOTABLE_LINK_ITEM.format( + notable_link_items += ZONE_INFOS_H_NOTABLE_LINK_ITEM.format( linkFullName=link_name, reason=', '.join(reasons)) return self.ZONE_INFOS_H_FILE.format( @@ -973,8 +935,29 @@ def _generate_link_item( """Return the Link item (whose format depends on --fat_link), and the amount of string space consumed by this Link entry. """ + ZONE_INFOS_CPP_FAT_LINK_ITEM = """\ +//--------------------------------------------------------------------------- +// Link name: {linkFullName} -> {zoneFullName} +//--------------------------------------------------------------------------- + +static const char kZoneName{linkNormalizedName}[] {progmem} = "{linkFullName}"; + +const {scope}::ZoneInfo kZone{linkNormalizedName} {progmem} = {{ + kZoneName{linkNormalizedName} /*name*/, + 0x{linkId:08x} /*zoneId*/, + &kZoneContext /*zoneContext*/, + {transitionBufSize} /*transitionBufSize*/, + {numEras} /*numEras*/, + kZoneEra{zoneNormalizedName} /*eras*/, +}}; + +""" + ZONE_INFOS_CPP_LINK_ITEM = """\ +const {scope}::ZoneInfo& kZone{linkNormalizedName} = kZone{zoneNormalizedName}; +""" + if self.fat_links: - link_item = self.ZONE_INFOS_CPP_FAT_LINK_ITEM.format( + link_item = ZONE_INFOS_CPP_FAT_LINK_ITEM.format( scope=self.scope, linkFullName=link_name, linkNormalizedName=normalize_name(link_name), @@ -987,7 +970,7 @@ def _generate_link_item( ) string_length = len(link_name) + 1 else: - link_item = self.ZONE_INFOS_CPP_LINK_ITEM.format( + link_item = ZONE_INFOS_CPP_LINK_ITEM.format( scope=self.scope, linkFullName=link_name, linkNormalizedName=normalize_name(link_name), From 54a3fb46c00ed6332afd5e3e136b2c43bc944459 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Sat, 2 Jan 2021 15:24:54 -0800 Subject: [PATCH 07/74] src/zonedb,zonedbx: Sync flags, no data change, still 2020f --- src/ace_time/zonedb/Makefile | 2 ++ src/ace_time/zonedb/zone_infos.h | 2 ++ src/ace_time/zonedbx/Makefile | 2 ++ src/ace_time/zonedbx/zone_infos.h | 2 ++ 4 files changed, 8 insertions(+) diff --git a/src/ace_time/zonedb/Makefile b/src/ace_time/zonedb/Makefile index 67642ac24..1140d0c51 100644 --- a/src/ace_time/zonedb/Makefile +++ b/src/ace_time/zonedb/Makefile @@ -7,6 +7,7 @@ UNTIL_YEAR = 2050 all: ../../../tools/tzcompiler.sh \ --tag $(TZ_VERSION) \ + --action zonedb \ --language arduino \ --scope basic \ --start_year $(START_YEAR) \ @@ -15,6 +16,7 @@ all: zonedb.json: ../../../tools/tzcompiler.sh \ --tag $(TZ_VERSION) \ + --action zonedb \ --language json \ --scope basic \ --start_year $(START_YEAR) \ diff --git a/src/ace_time/zonedb/zone_infos.h b/src/ace_time/zonedb/zone_infos.h index f25e15f31..9b1f0b91f 100644 --- a/src/ace_time/zonedb/zone_infos.h +++ b/src/ace_time/zonedb/zone_infos.h @@ -773,6 +773,8 @@ extern const basic::ZoneInfo& kZoneUniversal; // Universal -> Etc/UTC extern const basic::ZoneInfo& kZoneZulu; // Zulu -> Etc/UTC + + //--------------------------------------------------------------------------- // Unsupported zones: 120 //--------------------------------------------------------------------------- diff --git a/src/ace_time/zonedbx/Makefile b/src/ace_time/zonedbx/Makefile index 19225f9f5..055c881df 100644 --- a/src/ace_time/zonedbx/Makefile +++ b/src/ace_time/zonedbx/Makefile @@ -7,6 +7,7 @@ UNTIL_YEAR = 2050 all: ../../../tools/tzcompiler.sh \ --tag $(TZ_VERSION) \ + --action zonedb \ --language arduino \ --scope extended \ --start_year $(START_YEAR) \ @@ -15,6 +16,7 @@ all: zonedbx.json: ../../../tools/tzcompiler.sh \ --tag $(TZ_VERSION) \ + --action zonedb \ --language json \ --scope extended \ --start_year $(START_YEAR) \ diff --git a/src/ace_time/zonedbx/zone_infos.h b/src/ace_time/zonedbx/zone_infos.h index 834ae9ca8..b5c517ec0 100644 --- a/src/ace_time/zonedbx/zone_infos.h +++ b/src/ace_time/zonedbx/zone_infos.h @@ -1037,6 +1037,8 @@ extern const extended::ZoneInfo& kZoneW_SU; // W-SU -> Europe/Moscow extern const extended::ZoneInfo& kZoneZulu; // Zulu -> Etc/UTC + + //--------------------------------------------------------------------------- // Unsupported zones: 0 //--------------------------------------------------------------------------- From acabc184c7ef5a84ba81d61ac5e2d7288c38bb37 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Sat, 2 Jan 2021 15:26:23 -0800 Subject: [PATCH 08/74] CHANGELOG.md: Add experimental --fat_links flag --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a53db6fd7..881178a74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog * Unreleased + * Experimental `--fat_links` flag when generating zonedb and zonedbx files. * 1.4.1 (2020-12-30, TZDB version 2020f for real) * Actually update `src/ace_time/zonedb` and `src/ace_time/zonedbx` zone info files to 2020f. Oops. From de0f3a42debd26b57b63c79292a7beac11ade239 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 4 Jan 2021 14:53:34 -0800 Subject: [PATCH 09/74] AutoBenchmark: Extract common runEmptyLoopMillis() fragment into helper function --- examples/AutoBenchmark/Benchmark.cpp | 46 +++++++++------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/examples/AutoBenchmark/Benchmark.cpp b/examples/AutoBenchmark/Benchmark.cpp index 5ffaff81e..167b1a66c 100644 --- a/examples/AutoBenchmark/Benchmark.cpp +++ b/examples/AutoBenchmark/Benchmark.cpp @@ -18,7 +18,7 @@ const uint32_t COUNT = 100000; const uint32_t COUNT = 100000; #elif defined(UNIX_HOST_DUINO) // Linux or MacOS -const uint32_t COUNT = 100000; +const uint32_t COUNT = 200000; #else // A generic Arduino board that we have not looked at. const uint32_t COUNT = 10000; @@ -115,11 +115,16 @@ static void printMicrosPerIteration(long elapsedMillis) { ace_common::printPad3To(SERIAL_PORT_MONITOR, frac, '0'); } -static void runEmptyLoop() { - unsigned long emptyLoopMillis = runLambda(COUNT, []() { +// Return how long the empty lookup takes. +unsigned long runEmptyLoopMillis() { + return runLambda(COUNT, []() { unsigned long tickMillis = millis(); disableOptimization(tickMillis); }); +} + +static void runEmptyLoop() { + unsigned long emptyLoopMillis = runEmptyLoopMillis(); SERIAL_PORT_MONITOR.print(F("EmptyLoop")); printMicrosPerIteration(emptyLoopMillis); SERIAL_PORT_MONITOR.println(); @@ -132,10 +137,7 @@ static void runLocalDateForEpochDays() { LocalDate localDate = LocalDate::forEpochDays(fakeEpochDays); disableOptimization(localDate); }); - unsigned long emptyLoopMillis = runLambda(COUNT, []() { - unsigned long emptyMillis = millis(); - disableOptimization(emptyMillis); - }); + unsigned long emptyLoopMillis = runEmptyLoopMillis(); long elapsedMillis = localDateForDaysMillis - emptyLoopMillis; SERIAL_PORT_MONITOR.print(F("LocalDate::forEpochDays()")); @@ -192,10 +194,7 @@ static void runOffsetDateTimeForEpochSeconds() { fakeEpochSeconds, TimeOffset()); disableOptimization(odt); }); - unsigned long emptyLoopMillis = runLambda(COUNT, []() { - unsigned long emptyMillis = millis(); - disableOptimization(emptyMillis); - }); + unsigned long emptyLoopMillis = runEmptyLoopMillis(); long elapsedMillis = localDateForDaysMillis - emptyLoopMillis; SERIAL_PORT_MONITOR.print(F("OffsetDateTime::forEpochSeconds()")); @@ -233,10 +232,7 @@ static void runZonedDateTimeForEpochSeconds() { TimeZone()); disableOptimization(dateTime); }); - unsigned long emptyLoopMillis = runLambda(COUNT, []() { - unsigned long emptyMillis = millis(); - disableOptimization(emptyMillis); - }); + unsigned long emptyLoopMillis = runEmptyLoopMillis(); long elapsedMillis = forEpochSecondsMillis - emptyLoopMillis; SERIAL_PORT_MONITOR.print(F("ZonedDateTime::forEpochSeconds(UTC)")); @@ -314,10 +310,7 @@ static void runZonedDateTimeForEpochSecondsBasicZoneManager() { fakeEpochSeconds, tzLosAngeles); disableOptimization(dateTime); }); - unsigned long emptyLoopMillis = runLambda(COUNT, []() { - unsigned long fakeEpochSeconds = millis(); - disableOptimization(fakeEpochSeconds); - }); + unsigned long emptyLoopMillis = runEmptyLoopMillis(); long elapsedMillis = forEpochSecondsMillis - emptyLoopMillis; SERIAL_PORT_MONITOR.print(F("ZonedDateTime::forEpochSeconds(Basic_nocache)")); @@ -337,10 +330,7 @@ static void runZonedDateTimeForEpochSecondsBasicZoneManagerCached() { fakeEpochSeconds, tzLosAngeles); disableOptimization(dateTime); }); - unsigned long emptyLoopMillis = runLambda(COUNT, []() { - unsigned long fakeEpochSeconds = millis(); - disableOptimization(fakeEpochSeconds); - }); + unsigned long emptyLoopMillis = runEmptyLoopMillis(); long elapsedMillis = forEpochSecondsMillis - emptyLoopMillis; SERIAL_PORT_MONITOR.print(F("ZonedDateTime::forEpochSeconds(Basic_cached)")); @@ -374,10 +364,7 @@ static void runZonedDateTimeForEpochSecondsExtendedZoneManager() { fakeEpochSeconds, tzLosAngeles); disableOptimization(dateTime); }); - unsigned long emptyLoopMillis = runLambda(COUNT, []() { - unsigned long fakeEpochSeconds = millis(); - disableOptimization(fakeEpochSeconds); - }); + unsigned long emptyLoopMillis = runEmptyLoopMillis(); long elapsedMillis = forEpochSecondsMillis - emptyLoopMillis; SERIAL_PORT_MONITOR.print( @@ -399,10 +386,7 @@ static void runZonedDateTimeForEpochSecondsExtendedZoneManagerCached() { fakeEpochSeconds, tzLosAngeles); disableOptimization(dateTime); }); - unsigned long emptyLoopMillis = runLambda(COUNT, []() { - unsigned long fakeEpochSeconds = millis(); - disableOptimization(fakeEpochSeconds); - }); + unsigned long emptyLoopMillis = runEmptyLoopMillis(); long elapsedMillis = forEpochSecondsMillis - emptyLoopMillis; SERIAL_PORT_MONITOR.print( From 34c31d5a3337e67af123ddbeadfa786839ed06ff Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 4 Jan 2021 16:13:57 -0800 Subject: [PATCH 10/74] src/ZoneRegistrar.h: Fix bug in binarySearchByName() that could cause an infinite loop --- src/ace_time/ZoneRegistrar.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/ace_time/ZoneRegistrar.h b/src/ace_time/ZoneRegistrar.h index 3f7bdb058..c2a846a32 100644 --- a/src/ace_time/ZoneRegistrar.h +++ b/src/ace_time/ZoneRegistrar.h @@ -159,25 +159,32 @@ class ZoneRegistrar { /** * Find the registry index corresponding to name using a binary search. - * Returns kInvalidIndex if not found. + * Returns kInvalidIndex if not found. The largest registrySize is + * UINT16_MAX (so that the highest index is UINT16_MAX - 1), since + * UINT16_MAX is equal to kInvalidIndex which is used to indicate "Not + * Found". + * + * See also https://www.solipsys.co.uk/new/BinarySearchReconsidered.html + * which shows how hard it is to write a binary search correctly. I got it + * wrong in my first iteration. */ static uint16_t binarySearchByName(const ZI* const* registry, uint16_t registrySize, const char* name) { uint16_t a = 0; uint16_t b = registrySize - 1; const ZRB zoneRegistry(registry); - while (true) { - uint16_t c = (a + b) / 2; + while (a <= b) { + uint16_t c = a + (b - a) / 2; const ZI* zoneInfo = zoneRegistry.zoneInfo(c); int8_t compare = STRCMP_P(name, ZIB(zoneInfo).name()); if (compare == 0) return c; - if (a == b) return kInvalidIndex; if (compare < 0) { b = c - 1; } else { a = c + 1; } } + return kInvalidIndex; } /** Find the registry index corresponding to id using linear search. */ From 1759e8df791eb829ecb3cb11357296276665331c Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 4 Jan 2021 16:15:24 -0800 Subject: [PATCH 11/74] AutoBenchmark: Add benchmarks for ZoneManager::indexForZoneName() and indexForZoneId() --- examples/AutoBenchmark/Benchmark.cpp | 79 +++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/examples/AutoBenchmark/Benchmark.cpp b/examples/AutoBenchmark/Benchmark.cpp index 167b1a66c..d69a7c4a4 100644 --- a/examples/AutoBenchmark/Benchmark.cpp +++ b/examples/AutoBenchmark/Benchmark.cpp @@ -1,10 +1,12 @@ +#include #include #include -#include +#include // PrintStr #include #include "Benchmark.h" using namespace ace_time; +using ace_common::PrintStr; #if defined(ARDUINO_ARCH_AVR) const uint32_t COUNT = 2500; @@ -395,6 +397,76 @@ static void runZonedDateTimeForEpochSecondsExtendedZoneManagerCached() { SERIAL_PORT_MONITOR.println(); } +// These are too big for small AVR chips +#if ! defined(ARDUINO_ARCH_AVR) + +static void runIndexForZoneName() { + ExtendedZoneManager<2> manager( + zonedbx::kZoneRegistrySize, zonedbx::kZoneRegistry); + + unsigned long runMillis = runLambda(COUNT, [&manager]() { + PrintStr<20> printStr; // deliberately short to truncate some zones + uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); + const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; + const __FlashStringHelper* name = ExtendedZone(info).name(); + printStr.print(name); + + uint16_t index = manager.indexForZoneName(printStr.getCstr()); + disableOptimization(index); + }); + + unsigned long emptyLoopMillis = runLambda(COUNT, [&manager]() { + PrintStr<20> printStr; // deliberately short to truncate some zones + uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); + const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; + const __FlashStringHelper* name = ExtendedZone(info).name(); + printStr.print(name); + + uint16_t len = printStr.length(); + const char* s = printStr.getCstr(); + uint32_t tmp = s[0] + + ((len > 1) ? ((uint32_t) s[1] << 8) : 0) + + ((len > 2) ? ((uint32_t) s[2] << 16) : 0) + + ((len > 3) ? ((uint32_t) s[3] << 24) : 0); + disableOptimization((uint32_t) tmp); + }); + + long elapsedMillis = runMillis - emptyLoopMillis; + + SERIAL_PORT_MONITOR.print(F("ExtendedZoneManager::indexForZoneName()")); + printMicrosPerIteration(elapsedMillis); + SERIAL_PORT_MONITOR.println(); +} + +static void runIndexForZoneId() { + ExtendedZoneManager<2> manager( + zonedbx::kZoneRegistrySize, zonedbx::kZoneRegistry); + unsigned long runMillis = runLambda(COUNT, [&manager]() { + uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); + const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; + uint32_t zoneId = ExtendedZone(info).zoneId(); + + uint16_t index = manager.indexForZoneId(zoneId); + disableOptimization(index); + }); + + unsigned long emptyLoopMillis = runLambda(COUNT, [&manager]() { + uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); + const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; + uint32_t zoneId = ExtendedZone(info).zoneId(); + + disableOptimization(zoneId); + }); + + long elapsedMillis = runMillis - emptyLoopMillis; + + SERIAL_PORT_MONITOR.print(F("ExtendedZoneManager::indexForZoneId()")); + printMicrosPerIteration(elapsedMillis); + SERIAL_PORT_MONITOR.println(); +} + +#endif // defined(ARDUINO_ARCH_AVR) + void runBenchmarks() { runEmptyLoop(); @@ -414,6 +486,11 @@ void runBenchmarks() { runZonedDateTimeForEpochSecondsExtendedZoneManager(); runZonedDateTimeForEpochSecondsExtendedZoneManagerCached(); +#if ! defined(ARDUINO_ARCH_AVR) + runIndexForZoneName(); + runIndexForZoneId(); +#endif + SERIAL_PORT_MONITOR.print(F("Iterations_per_run ")); SERIAL_PORT_MONITOR.println(COUNT); } From 554bdde6e3fd511bcf7fdcec902cad39d617727d Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 4 Jan 2021 14:28:57 -0800 Subject: [PATCH 12/74] src/ZoneRegistrar.h: Reimplement findIndexForName() using zoneId lookup, followed by string compare to detect hash collision --- src/ace_time/ZoneRegistrar.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ace_time/ZoneRegistrar.h b/src/ace_time/ZoneRegistrar.h index c2a846a32..46c1f68f4 100644 --- a/src/ace_time/ZoneRegistrar.h +++ b/src/ace_time/ZoneRegistrar.h @@ -92,10 +92,16 @@ class ZoneRegistrar { /** Find the index for zone name. Return kInvalidIndex if not found. */ uint16_t findIndexForName(const char* name) const { - if (mIsSorted && mRegistrySize >= kBinarySearchThreshold) { - return binarySearchByName(mZoneRegistry, mRegistrySize, name); + uint32_t zoneId = ace_common::hashDjb2(name); + uint16_t index = findIndexForId(zoneId); + if (index == kInvalidIndex) return kInvalidIndex; + + // Verify that the zoneName actually matches, in case of hash collision. + const char* foundName = ZIB(ZRB(mZoneRegistry).zoneInfo(index)).name(); + if (STRCMP_P(name, foundName) == 0) { + return index; } else { - return linearSearchByName(mZoneRegistry, mRegistrySize, name); + return kInvalidIndex; } } From 605324b2ce4119ff547defb159f78fef47ed147d Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 4 Jan 2021 19:11:09 -0800 Subject: [PATCH 13/74] src/ZoneRegistrar.h: Perform binarySearch on zoneId not zoneName; fix binarySearch() algorithm --- src/ace_time/ZoneRegistrar.h | 113 +++++++------- .../BasicZoneRegistrarTest.ino | 145 ++++++++---------- .../ExtendedZoneRegistrarTest.ino | 6 +- 3 files changed, 124 insertions(+), 140 deletions(-) diff --git a/src/ace_time/ZoneRegistrar.h b/src/ace_time/ZoneRegistrar.h index 46c1f68f4..a22cf69ec 100644 --- a/src/ace_time/ZoneRegistrar.h +++ b/src/ace_time/ZoneRegistrar.h @@ -14,17 +14,12 @@ #include "internal/Brokers.h" class BasicZoneRegistrarTest_Sorted_isSorted; -class BasicZoneRegistrarTest_Sorted_linearSearchByName; -class BasicZoneRegistrarTest_Sorted_linearSearchByName_not_found; -class BasicZoneRegistrarTest_Sorted_binarySearchByName; -class BasicZoneRegistrarTest_Sorted_binarySearchByName_not_found; +class BasicZoneRegistrarTest_Unsorted_isSorted; class BasicZoneRegistrarTest_Sorted_linearSearchById; class BasicZoneRegistrarTest_Sorted_linearSearchById_not_found; -class BasicZoneRegistrarTest_Unsorted_isSorted; -class BasicZoneRegistrarTest_Unsorted_linearSearchByName; -class BasicZoneRegistrarTest_Unsorted_linearSearchByName_not_found; -class BasicZoneRegistrarTest_Unsorted_binarySearchByName; -class BasicZoneRegistrarTest_Unsorted_binarySearchByName_not_found; +class BasicZoneRegistrarTest_Sorted_binarySearchById_zeroEntries; +class BasicZoneRegistrarTest_Sorted_binarySearchById; +class BasicZoneRegistrarTest_Sorted_binarySearchById_not_found; class BasicZoneRegistrarTest_Unsorted_linearSearchById; class BasicZoneRegistrarTest_Unsorted_linearSearchById_not_found; @@ -56,8 +51,8 @@ class ZoneRegistrar { /** Constructor. */ ZoneRegistrar(uint16_t registrySize, const ZI* const* zoneRegistry): mRegistrySize(registrySize), - mZoneRegistry(zoneRegistry), - mIsSorted(isSorted(zoneRegistry, registrySize)) {} + mIsSorted(isSorted(zoneRegistry, registrySize)), + mZoneRegistry(zoneRegistry) {} /** Return the number of zones. */ uint16_t registrySize() const { return mRegistrySize; } @@ -107,56 +102,55 @@ class ZoneRegistrar { /** Find the index for zone id. Return kInvalidIndex if not found. */ uint16_t findIndexForId(uint32_t zoneId) const { - return linearSearchById(mZoneRegistry, mRegistrySize, zoneId); + if (mIsSorted && mRegistrySize > 8) { + return binarySearchById(mZoneRegistry, mRegistrySize, zoneId); + } else { + return linearSearchById(mZoneRegistry, mRegistrySize, zoneId); + } } protected: friend class ::BasicZoneRegistrarTest_Sorted_isSorted; - friend class ::BasicZoneRegistrarTest_Sorted_linearSearchByName; - friend class ::BasicZoneRegistrarTest_Sorted_linearSearchByName_not_found; - friend class ::BasicZoneRegistrarTest_Sorted_binarySearchByName; - friend class ::BasicZoneRegistrarTest_Sorted_binarySearchByName_not_found; + friend class ::BasicZoneRegistrarTest_Unsorted_isSorted; friend class ::BasicZoneRegistrarTest_Sorted_linearSearchById; friend class ::BasicZoneRegistrarTest_Sorted_linearSearchById_not_found; - friend class ::BasicZoneRegistrarTest_Unsorted_isSorted; - friend class ::BasicZoneRegistrarTest_Unsorted_linearSearchByName; - friend class ::BasicZoneRegistrarTest_Unsorted_linearSearchByName_not_found; - friend class ::BasicZoneRegistrarTest_Unsorted_binarySearchByName; - friend class ::BasicZoneRegistrarTest_Unsorted_binarySearchByName_not_found; + friend class ::BasicZoneRegistrarTest_Sorted_binarySearchById_zeroEntries; + friend class ::BasicZoneRegistrarTest_Sorted_binarySearchById; + friend class ::BasicZoneRegistrarTest_Sorted_binarySearchById_not_found; friend class ::BasicZoneRegistrarTest_Unsorted_linearSearchById; friend class ::BasicZoneRegistrarTest_Unsorted_linearSearchById_not_found; /** Use binarySearch() if registrySize >= threshold. */ static const uint8_t kBinarySearchThreshold = 6; - /** Determine if the given zone registry is sorted by name. */ + /** Determine if the given zone registry is sorted by id. */ static bool isSorted(const ZI* const* registry, uint16_t registrySize) { if (registrySize == 0) { return false; } const ZRB zoneRegistry(registry); - const char* prevName = ZIB(zoneRegistry.zoneInfo(0)).name(); + uint32_t prevId = ZIB(zoneRegistry.zoneInfo(0)).zoneId(); for (uint16_t i = 1; i < registrySize; ++i) { - const char* currName = ZIB(zoneRegistry.zoneInfo(i)).name(); - if (STRCMP_PP(prevName, currName) > 0) { + uint32_t currentId = ZIB(zoneRegistry.zoneInfo(i)).zoneId(); + if (prevId > currentId) { return false; } - prevName = currName; + prevId = currentId; } return true; } /** - * Find the registry index corresponding to name using a linear search. + * Find the registry index corresponding to zoneId using linear search. * Returns kInvalidIndex if not found. */ - static uint16_t linearSearchByName(const ZI* const* registry, - uint16_t registrySize, const char* name) { + static uint16_t linearSearchById(const ZI* const* registry, + uint16_t registrySize, uint32_t zoneId) { const ZRB zoneRegistry(registry); for (uint16_t i = 0; i < registrySize; ++i) { const ZI* zoneInfo = zoneRegistry.zoneInfo(i); - if (STRCMP_P(name, ZIB(zoneInfo).name()) == 0) { + if (zoneId == ZIB(zoneInfo).zoneId()) { return i; } } @@ -164,28 +158,40 @@ class ZoneRegistrar { } /** - * Find the registry index corresponding to name using a binary search. - * Returns kInvalidIndex if not found. The largest registrySize is - * UINT16_MAX (so that the highest index is UINT16_MAX - 1), since - * UINT16_MAX is equal to kInvalidIndex which is used to indicate "Not - * Found". + * Find the registry index corresponding to zoneId using a binary search. + * Returns kInvalidIndex if not found. + * + * The largest registrySize is UINT16_MAX so the largest valid index is + * UINT16_MAX - 1. This allows us to set kInvalidIndex to UINT16_MAX to + * indicate "Not Found". * * See also https://www.solipsys.co.uk/new/BinarySearchReconsidered.html - * which shows how hard it is to write a binary search correctly. I got it - * wrong in my first iteration. + * which shows how hard it is to write a binary search correctly. It took + * me 4 tries to get this right: + * Try 1) There was an infinite loop when searching for a non-existent + * zoneId due to the exit condition located at the wrong spot. + * Try 2) Could not search for zoneId=0 because I was using unsigned + * integers for a and b, and the (c-1) expression underflowed to + * 0xffff. + * Try 3) An infinite loop caused by incorrect lowerbound, should be + * a = c + 1, instead of just a = c. + * Try 4) Finally got it right. I hope! */ - static uint16_t binarySearchByName(const ZI* const* registry, - uint16_t registrySize, const char* name) { + static uint16_t binarySearchById(const ZI* const* registry, + uint16_t registrySize, uint32_t zoneId) { uint16_t a = 0; - uint16_t b = registrySize - 1; + uint16_t b = registrySize; const ZRB zoneRegistry(registry); - while (a <= b) { - uint16_t c = a + (b - a) / 2; + while (true){ + uint16_t diff = b - a; + if (diff == 0) break; + + uint16_t c = a + diff / 2; const ZI* zoneInfo = zoneRegistry.zoneInfo(c); - int8_t compare = STRCMP_P(name, ZIB(zoneInfo).name()); - if (compare == 0) return c; - if (compare < 0) { - b = c - 1; + uint32_t currentId = ZIB(zoneInfo).zoneId(); + if (currentId == zoneId) return c; + if (zoneId < currentId) { + b = c; } else { a = c + 1; } @@ -193,22 +199,9 @@ class ZoneRegistrar { return kInvalidIndex; } - /** Find the registry index corresponding to id using linear search. */ - static uint16_t linearSearchById(const ZI* const* registry, - uint16_t registrySize, uint32_t zoneId) { - const ZRB zoneRegistry(registry); - for (uint16_t i = 0; i < registrySize; ++i) { - const ZI* zoneInfo = zoneRegistry.zoneInfo(i); - if (zoneId == ZIB(zoneInfo).zoneId()) { - return i; - } - } - return kInvalidIndex; - } - uint16_t const mRegistrySize; - const ZI* const* const mZoneRegistry; bool const mIsSorted; + const ZI* const* const mZoneRegistry; }; /** diff --git a/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino b/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino index fbd1afa99..592785568 100644 --- a/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino +++ b/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino @@ -10,26 +10,26 @@ using namespace ace_time; // Define some registries used later on. // -------------------------------------------------------------------------- -const basic::ZoneInfo* const kSortedRegistry[] ACE_TIME_PROGMEM = { - &zonedb::kZoneAmerica_Chicago, - &zonedb::kZoneAmerica_Denver, - &zonedb::kZoneAmerica_Los_Angeles, - &zonedb::kZoneAmerica_New_York, +const uint16_t kNumSortedEntries = 4; + +const basic::ZoneInfo* const kSortedRegistry[kNumSortedEntries] + ACE_TIME_PROGMEM = { + &zonedb::kZoneAmerica_New_York, // 0x1e2a7654 + &zonedb::kZoneAmerica_Chicago, // 0x4b92b5d4 + &zonedb::kZoneAmerica_Denver, // 0x97d10b2a + &zonedb::kZoneAmerica_Los_Angeles, // 0xb7f7e8f2 }; -const uint16_t kNumSortedEntries = - sizeof(kSortedRegistry)/sizeof(basic::ZoneInfo*); +const uint16_t kNumUnsortedEntries = 4; -const basic::ZoneInfo* const kUnsortedRegistry[] ACE_TIME_PROGMEM = { - &zonedb::kZoneAmerica_Chicago, - &zonedb::kZoneAmerica_New_York, - &zonedb::kZoneAmerica_Denver, - &zonedb::kZoneAmerica_Los_Angeles, +const basic::ZoneInfo* const kUnsortedRegistry[kNumUnsortedEntries] + ACE_TIME_PROGMEM = { + &zonedb::kZoneAmerica_Chicago, // 0x4b92b5d4 + &zonedb::kZoneAmerica_Denver, // 0x97d10b2a + &zonedb::kZoneAmerica_Los_Angeles, // 0xb7f7e8f2 + &zonedb::kZoneAmerica_New_York, // 0x1e2a7654 }; -const uint16_t kNumUnsortedEntries = - sizeof(kSortedRegistry)/sizeof(basic::ZoneInfo*); - // -------------------------------------------------------------------------- // Verify that we can use kZoneIdAmerica_Los_Angeles everywhere. @@ -50,7 +50,9 @@ test(BasicZoneRegistrarTest, registrySize) { test(BasicZoneRegistrarTest, getZoneInfo_Los_Angeles) { BasicZoneRegistrar zoneRegistrar( zonedb::kZoneRegistrySize, zonedb::kZoneRegistry); - assertTrue(zoneRegistrar.isSorted()); + // FIXME: tzcompiler.py must be updated to sort the kZoneRegistry using + // zoneId, not zoneName. + //assertTrue(zoneRegistrar.isSorted()); const basic::ZoneInfo* zoneInfo = zoneRegistrar.getZoneInfoForName("America/Los_Angeles"); @@ -64,7 +66,7 @@ test(BasicZoneRegistrarTest, getZoneInfo_not_found) { BasicZoneRegistrar zoneRegistrar( zonedb::kZoneRegistrySize, zonedb::kZoneRegistry); const basic::ZoneInfo* zoneInfo = zoneRegistrar.getZoneInfoForName( - "not found"); + "doesNotExist"); assertEqual(zoneInfo, nullptr); } @@ -109,7 +111,7 @@ test(BasicZoneRegistrarTest, getZoneInfoForId_not_found) { test(BasicZoneRegistrarTest, findIndexForName) { BasicZoneRegistrar zoneRegistrar(kNumSortedEntries, kSortedRegistry); uint16_t index = zoneRegistrar.findIndexForName("America/Los_Angeles"); - assertEqual(2, index); + assertEqual(3, index); } test(BasicZoneRegistrarTest, findIndexForName_not_found) { @@ -122,110 +124,97 @@ test(BasicZoneRegistrarTest, findIndexForId) { BasicZoneRegistrar zoneRegistrar(kNumSortedEntries, kSortedRegistry); uint16_t index = zoneRegistrar.findIndexForId( zonedb::kZoneIdAmerica_Los_Angeles); - assertEqual(2, index); + assertEqual(3, index); } test(BasicZoneRegistrarTest, findIndexForId_not_found) { BasicZoneRegistrar zoneRegistrar(kNumSortedEntries, kSortedRegistry); - uint16_t index = zoneRegistrar.findIndexForId(0x0 /* should not exist */); + uint16_t index = zoneRegistrar.findIndexForId(0x0); assertEqual(BasicZoneRegistrar::kInvalidIndex, index); } // -------------------------------------------------------------------------- -// Test ZoneRegistrar protected methods: ZoneRegistrar::isSorted(), -// binarySearchByName(), linearSearchByName() linearSearchyById() for *sorted* -// registry. Sufficient to test BasicZoneRegistrar only since they are the same -// for ExtendedZoneRegistrar. +// Test ZoneRegistrar::isSorted(). // -------------------------------------------------------------------------- test(BasicZoneRegistrarTest_Sorted, isSorted) { assertTrue(BasicZoneRegistrar::isSorted(kSortedRegistry, kNumSortedEntries)); } -test(BasicZoneRegistrarTest_Sorted, linearSearchByName) { - uint16_t index = BasicZoneRegistrar::linearSearchByName( - kSortedRegistry, kNumSortedEntries, "America/Los_Angeles"); - assertEqual(2, index); -} - -test(BasicZoneRegistrarTest_Sorted, linearSearchByName_not_found) { - uint16_t index = BasicZoneRegistrar::linearSearchByName(kSortedRegistry, - kNumSortedEntries, "America/NotFound"); - assertEqual(BasicZoneRegistrar::kInvalidIndex, index); -} - -test(BasicZoneRegistrarTest_Sorted, binarySearchByName) { - uint16_t index; - - index = BasicZoneRegistrar::binarySearchByName( - kSortedRegistry, kNumSortedEntries, "America/Chicago"); - assertEqual(0, index); - - index = BasicZoneRegistrar::binarySearchByName( - kSortedRegistry, kNumSortedEntries, "America/Denver"); - assertEqual(1, index); - - index = BasicZoneRegistrar::binarySearchByName( - kSortedRegistry, kNumSortedEntries, "America/Los_Angeles"); - assertEqual(2, index); - - index = BasicZoneRegistrar::binarySearchByName( - kSortedRegistry, kNumSortedEntries, "America/New_York"); - assertEqual(3, index); +test(BasicZoneRegistrarTest_Unsorted, isSorted) { + bool isSorted = BasicZoneRegistrar::isSorted( + kUnsortedRegistry, kNumUnsortedEntries); + assertFalse(isSorted); } -test(BasicZoneRegistrarTest_Sorted, binarySearchByName_not_found) { - uint16_t index = BasicZoneRegistrar::binarySearchByName( - kSortedRegistry, kNumSortedEntries, "America/NotFound"); - assertEqual(BasicZoneRegistrar::kInvalidIndex, index); -} +// -------------------------------------------------------------------------- +// BasicZoneRegistrar::linearSearchById() w/ sorted registry. +// -------------------------------------------------------------------------- test(BasicZoneRegistrarTest_Sorted, linearSearchById) { uint16_t index = BasicZoneRegistrar::linearSearchById( kSortedRegistry, kNumSortedEntries, zonedb::kZoneIdAmerica_Los_Angeles); - assertEqual(2, index); + assertEqual(3, index); } test(BasicZoneRegistrarTest_Sorted, linearSearchById_not_found) { uint16_t index = BasicZoneRegistrar::linearSearchById( - kSortedRegistry, kNumSortedEntries, 0 /* hopefully no */); + kSortedRegistry, kNumSortedEntries, 0); assertEqual(BasicZoneRegistrar::kInvalidIndex, index); } // -------------------------------------------------------------------------- -// Test ZoneRegistrar protected methods: ZoneRegistrar::isSorted(), -// binarySearchByName(), linearSearchByName(), and linearSearchById() for -// *unsorted* registry. Sufficient to test BasicZoneRegistrar only since they -// are the same for ExtendedZoneRegistrar. +// BasicZoneRegistrar::binarySearchById() w/ sorted registry. // -------------------------------------------------------------------------- -test(BasicZoneRegistrarTest_Unsorted, isSorted) { - bool isSorted = BasicZoneRegistrar::isSorted( - kUnsortedRegistry, kNumUnsortedEntries); - assertFalse(isSorted); +test(BasicZoneRegistrarTest_Sorted, binarySearchById_zeroEntries) { + uint16_t index = BasicZoneRegistrar::binarySearchById( + kSortedRegistry, + 0 /* kNumSortedEntries */, + zonedb::kZoneIdAmerica_Los_Angeles); + assertEqual(BasicZoneRegistrar::kInvalidIndex, index); } -test(BasicZoneRegistrarTest_Unsorted, linearSearchByName) { - uint16_t index = BasicZoneRegistrar::linearSearchByName( - kUnsortedRegistry, kNumUnsortedEntries, "America/Los_Angeles"); +test(BasicZoneRegistrarTest_Sorted, binarySearchById) { + uint16_t index; + + index = BasicZoneRegistrar::binarySearchById( + kSortedRegistry, kNumSortedEntries, zonedb::kZoneIdAmerica_New_York); + assertEqual(0, index); + + index = BasicZoneRegistrar::binarySearchById( + kSortedRegistry, kNumSortedEntries, zonedb::kZoneIdAmerica_Chicago); + assertEqual(1, index); + + index = BasicZoneRegistrar::binarySearchById( + kSortedRegistry, kNumSortedEntries, zonedb::kZoneIdAmerica_Denver); + assertEqual(2, index); + + index = BasicZoneRegistrar::binarySearchById( + kSortedRegistry, kNumSortedEntries, zonedb::kZoneIdAmerica_Los_Angeles); assertEqual(3, index); } -test(BasicZoneRegistrarTest_Unsorted, linearSearchByName_not_found) { - uint16_t index = BasicZoneRegistrar::linearSearchByName( - kUnsortedRegistry, kNumUnsortedEntries, "America/NotFound"); +test(BasicZoneRegistrarTest_Sorted, binarySearchById_not_found) { + uint16_t index = BasicZoneRegistrar::binarySearchById( + kSortedRegistry, kNumSortedEntries, 0); assertEqual(BasicZoneRegistrar::kInvalidIndex, index); } +// -------------------------------------------------------------------------- +// ZoneRegistrar::linearSearchById() with *unsorted* registry. +// -------------------------------------------------------------------------- + test(BasicZoneRegistrarTest_Unsorted, linearSearchById) { uint16_t index = BasicZoneRegistrar::linearSearchById( - kUnsortedRegistry, kNumSortedEntries, zonedb::kZoneIdAmerica_Los_Angeles); - assertEqual(3, index); + kUnsortedRegistry, kNumUnsortedEntries, + zonedb::kZoneIdAmerica_Los_Angeles); + assertEqual(2, index); } test(BasicZoneRegistrarTest_Unsorted, linearSearchById_not_found) { uint16_t index = BasicZoneRegistrar::linearSearchById( - kUnsortedRegistry, kNumSortedEntries, 0 /* hopefully no */); + kUnsortedRegistry, kNumUnsortedEntries, 0); assertEqual(BasicZoneRegistrar::kInvalidIndex, index); } diff --git a/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino b/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino index 5a0f345a1..d534a1bb0 100644 --- a/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino +++ b/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino @@ -26,7 +26,9 @@ test(ExtendedZoneRegistrarTest, registrySize) { test(ExtendedZoneRegistrarTest, getZoneInfoForName_Los_Angeles) { ExtendedZoneRegistrar zoneRegistrar( zonedbx::kZoneRegistrySize, zonedbx::kZoneRegistry); - assertTrue(zoneRegistrar.isSorted()); + // FIXME: tzcompiler.py must be updated to sort the kZoneRegistry using + // zoneId, not zoneName. + //assertTrue(zoneRegistrar.isSorted()); const extended::ZoneInfo* zoneInfo = zoneRegistrar.getZoneInfoForName("America/Los_Angeles"); @@ -40,7 +42,7 @@ test(ExtendedZoneRegistrarTest, getZoneInfoForName_not_found) { ExtendedZoneRegistrar zoneRegistrar( zonedbx::kZoneRegistrySize, zonedbx::kZoneRegistry); const extended::ZoneInfo* zoneInfo = - zoneRegistrar.getZoneInfoForName("not found"); + zoneRegistrar.getZoneInfoForName("doesNotExist"); assertEqual(zoneInfo, nullptr); } From f42282dd470edf69e3a2493c769c6365c2f0bbe4 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 4 Jan 2021 19:57:57 -0800 Subject: [PATCH 14/74] tools/argenerator.py: Generate zone_registry.cpp sorted by zoneId not zoneName, allows binarySearchById() --- src/ace_time/zonedb/zone_registry.cpp | 534 ++++++------ src/ace_time/zonedbx/zone_registry.cpp | 774 +++++++++--------- .../BasicZoneRegistrarTest.ino | 12 +- .../ExtendedZoneRegistrarTest.ino | 12 +- tools/generator/argenerator.py | 18 +- 5 files changed, 671 insertions(+), 679 deletions(-) diff --git a/src/ace_time/zonedb/zone_registry.cpp b/src/ace_time/zonedb/zone_registry.cpp index aff59d4f3..d7719ae4b 100644 --- a/src/ace_time/zonedb/zone_registry.cpp +++ b/src/ace_time/zonedb/zone_registry.cpp @@ -34,275 +34,275 @@ namespace ace_time { namespace zonedb { //--------------------------------------------------------------------------- -// Zone registry. Sorted by zone name. +// Zone registry. Sorted by zoneId. //--------------------------------------------------------------------------- const basic::ZoneInfo* const kZoneRegistry[266] ACE_TIME_PROGMEM = { - &kZoneAfrica_Abidjan, // Africa/Abidjan - &kZoneAfrica_Algiers, // Africa/Algiers - &kZoneAfrica_Bissau, // Africa/Bissau - &kZoneAfrica_Ceuta, // Africa/Ceuta - &kZoneAfrica_Johannesburg, // Africa/Johannesburg - &kZoneAfrica_Lagos, // Africa/Lagos - &kZoneAfrica_Maputo, // Africa/Maputo - &kZoneAfrica_Monrovia, // Africa/Monrovia - &kZoneAfrica_Nairobi, // Africa/Nairobi - &kZoneAfrica_Ndjamena, // Africa/Ndjamena - &kZoneAfrica_Tunis, // Africa/Tunis - &kZoneAmerica_Adak, // America/Adak - &kZoneAmerica_Anchorage, // America/Anchorage - &kZoneAmerica_Asuncion, // America/Asuncion - &kZoneAmerica_Atikokan, // America/Atikokan - &kZoneAmerica_Barbados, // America/Barbados - &kZoneAmerica_Belem, // America/Belem - &kZoneAmerica_Blanc_Sablon, // America/Blanc-Sablon - &kZoneAmerica_Bogota, // America/Bogota - &kZoneAmerica_Boise, // America/Boise - &kZoneAmerica_Campo_Grande, // America/Campo_Grande - &kZoneAmerica_Cayenne, // America/Cayenne - &kZoneAmerica_Chicago, // America/Chicago - &kZoneAmerica_Chihuahua, // America/Chihuahua - &kZoneAmerica_Costa_Rica, // America/Costa_Rica - &kZoneAmerica_Creston, // America/Creston - &kZoneAmerica_Curacao, // America/Curacao - &kZoneAmerica_Danmarkshavn, // America/Danmarkshavn - &kZoneAmerica_Dawson_Creek, // America/Dawson_Creek - &kZoneAmerica_Denver, // America/Denver - &kZoneAmerica_Detroit, // America/Detroit - &kZoneAmerica_Edmonton, // America/Edmonton - &kZoneAmerica_El_Salvador, // America/El_Salvador - &kZoneAmerica_Glace_Bay, // America/Glace_Bay - &kZoneAmerica_Guatemala, // America/Guatemala - &kZoneAmerica_Guayaquil, // America/Guayaquil - &kZoneAmerica_Guyana, // America/Guyana - &kZoneAmerica_Halifax, // America/Halifax - &kZoneAmerica_Havana, // America/Havana - &kZoneAmerica_Hermosillo, // America/Hermosillo - &kZoneAmerica_Indiana_Indianapolis, // America/Indiana/Indianapolis - &kZoneAmerica_Indiana_Marengo, // America/Indiana/Marengo - &kZoneAmerica_Indiana_Vevay, // America/Indiana/Vevay - &kZoneAmerica_Inuvik, // America/Inuvik - &kZoneAmerica_Jamaica, // America/Jamaica - &kZoneAmerica_Juneau, // America/Juneau - &kZoneAmerica_Kentucky_Louisville, // America/Kentucky/Louisville - &kZoneAmerica_La_Paz, // America/La_Paz - &kZoneAmerica_Lima, // America/Lima - &kZoneAmerica_Los_Angeles, // America/Los_Angeles - &kZoneAmerica_Managua, // America/Managua - &kZoneAmerica_Manaus, // America/Manaus - &kZoneAmerica_Martinique, // America/Martinique - &kZoneAmerica_Matamoros, // America/Matamoros - &kZoneAmerica_Mazatlan, // America/Mazatlan - &kZoneAmerica_Menominee, // America/Menominee - &kZoneAmerica_Merida, // America/Merida - &kZoneAmerica_Miquelon, // America/Miquelon - &kZoneAmerica_Moncton, // America/Moncton - &kZoneAmerica_Monterrey, // America/Monterrey - &kZoneAmerica_Montevideo, // America/Montevideo - &kZoneAmerica_Nassau, // America/Nassau - &kZoneAmerica_New_York, // America/New_York - &kZoneAmerica_Nipigon, // America/Nipigon - &kZoneAmerica_Nome, // America/Nome - &kZoneAmerica_North_Dakota_Center, // America/North_Dakota/Center - &kZoneAmerica_Nuuk, // America/Nuuk - &kZoneAmerica_Ojinaga, // America/Ojinaga - &kZoneAmerica_Panama, // America/Panama - &kZoneAmerica_Paramaribo, // America/Paramaribo - &kZoneAmerica_Phoenix, // America/Phoenix - &kZoneAmerica_Port_au_Prince, // America/Port-au-Prince - &kZoneAmerica_Port_of_Spain, // America/Port_of_Spain - &kZoneAmerica_Porto_Velho, // America/Porto_Velho - &kZoneAmerica_Puerto_Rico, // America/Puerto_Rico - &kZoneAmerica_Rainy_River, // America/Rainy_River - &kZoneAmerica_Regina, // America/Regina - &kZoneAmerica_Santiago, // America/Santiago - &kZoneAmerica_Sao_Paulo, // America/Sao_Paulo - &kZoneAmerica_Scoresbysund, // America/Scoresbysund - &kZoneAmerica_Sitka, // America/Sitka - &kZoneAmerica_Swift_Current, // America/Swift_Current - &kZoneAmerica_Tegucigalpa, // America/Tegucigalpa - &kZoneAmerica_Thule, // America/Thule - &kZoneAmerica_Thunder_Bay, // America/Thunder_Bay - &kZoneAmerica_Toronto, // America/Toronto - &kZoneAmerica_Vancouver, // America/Vancouver - &kZoneAmerica_Winnipeg, // America/Winnipeg - &kZoneAmerica_Yakutat, // America/Yakutat - &kZoneAmerica_Yellowknife, // America/Yellowknife - &kZoneAntarctica_DumontDUrville, // Antarctica/DumontDUrville - &kZoneAntarctica_Rothera, // Antarctica/Rothera - &kZoneAntarctica_Syowa, // Antarctica/Syowa - &kZoneAntarctica_Vostok, // Antarctica/Vostok - &kZoneAsia_Amman, // Asia/Amman - &kZoneAsia_Ashgabat, // Asia/Ashgabat - &kZoneAsia_Baghdad, // Asia/Baghdad - &kZoneAsia_Baku, // Asia/Baku - &kZoneAsia_Bangkok, // Asia/Bangkok - &kZoneAsia_Beirut, // Asia/Beirut - &kZoneAsia_Brunei, // Asia/Brunei - &kZoneAsia_Damascus, // Asia/Damascus - &kZoneAsia_Dhaka, // Asia/Dhaka - &kZoneAsia_Dubai, // Asia/Dubai - &kZoneAsia_Dushanbe, // Asia/Dushanbe - &kZoneAsia_Ho_Chi_Minh, // Asia/Ho_Chi_Minh - &kZoneAsia_Hong_Kong, // Asia/Hong_Kong - &kZoneAsia_Hovd, // Asia/Hovd - &kZoneAsia_Jakarta, // Asia/Jakarta - &kZoneAsia_Jayapura, // Asia/Jayapura - &kZoneAsia_Jerusalem, // Asia/Jerusalem - &kZoneAsia_Kabul, // Asia/Kabul - &kZoneAsia_Karachi, // Asia/Karachi - &kZoneAsia_Kathmandu, // Asia/Kathmandu - &kZoneAsia_Kolkata, // Asia/Kolkata - &kZoneAsia_Kuala_Lumpur, // Asia/Kuala_Lumpur - &kZoneAsia_Kuching, // Asia/Kuching - &kZoneAsia_Macau, // Asia/Macau - &kZoneAsia_Makassar, // Asia/Makassar - &kZoneAsia_Manila, // Asia/Manila - &kZoneAsia_Nicosia, // Asia/Nicosia - &kZoneAsia_Pontianak, // Asia/Pontianak - &kZoneAsia_Qatar, // Asia/Qatar - &kZoneAsia_Riyadh, // Asia/Riyadh - &kZoneAsia_Samarkand, // Asia/Samarkand - &kZoneAsia_Seoul, // Asia/Seoul - &kZoneAsia_Shanghai, // Asia/Shanghai - &kZoneAsia_Singapore, // Asia/Singapore - &kZoneAsia_Taipei, // Asia/Taipei - &kZoneAsia_Tashkent, // Asia/Tashkent - &kZoneAsia_Tehran, // Asia/Tehran - &kZoneAsia_Thimphu, // Asia/Thimphu - &kZoneAsia_Tokyo, // Asia/Tokyo - &kZoneAsia_Ulaanbaatar, // Asia/Ulaanbaatar - &kZoneAsia_Urumqi, // Asia/Urumqi - &kZoneAsia_Yangon, // Asia/Yangon - &kZoneAsia_Yerevan, // Asia/Yerevan - &kZoneAtlantic_Azores, // Atlantic/Azores - &kZoneAtlantic_Bermuda, // Atlantic/Bermuda - &kZoneAtlantic_Canary, // Atlantic/Canary - &kZoneAtlantic_Cape_Verde, // Atlantic/Cape_Verde - &kZoneAtlantic_Faroe, // Atlantic/Faroe - &kZoneAtlantic_Madeira, // Atlantic/Madeira - &kZoneAtlantic_Reykjavik, // Atlantic/Reykjavik - &kZoneAtlantic_South_Georgia, // Atlantic/South_Georgia - &kZoneAustralia_Adelaide, // Australia/Adelaide - &kZoneAustralia_Brisbane, // Australia/Brisbane - &kZoneAustralia_Broken_Hill, // Australia/Broken_Hill - &kZoneAustralia_Darwin, // Australia/Darwin - &kZoneAustralia_Eucla, // Australia/Eucla - &kZoneAustralia_Hobart, // Australia/Hobart - &kZoneAustralia_Lindeman, // Australia/Lindeman - &kZoneAustralia_Lord_Howe, // Australia/Lord_Howe - &kZoneAustralia_Melbourne, // Australia/Melbourne - &kZoneAustralia_Perth, // Australia/Perth - &kZoneAustralia_Sydney, // Australia/Sydney - &kZoneCET, // CET - &kZoneCST6CDT, // CST6CDT - &kZoneEET, // EET - &kZoneEST, // EST - &kZoneEST5EDT, // EST5EDT - &kZoneEtc_GMT, // Etc/GMT - &kZoneEtc_GMT_PLUS_1, // Etc/GMT+1 - &kZoneEtc_GMT_PLUS_10, // Etc/GMT+10 - &kZoneEtc_GMT_PLUS_11, // Etc/GMT+11 - &kZoneEtc_GMT_PLUS_12, // Etc/GMT+12 - &kZoneEtc_GMT_PLUS_2, // Etc/GMT+2 - &kZoneEtc_GMT_PLUS_3, // Etc/GMT+3 - &kZoneEtc_GMT_PLUS_4, // Etc/GMT+4 - &kZoneEtc_GMT_PLUS_5, // Etc/GMT+5 - &kZoneEtc_GMT_PLUS_6, // Etc/GMT+6 - &kZoneEtc_GMT_PLUS_7, // Etc/GMT+7 - &kZoneEtc_GMT_PLUS_8, // Etc/GMT+8 - &kZoneEtc_GMT_PLUS_9, // Etc/GMT+9 - &kZoneEtc_GMT_1, // Etc/GMT-1 - &kZoneEtc_GMT_10, // Etc/GMT-10 - &kZoneEtc_GMT_11, // Etc/GMT-11 - &kZoneEtc_GMT_12, // Etc/GMT-12 - &kZoneEtc_GMT_13, // Etc/GMT-13 - &kZoneEtc_GMT_14, // Etc/GMT-14 - &kZoneEtc_GMT_2, // Etc/GMT-2 - &kZoneEtc_GMT_3, // Etc/GMT-3 - &kZoneEtc_GMT_4, // Etc/GMT-4 - &kZoneEtc_GMT_5, // Etc/GMT-5 - &kZoneEtc_GMT_6, // Etc/GMT-6 - &kZoneEtc_GMT_7, // Etc/GMT-7 - &kZoneEtc_GMT_8, // Etc/GMT-8 - &kZoneEtc_GMT_9, // Etc/GMT-9 - &kZoneEtc_UTC, // Etc/UTC - &kZoneEurope_Amsterdam, // Europe/Amsterdam - &kZoneEurope_Andorra, // Europe/Andorra - &kZoneEurope_Athens, // Europe/Athens - &kZoneEurope_Belgrade, // Europe/Belgrade - &kZoneEurope_Berlin, // Europe/Berlin - &kZoneEurope_Brussels, // Europe/Brussels - &kZoneEurope_Bucharest, // Europe/Bucharest - &kZoneEurope_Budapest, // Europe/Budapest - &kZoneEurope_Chisinau, // Europe/Chisinau - &kZoneEurope_Copenhagen, // Europe/Copenhagen - &kZoneEurope_Dublin, // Europe/Dublin - &kZoneEurope_Gibraltar, // Europe/Gibraltar - &kZoneEurope_Helsinki, // Europe/Helsinki - &kZoneEurope_Kiev, // Europe/Kiev - &kZoneEurope_Lisbon, // Europe/Lisbon - &kZoneEurope_London, // Europe/London - &kZoneEurope_Luxembourg, // Europe/Luxembourg - &kZoneEurope_Madrid, // Europe/Madrid - &kZoneEurope_Malta, // Europe/Malta - &kZoneEurope_Monaco, // Europe/Monaco - &kZoneEurope_Oslo, // Europe/Oslo - &kZoneEurope_Paris, // Europe/Paris - &kZoneEurope_Prague, // Europe/Prague - &kZoneEurope_Rome, // Europe/Rome - &kZoneEurope_Sofia, // Europe/Sofia - &kZoneEurope_Stockholm, // Europe/Stockholm - &kZoneEurope_Tirane, // Europe/Tirane - &kZoneEurope_Uzhgorod, // Europe/Uzhgorod - &kZoneEurope_Vienna, // Europe/Vienna - &kZoneEurope_Warsaw, // Europe/Warsaw - &kZoneEurope_Zaporozhye, // Europe/Zaporozhye - &kZoneEurope_Zurich, // Europe/Zurich - &kZoneHST, // HST - &kZoneIndian_Chagos, // Indian/Chagos - &kZoneIndian_Christmas, // Indian/Christmas - &kZoneIndian_Cocos, // Indian/Cocos - &kZoneIndian_Kerguelen, // Indian/Kerguelen - &kZoneIndian_Mahe, // Indian/Mahe - &kZoneIndian_Maldives, // Indian/Maldives - &kZoneIndian_Mauritius, // Indian/Mauritius - &kZoneIndian_Reunion, // Indian/Reunion - &kZoneMET, // MET - &kZoneMST, // MST - &kZoneMST7MDT, // MST7MDT - &kZonePST8PDT, // PST8PDT - &kZonePacific_Auckland, // Pacific/Auckland - &kZonePacific_Chatham, // Pacific/Chatham - &kZonePacific_Chuuk, // Pacific/Chuuk - &kZonePacific_Easter, // Pacific/Easter - &kZonePacific_Efate, // Pacific/Efate - &kZonePacific_Enderbury, // Pacific/Enderbury - &kZonePacific_Fiji, // Pacific/Fiji - &kZonePacific_Funafuti, // Pacific/Funafuti - &kZonePacific_Galapagos, // Pacific/Galapagos - &kZonePacific_Gambier, // Pacific/Gambier - &kZonePacific_Guadalcanal, // Pacific/Guadalcanal - &kZonePacific_Honolulu, // Pacific/Honolulu - &kZonePacific_Kiritimati, // Pacific/Kiritimati - &kZonePacific_Kosrae, // Pacific/Kosrae - &kZonePacific_Kwajalein, // Pacific/Kwajalein - &kZonePacific_Majuro, // Pacific/Majuro - &kZonePacific_Marquesas, // Pacific/Marquesas - &kZonePacific_Nauru, // Pacific/Nauru - &kZonePacific_Niue, // Pacific/Niue - &kZonePacific_Noumea, // Pacific/Noumea - &kZonePacific_Pago_Pago, // Pacific/Pago_Pago - &kZonePacific_Palau, // Pacific/Palau - &kZonePacific_Pitcairn, // Pacific/Pitcairn - &kZonePacific_Pohnpei, // Pacific/Pohnpei - &kZonePacific_Port_Moresby, // Pacific/Port_Moresby - &kZonePacific_Rarotonga, // Pacific/Rarotonga - &kZonePacific_Tahiti, // Pacific/Tahiti - &kZonePacific_Tarawa, // Pacific/Tarawa - &kZonePacific_Tongatapu, // Pacific/Tongatapu - &kZonePacific_Wake, // Pacific/Wake - &kZonePacific_Wallis, // Pacific/Wallis - &kZoneWET, // WET + &kZoneAsia_Kuala_Lumpur, // Asia/Kuala_Lumpur - 0x014763c4 + &kZoneIndian_Cocos, // Indian/Cocos - 0x021e86de + &kZoneAsia_Jakarta, // Asia/Jakarta - 0x0506ab50 + &kZoneAmerica_Mazatlan, // America/Mazatlan - 0x0532189e + &kZoneAmerica_Hermosillo, // America/Hermosillo - 0x065d21c4 + &kZoneCET, // CET - 0x0b87d921 + &kZoneEET, // EET - 0x0b87e1a3 + &kZoneEST, // EST - 0x0b87e371 + &kZoneHST, // HST - 0x0b87f034 + &kZoneMET, // MET - 0x0b8803ab + &kZoneMST, // MST - 0x0b880579 + &kZoneWET, // WET - 0x0b882e35 + &kZoneAmerica_Guatemala, // America/Guatemala - 0x0c8259f7 + &kZoneAfrica_Monrovia, // Africa/Monrovia - 0x0ce90385 + &kZoneAntarctica_Rothera, // Antarctica/Rothera - 0x0e86d203 + &kZoneAmerica_Yellowknife, // America/Yellowknife - 0x0f76c76f + &kZoneAustralia_Melbourne, // Australia/Melbourne - 0x0fe559a3 + &kZoneAmerica_Sao_Paulo, // America/Sao_Paulo - 0x1063bfc9 + &kZoneEurope_Amsterdam, // Europe/Amsterdam - 0x109395c2 + &kZoneAmerica_Indiana_Vevay, // America/Indiana/Vevay - 0x10aca054 + &kZoneAmerica_Scoresbysund, // America/Scoresbysund - 0x123f8d2a + &kZoneAsia_Samarkand, // Asia/Samarkand - 0x13ae5104 + &kZoneAsia_Amman, // Asia/Amman - 0x148d21bc + &kZoneAsia_Dhaka, // Asia/Dhaka - 0x14c07b8b + &kZoneAsia_Dubai, // Asia/Dubai - 0x14c79f77 + &kZoneAsia_Kabul, // Asia/Kabul - 0x153b5601 + &kZoneAsia_Macau, // Asia/Macau - 0x155f88b9 + &kZoneAsia_Qatar, // Asia/Qatar - 0x15a8330b + &kZoneAsia_Seoul, // Asia/Seoul - 0x15ce82da + &kZoneAsia_Tokyo, // Asia/Tokyo - 0x15e606a8 + &kZoneAsia_Thimphu, // Asia/Thimphu - 0x170380d1 + &kZoneAmerica_Guayaquil, // America/Guayaquil - 0x17e64958 + &kZoneAmerica_Kentucky_Louisville, // America/Kentucky/Louisville - 0x1a21024b + &kZoneAsia_Pontianak, // Asia/Pontianak - 0x1a76c057 + &kZoneAtlantic_Reykjavik, // Atlantic/Reykjavik - 0x1c2b4f74 + &kZoneAmerica_New_York, // America/New_York - 0x1e2a7654 + &kZoneEurope_Luxembourg, // Europe/Luxembourg - 0x1f8bc6ce + &kZoneAsia_Baku, // Asia/Baku - 0x1fa788b5 + &kZoneAsia_Hovd, // Asia/Hovd - 0x1fab0fe3 + &kZoneAsia_Ho_Chi_Minh, // Asia/Ho_Chi_Minh - 0x20f2d127 + &kZoneAsia_Damascus, // Asia/Damascus - 0x20fbb063 + &kZonePacific_Fiji, // Pacific/Fiji - 0x23383ba5 + &kZonePacific_Niue, // Pacific/Niue - 0x233ca014 + &kZonePacific_Wake, // Pacific/Wake - 0x23416c2b + &kZoneAustralia_Adelaide, // Australia/Adelaide - 0x2428e8a3 + &kZonePacific_Auckland, // Pacific/Auckland - 0x25062f86 + &kZonePacific_Tongatapu, // Pacific/Tongatapu - 0x262ca836 + &kZoneAmerica_Monterrey, // America/Monterrey - 0x269a1deb + &kZoneAustralia_Darwin, // Australia/Darwin - 0x2876bdff + &kZonePacific_Pohnpei, // Pacific/Pohnpei - 0x28929f96 + &kZoneAmerica_Indiana_Indianapolis, // America/Indiana/Indianapolis - 0x28a669a4 + &kZoneAmerica_Vancouver, // America/Vancouver - 0x2c6f6b1f + &kZonePacific_Chatham, // Pacific/Chatham - 0x2f0de999 + &kZoneAmerica_Indiana_Marengo, // America/Indiana/Marengo - 0x2feeee72 + &kZoneAsia_Ulaanbaatar, // Asia/Ulaanbaatar - 0x30f0cc4e + &kZoneAustralia_Hobart, // Australia/Hobart - 0x32bf951a + &kZoneAsia_Dushanbe, // Asia/Dushanbe - 0x32fc5c3c + &kZoneAtlantic_South_Georgia, // Atlantic/South_Georgia - 0x33013174 + &kZoneAmerica_Phoenix, // America/Phoenix - 0x34b5af01 + &kZoneAmerica_Cayenne, // America/Cayenne - 0x3c617269 + &kZoneAtlantic_Bermuda, // Atlantic/Bermuda - 0x3d4bb1c4 + &kZoneAmerica_Managua, // America/Managua - 0x3d5e7600 + &kZoneEtc_GMT_PLUS_10, // Etc/GMT+10 - 0x3f8f1cc4 + &kZoneEtc_GMT_PLUS_11, // Etc/GMT+11 - 0x3f8f1cc5 + &kZoneEtc_GMT_PLUS_12, // Etc/GMT+12 - 0x3f8f1cc6 + &kZoneEtc_GMT_10, // Etc/GMT-10 - 0x3f8f2546 + &kZoneEtc_GMT_11, // Etc/GMT-11 - 0x3f8f2547 + &kZoneEtc_GMT_12, // Etc/GMT-12 - 0x3f8f2548 + &kZoneEtc_GMT_13, // Etc/GMT-13 - 0x3f8f2549 + &kZoneEtc_GMT_14, // Etc/GMT-14 - 0x3f8f254a + &kZoneEurope_Athens, // Europe/Athens - 0x4318fa27 + &kZoneIndian_Kerguelen, // Indian/Kerguelen - 0x4351b389 + &kZoneEurope_Berlin, // Europe/Berlin - 0x44644c20 + &kZoneIndian_Chagos, // Indian/Chagos - 0x456f7c3c + &kZoneIndian_Mahe, // Indian/Mahe - 0x45e725e2 + &kZoneEurope_Dublin, // Europe/Dublin - 0x4a275f62 + &kZoneAsia_Nicosia, // Asia/Nicosia - 0x4b0fcf78 + &kZoneAmerica_Chicago, // America/Chicago - 0x4b92b5d4 + &kZoneAustralia_Sydney, // Australia/Sydney - 0x4d1e9776 + &kZoneAntarctica_Vostok, // Antarctica/Vostok - 0x4f966fd4 + &kZoneAustralia_Brisbane, // Australia/Brisbane - 0x4fedc9c0 + &kZoneAmerica_Asuncion, // America/Asuncion - 0x50ec79a6 + &kZoneAsia_Karachi, // Asia/Karachi - 0x527f5245 + &kZonePacific_Gambier, // Pacific/Gambier - 0x53720c3a + &kZoneAmerica_Martinique, // America/Martinique - 0x551e84c5 + &kZoneAmerica_Jamaica, // America/Jamaica - 0x565dad6c + &kZoneAsia_Hong_Kong, // Asia/Hong_Kong - 0x577f28ac + &kZonePacific_Marquesas, // Pacific/Marquesas - 0x57ca7135 + &kZoneAmerica_Miquelon, // America/Miquelon - 0x59674330 + &kZoneAntarctica_DumontDUrville, // Antarctica/DumontDUrville - 0x5a3c656c + &kZoneAmerica_Anchorage, // America/Anchorage - 0x5a79260e + &kZoneAsia_Jerusalem, // Asia/Jerusalem - 0x5becd23a + &kZoneEurope_Stockholm, // Europe/Stockholm - 0x5bf6fbb8 + &kZoneEurope_Lisbon, // Europe/Lisbon - 0x5c00a70b + &kZoneAtlantic_Cape_Verde, // Atlantic/Cape_Verde - 0x5c5e1772 + &kZoneEurope_London, // Europe/London - 0x5c6a84ae + &kZoneEurope_Madrid, // Europe/Madrid - 0x5dbd1535 + &kZoneAmerica_Moncton, // America/Moncton - 0x5e07fe24 + &kZoneEurope_Monaco, // Europe/Monaco - 0x5ebf9f01 + &kZonePacific_Pago_Pago, // Pacific/Pago_Pago - 0x603aebd0 + &kZonePacific_Enderbury, // Pacific/Enderbury - 0x61599a93 + &kZoneAmerica_Creston, // America/Creston - 0x62a70204 + &kZoneAmerica_Costa_Rica, // America/Costa_Rica - 0x63ff66be + &kZoneEurope_Prague, // Europe/Prague - 0x65ee5d48 + &kZoneAmerica_Puerto_Rico, // America/Puerto_Rico - 0x6752ca31 + &kZoneIndian_Christmas, // Indian/Christmas - 0x68c207d5 + &kZoneAmerica_Curacao, // America/Curacao - 0x6a879184 + &kZoneAsia_Makassar, // Asia/Makassar - 0x6aa21c85 + &kZoneEurope_Helsinki, // Europe/Helsinki - 0x6ab2975b + &kZoneAmerica_Porto_Velho, // America/Porto_Velho - 0x6b1aac77 + &kZoneAmerica_Edmonton, // America/Edmonton - 0x6cb9484a + &kZoneAmerica_Dawson_Creek, // America/Dawson_Creek - 0x6cf24e5b + &kZoneAmerica_Blanc_Sablon, // America/Blanc-Sablon - 0x6e299892 + &kZoneEurope_Tirane, // Europe/Tirane - 0x6ea95b47 + &kZoneIndian_Reunion, // Indian/Reunion - 0x7076c047 + &kZoneAsia_Kolkata, // Asia/Kolkata - 0x72c06cd9 + &kZoneEurope_Vienna, // Europe/Vienna - 0x734cc2e5 + &kZoneAmerica_Santiago, // America/Santiago - 0x7410c9bc + &kZoneEurope_Warsaw, // Europe/Warsaw - 0x75185c19 + &kZoneAmerica_El_Salvador, // America/El_Salvador - 0x752ad652 + &kZoneAfrica_Bissau, // Africa/Bissau - 0x75564141 + &kZoneAfrica_Ceuta, // Africa/Ceuta - 0x77fb46ec + &kZoneAfrica_Lagos, // Africa/Lagos - 0x789bb5d0 + &kZoneAmerica_Toronto, // America/Toronto - 0x792e851b + &kZoneAfrica_Tunis, // Africa/Tunis - 0x79378e6d + &kZoneIndian_Mauritius, // Indian/Mauritius - 0x7b09c02a + &kZoneEurope_Zurich, // Europe/Zurich - 0x7d8195b9 + &kZoneAsia_Kuching, // Asia/Kuching - 0x801b003b + &kZoneAtlantic_Madeira, // Atlantic/Madeira - 0x81b5c037 + &kZoneAmerica_Atikokan, // America/Atikokan - 0x81b92098 + &kZonePacific_Kiritimati, // Pacific/Kiritimati - 0x8305073a + &kZoneAmerica_Chihuahua, // America/Chihuahua - 0x8827d776 + &kZonePacific_Pitcairn, // Pacific/Pitcairn - 0x8837d8bd + &kZonePacific_Chuuk, // Pacific/Chuuk - 0x8a090b23 + &kZonePacific_Efate, // Pacific/Efate - 0x8a2bce28 + &kZonePacific_Nauru, // Pacific/Nauru - 0x8acc41ae + &kZoneEST5EDT, // EST5EDT - 0x8adc72a3 + &kZonePacific_Palau, // Pacific/Palau - 0x8af04a36 + &kZoneAmerica_Winnipeg, // America/Winnipeg - 0x8c7dafc7 + &kZoneAustralia_Eucla, // Australia/Eucla - 0x8cf99e44 + &kZoneAustralia_Perth, // Australia/Perth - 0x8db8269d + &kZonePacific_Kwajalein, // Pacific/Kwajalein - 0x8e216759 + &kZoneAmerica_Port_au_Prince, // America/Port-au-Prince - 0x8e4a7bdc + &kZoneAfrica_Maputo, // Africa/Maputo - 0x8e6ca1f0 + &kZoneAsia_Yerevan, // Asia/Yerevan - 0x9185c8cc + &kZoneAmerica_Detroit, // America/Detroit - 0x925cfbc1 + &kZoneAmerica_Bogota, // America/Bogota - 0x93d7bc62 + &kZoneAmerica_Glace_Bay, // America/Glace_Bay - 0x9681f8dd + &kZoneAmerica_Denver, // America/Denver - 0x97d10b2a + &kZoneAmerica_Belem, // America/Belem - 0x97da580b + &kZoneAmerica_Boise, // America/Boise - 0x97dfc8d8 + &kZoneEurope_Andorra, // Europe/Andorra - 0x97f6764b + &kZoneAmerica_Adak, // America/Adak - 0x97fe49d7 + &kZoneAmerica_Lima, // America/Lima - 0x980468c9 + &kZoneAmerica_Nome, // America/Nome - 0x98059b15 + &kZoneAmerica_Nuuk, // America/Nuuk - 0x9805b5a9 + &kZoneIndian_Maldives, // Indian/Maldives - 0x9869681c + &kZoneAmerica_Sitka, // America/Sitka - 0x99104ce2 + &kZoneAmerica_Thule, // America/Thule - 0x9921dd68 + &kZonePacific_Rarotonga, // Pacific/Rarotonga - 0x9981a3b0 + &kZoneAsia_Kathmandu, // Asia/Kathmandu - 0x9a96ce6f + &kZoneAmerica_Rainy_River, // America/Rainy_River - 0x9cd58a10 + &kZoneEurope_Budapest, // Europe/Budapest - 0x9ce0197c + &kZoneAsia_Baghdad, // Asia/Baghdad - 0x9ceffbed + &kZoneEtc_GMT_PLUS_1, // Etc/GMT+1 - 0x9d13da14 + &kZoneEtc_GMT_PLUS_2, // Etc/GMT+2 - 0x9d13da15 + &kZoneEtc_GMT_PLUS_3, // Etc/GMT+3 - 0x9d13da16 + &kZoneEtc_GMT_PLUS_4, // Etc/GMT+4 - 0x9d13da17 + &kZoneEtc_GMT_PLUS_5, // Etc/GMT+5 - 0x9d13da18 + &kZoneEtc_GMT_PLUS_6, // Etc/GMT+6 - 0x9d13da19 + &kZoneEtc_GMT_PLUS_7, // Etc/GMT+7 - 0x9d13da1a + &kZoneEtc_GMT_PLUS_8, // Etc/GMT+8 - 0x9d13da1b + &kZoneEtc_GMT_PLUS_9, // Etc/GMT+9 - 0x9d13da1c + &kZoneEtc_GMT_1, // Etc/GMT-1 - 0x9d13da56 + &kZoneEtc_GMT_2, // Etc/GMT-2 - 0x9d13da57 + &kZoneEtc_GMT_3, // Etc/GMT-3 - 0x9d13da58 + &kZoneEtc_GMT_4, // Etc/GMT-4 - 0x9d13da59 + &kZoneEtc_GMT_5, // Etc/GMT-5 - 0x9d13da5a + &kZoneEtc_GMT_6, // Etc/GMT-6 - 0x9d13da5b + &kZoneEtc_GMT_7, // Etc/GMT-7 - 0x9d13da5c + &kZoneEtc_GMT_8, // Etc/GMT-8 - 0x9d13da5d + &kZoneEtc_GMT_9, // Etc/GMT-9 - 0x9d13da5e + &kZoneAmerica_Nipigon, // America/Nipigon - 0x9d2a8b1a + &kZoneAsia_Bangkok, // Asia/Bangkok - 0x9d6e3aaf + &kZoneAmerica_North_Dakota_Center, // America/North_Dakota/Center - 0x9da42814 + &kZoneAfrica_Ndjamena, // Africa/Ndjamena - 0x9fe09898 + &kZoneAmerica_Guyana, // America/Guyana - 0x9ff7bd0b + &kZoneAmerica_Havana, // America/Havana - 0xa0e15675 + &kZoneEurope_Kiev, // Europe/Kiev - 0xa2c19eb3 + &kZoneEurope_Oslo, // Europe/Oslo - 0xa2c3fba1 + &kZoneEurope_Rome, // Europe/Rome - 0xa2c58fd7 + &kZoneAmerica_Inuvik, // America/Inuvik - 0xa42189fc + &kZoneAmerica_Juneau, // America/Juneau - 0xa6f13e2e + &kZoneAustralia_Lord_Howe, // Australia/Lord_Howe - 0xa748b67d + &kZonePacific_Port_Moresby, // Pacific/Port_Moresby - 0xa7ba7f68 + &kZoneAsia_Beirut, // Asia/Beirut - 0xa7f3d5fd + &kZoneAfrica_Nairobi, // Africa/Nairobi - 0xa87ab57e + &kZoneAsia_Brunei, // Asia/Brunei - 0xa8e595f7 + &kZonePacific_Galapagos, // Pacific/Galapagos - 0xa952f752 + &kZoneAmerica_La_Paz, // America/La_Paz - 0xaa29125d + &kZoneAmerica_Manaus, // America/Manaus - 0xac86bf8b + &kZoneAmerica_Merida, // America/Merida - 0xacd172d8 + &kZoneEurope_Chisinau, // Europe/Chisinau - 0xad58aa18 + &kZoneAmerica_Nassau, // America/Nassau - 0xaedef011 + &kZoneEurope_Uzhgorod, // Europe/Uzhgorod - 0xb066f5d6 + &kZoneAustralia_Broken_Hill, // Australia/Broken_Hill - 0xb06eada3 + &kZoneAmerica_Paramaribo, // America/Paramaribo - 0xb319e4c4 + &kZoneAmerica_Panama, // America/Panama - 0xb3863854 + &kZoneAmerica_Los_Angeles, // America/Los_Angeles - 0xb7f7e8f2 + &kZoneAmerica_Regina, // America/Regina - 0xb875371c + &kZoneAsia_Ashgabat, // Asia/Ashgabat - 0xba87598d + &kZoneAmerica_Halifax, // America/Halifax - 0xbc5b7183 + &kZoneAmerica_Tegucigalpa, // America/Tegucigalpa - 0xbfd6fd4c + &kZoneAsia_Manila, // Asia/Manila - 0xc156c944 + &kZoneAfrica_Abidjan, // Africa/Abidjan - 0xc21305a3 + &kZoneAsia_Jayapura, // Asia/Jayapura - 0xc6833c2f + &kZoneAmerica_Barbados, // America/Barbados - 0xcbbc3b04 + &kZoneAsia_Riyadh, // Asia/Riyadh - 0xcd973d93 + &kZonePacific_Easter, // Pacific/Easter - 0xcf54f7e7 + &kZoneAsia_Singapore, // Asia/Singapore - 0xcf8581fa + &kZoneAsia_Taipei, // Asia/Taipei - 0xd1a844ae + &kZoneAsia_Tehran, // Asia/Tehran - 0xd1f02254 + &kZoneAsia_Urumqi, // Asia/Urumqi - 0xd5379735 + &kZoneAfrica_Johannesburg, // Africa/Johannesburg - 0xd5d157a0 + &kZoneAmerica_Port_of_Spain, // America/Port_of_Spain - 0xd8b28d59 + &kZoneEtc_GMT, // Etc/GMT - 0xd8e2de58 + &kZoneEtc_UTC, // Etc/UTC - 0xd8e31abc + &kZoneAmerica_Yakutat, // America/Yakutat - 0xd8ee31e9 + &kZoneAfrica_Algiers, // Africa/Algiers - 0xd94515c1 + &kZonePST8PDT, // PST8PDT - 0xd99ee2dc + &kZonePacific_Funafuti, // Pacific/Funafuti - 0xdb402d65 + &kZoneAmerica_Matamoros, // America/Matamoros - 0xdd1b0259 + &kZoneAsia_Yangon, // Asia/Yangon - 0xdd54a8be + &kZonePacific_Kosrae, // Pacific/Kosrae - 0xde5139a8 + &kZoneEurope_Brussels, // Europe/Brussels - 0xdee07337 + &kZoneAmerica_Swift_Current, // America/Swift_Current - 0xdef98e55 + &kZoneAustralia_Lindeman, // Australia/Lindeman - 0xe05029e2 + &kZoneEurope_Belgrade, // Europe/Belgrade - 0xe0532b3a + &kZoneAmerica_Menominee, // America/Menominee - 0xe0e9c583 + &kZoneEurope_Copenhagen, // Europe/Copenhagen - 0xe0ed30bc + &kZoneAtlantic_Faroe, // Atlantic/Faroe - 0xe110a971 + &kZonePacific_Majuro, // Pacific/Majuro - 0xe1f95371 + &kZoneAntarctica_Syowa, // Antarctica/Syowa - 0xe330c7e1 + &kZonePacific_Noumea, // Pacific/Noumea - 0xe551b788 + &kZonePacific_Honolulu, // Pacific/Honolulu - 0xe6e70af9 + &kZoneEurope_Zaporozhye, // Europe/Zaporozhye - 0xeab9767f + &kZoneAmerica_Ojinaga, // America/Ojinaga - 0xebfde83f + &kZoneCST6CDT, // CST6CDT - 0xf0e87d00 + &kZonePacific_Tahiti, // Pacific/Tahiti - 0xf24c2446 + &kZonePacific_Tarawa, // Pacific/Tarawa - 0xf2517e63 + &kZoneMST7MDT, // MST7MDT - 0xf2af9375 + &kZoneAsia_Tashkent, // Asia/Tashkent - 0xf3924254 + &kZonePacific_Guadalcanal, // Pacific/Guadalcanal - 0xf4dd25f0 + &kZoneAmerica_Danmarkshavn, // America/Danmarkshavn - 0xf554d204 + &kZoneAsia_Shanghai, // Asia/Shanghai - 0xf895a7f5 + &kZoneEurope_Gibraltar, // Europe/Gibraltar - 0xf8e325fc + &kZoneAtlantic_Azores, // Atlantic/Azores - 0xf93ed918 + &kZonePacific_Wallis, // Pacific/Wallis - 0xf94ddb0f + &kZoneAmerica_Thunder_Bay, // America/Thunder_Bay - 0xf962e71b + &kZoneAmerica_Montevideo, // America/Montevideo - 0xfa214780 + &kZoneEurope_Malta, // Europe/Malta - 0xfb1560f3 + &kZoneEurope_Bucharest, // Europe/Bucharest - 0xfb349ec5 + &kZoneEurope_Paris, // Europe/Paris - 0xfb4bc2a3 + &kZoneEurope_Sofia, // Europe/Sofia - 0xfb898656 + &kZoneAtlantic_Canary, // Atlantic/Canary - 0xfc23f2c2 + &kZoneAmerica_Campo_Grande, // America/Campo_Grande - 0xfec3e7a6 }; diff --git a/src/ace_time/zonedbx/zone_registry.cpp b/src/ace_time/zonedbx/zone_registry.cpp index 5d2a6c834..9556ededa 100644 --- a/src/ace_time/zonedbx/zone_registry.cpp +++ b/src/ace_time/zonedbx/zone_registry.cpp @@ -34,395 +34,395 @@ namespace ace_time { namespace zonedbx { //--------------------------------------------------------------------------- -// Zone registry. Sorted by zone name. +// Zone registry. Sorted by zoneId. //--------------------------------------------------------------------------- const extended::ZoneInfo* const kZoneRegistry[386] ACE_TIME_PROGMEM = { - &kZoneAfrica_Abidjan, // Africa/Abidjan - &kZoneAfrica_Accra, // Africa/Accra - &kZoneAfrica_Algiers, // Africa/Algiers - &kZoneAfrica_Bissau, // Africa/Bissau - &kZoneAfrica_Cairo, // Africa/Cairo - &kZoneAfrica_Casablanca, // Africa/Casablanca - &kZoneAfrica_Ceuta, // Africa/Ceuta - &kZoneAfrica_El_Aaiun, // Africa/El_Aaiun - &kZoneAfrica_Johannesburg, // Africa/Johannesburg - &kZoneAfrica_Juba, // Africa/Juba - &kZoneAfrica_Khartoum, // Africa/Khartoum - &kZoneAfrica_Lagos, // Africa/Lagos - &kZoneAfrica_Maputo, // Africa/Maputo - &kZoneAfrica_Monrovia, // Africa/Monrovia - &kZoneAfrica_Nairobi, // Africa/Nairobi - &kZoneAfrica_Ndjamena, // Africa/Ndjamena - &kZoneAfrica_Sao_Tome, // Africa/Sao_Tome - &kZoneAfrica_Tripoli, // Africa/Tripoli - &kZoneAfrica_Tunis, // Africa/Tunis - &kZoneAfrica_Windhoek, // Africa/Windhoek - &kZoneAmerica_Adak, // America/Adak - &kZoneAmerica_Anchorage, // America/Anchorage - &kZoneAmerica_Araguaina, // America/Araguaina - &kZoneAmerica_Argentina_Buenos_Aires, // America/Argentina/Buenos_Aires - &kZoneAmerica_Argentina_Catamarca, // America/Argentina/Catamarca - &kZoneAmerica_Argentina_Cordoba, // America/Argentina/Cordoba - &kZoneAmerica_Argentina_Jujuy, // America/Argentina/Jujuy - &kZoneAmerica_Argentina_La_Rioja, // America/Argentina/La_Rioja - &kZoneAmerica_Argentina_Mendoza, // America/Argentina/Mendoza - &kZoneAmerica_Argentina_Rio_Gallegos, // America/Argentina/Rio_Gallegos - &kZoneAmerica_Argentina_Salta, // America/Argentina/Salta - &kZoneAmerica_Argentina_San_Juan, // America/Argentina/San_Juan - &kZoneAmerica_Argentina_San_Luis, // America/Argentina/San_Luis - &kZoneAmerica_Argentina_Tucuman, // America/Argentina/Tucuman - &kZoneAmerica_Argentina_Ushuaia, // America/Argentina/Ushuaia - &kZoneAmerica_Asuncion, // America/Asuncion - &kZoneAmerica_Atikokan, // America/Atikokan - &kZoneAmerica_Bahia, // America/Bahia - &kZoneAmerica_Bahia_Banderas, // America/Bahia_Banderas - &kZoneAmerica_Barbados, // America/Barbados - &kZoneAmerica_Belem, // America/Belem - &kZoneAmerica_Belize, // America/Belize - &kZoneAmerica_Blanc_Sablon, // America/Blanc-Sablon - &kZoneAmerica_Boa_Vista, // America/Boa_Vista - &kZoneAmerica_Bogota, // America/Bogota - &kZoneAmerica_Boise, // America/Boise - &kZoneAmerica_Cambridge_Bay, // America/Cambridge_Bay - &kZoneAmerica_Campo_Grande, // America/Campo_Grande - &kZoneAmerica_Cancun, // America/Cancun - &kZoneAmerica_Caracas, // America/Caracas - &kZoneAmerica_Cayenne, // America/Cayenne - &kZoneAmerica_Chicago, // America/Chicago - &kZoneAmerica_Chihuahua, // America/Chihuahua - &kZoneAmerica_Costa_Rica, // America/Costa_Rica - &kZoneAmerica_Creston, // America/Creston - &kZoneAmerica_Cuiaba, // America/Cuiaba - &kZoneAmerica_Curacao, // America/Curacao - &kZoneAmerica_Danmarkshavn, // America/Danmarkshavn - &kZoneAmerica_Dawson, // America/Dawson - &kZoneAmerica_Dawson_Creek, // America/Dawson_Creek - &kZoneAmerica_Denver, // America/Denver - &kZoneAmerica_Detroit, // America/Detroit - &kZoneAmerica_Edmonton, // America/Edmonton - &kZoneAmerica_Eirunepe, // America/Eirunepe - &kZoneAmerica_El_Salvador, // America/El_Salvador - &kZoneAmerica_Fort_Nelson, // America/Fort_Nelson - &kZoneAmerica_Fortaleza, // America/Fortaleza - &kZoneAmerica_Glace_Bay, // America/Glace_Bay - &kZoneAmerica_Goose_Bay, // America/Goose_Bay - &kZoneAmerica_Grand_Turk, // America/Grand_Turk - &kZoneAmerica_Guatemala, // America/Guatemala - &kZoneAmerica_Guayaquil, // America/Guayaquil - &kZoneAmerica_Guyana, // America/Guyana - &kZoneAmerica_Halifax, // America/Halifax - &kZoneAmerica_Havana, // America/Havana - &kZoneAmerica_Hermosillo, // America/Hermosillo - &kZoneAmerica_Indiana_Indianapolis, // America/Indiana/Indianapolis - &kZoneAmerica_Indiana_Knox, // America/Indiana/Knox - &kZoneAmerica_Indiana_Marengo, // America/Indiana/Marengo - &kZoneAmerica_Indiana_Petersburg, // America/Indiana/Petersburg - &kZoneAmerica_Indiana_Tell_City, // America/Indiana/Tell_City - &kZoneAmerica_Indiana_Vevay, // America/Indiana/Vevay - &kZoneAmerica_Indiana_Vincennes, // America/Indiana/Vincennes - &kZoneAmerica_Indiana_Winamac, // America/Indiana/Winamac - &kZoneAmerica_Inuvik, // America/Inuvik - &kZoneAmerica_Iqaluit, // America/Iqaluit - &kZoneAmerica_Jamaica, // America/Jamaica - &kZoneAmerica_Juneau, // America/Juneau - &kZoneAmerica_Kentucky_Louisville, // America/Kentucky/Louisville - &kZoneAmerica_Kentucky_Monticello, // America/Kentucky/Monticello - &kZoneAmerica_La_Paz, // America/La_Paz - &kZoneAmerica_Lima, // America/Lima - &kZoneAmerica_Los_Angeles, // America/Los_Angeles - &kZoneAmerica_Maceio, // America/Maceio - &kZoneAmerica_Managua, // America/Managua - &kZoneAmerica_Manaus, // America/Manaus - &kZoneAmerica_Martinique, // America/Martinique - &kZoneAmerica_Matamoros, // America/Matamoros - &kZoneAmerica_Mazatlan, // America/Mazatlan - &kZoneAmerica_Menominee, // America/Menominee - &kZoneAmerica_Merida, // America/Merida - &kZoneAmerica_Metlakatla, // America/Metlakatla - &kZoneAmerica_Mexico_City, // America/Mexico_City - &kZoneAmerica_Miquelon, // America/Miquelon - &kZoneAmerica_Moncton, // America/Moncton - &kZoneAmerica_Monterrey, // America/Monterrey - &kZoneAmerica_Montevideo, // America/Montevideo - &kZoneAmerica_Nassau, // America/Nassau - &kZoneAmerica_New_York, // America/New_York - &kZoneAmerica_Nipigon, // America/Nipigon - &kZoneAmerica_Nome, // America/Nome - &kZoneAmerica_Noronha, // America/Noronha - &kZoneAmerica_North_Dakota_Beulah, // America/North_Dakota/Beulah - &kZoneAmerica_North_Dakota_Center, // America/North_Dakota/Center - &kZoneAmerica_North_Dakota_New_Salem, // America/North_Dakota/New_Salem - &kZoneAmerica_Nuuk, // America/Nuuk - &kZoneAmerica_Ojinaga, // America/Ojinaga - &kZoneAmerica_Panama, // America/Panama - &kZoneAmerica_Pangnirtung, // America/Pangnirtung - &kZoneAmerica_Paramaribo, // America/Paramaribo - &kZoneAmerica_Phoenix, // America/Phoenix - &kZoneAmerica_Port_au_Prince, // America/Port-au-Prince - &kZoneAmerica_Port_of_Spain, // America/Port_of_Spain - &kZoneAmerica_Porto_Velho, // America/Porto_Velho - &kZoneAmerica_Puerto_Rico, // America/Puerto_Rico - &kZoneAmerica_Punta_Arenas, // America/Punta_Arenas - &kZoneAmerica_Rainy_River, // America/Rainy_River - &kZoneAmerica_Rankin_Inlet, // America/Rankin_Inlet - &kZoneAmerica_Recife, // America/Recife - &kZoneAmerica_Regina, // America/Regina - &kZoneAmerica_Resolute, // America/Resolute - &kZoneAmerica_Rio_Branco, // America/Rio_Branco - &kZoneAmerica_Santarem, // America/Santarem - &kZoneAmerica_Santiago, // America/Santiago - &kZoneAmerica_Santo_Domingo, // America/Santo_Domingo - &kZoneAmerica_Sao_Paulo, // America/Sao_Paulo - &kZoneAmerica_Scoresbysund, // America/Scoresbysund - &kZoneAmerica_Sitka, // America/Sitka - &kZoneAmerica_St_Johns, // America/St_Johns - &kZoneAmerica_Swift_Current, // America/Swift_Current - &kZoneAmerica_Tegucigalpa, // America/Tegucigalpa - &kZoneAmerica_Thule, // America/Thule - &kZoneAmerica_Thunder_Bay, // America/Thunder_Bay - &kZoneAmerica_Tijuana, // America/Tijuana - &kZoneAmerica_Toronto, // America/Toronto - &kZoneAmerica_Vancouver, // America/Vancouver - &kZoneAmerica_Whitehorse, // America/Whitehorse - &kZoneAmerica_Winnipeg, // America/Winnipeg - &kZoneAmerica_Yakutat, // America/Yakutat - &kZoneAmerica_Yellowknife, // America/Yellowknife - &kZoneAntarctica_Casey, // Antarctica/Casey - &kZoneAntarctica_Davis, // Antarctica/Davis - &kZoneAntarctica_DumontDUrville, // Antarctica/DumontDUrville - &kZoneAntarctica_Macquarie, // Antarctica/Macquarie - &kZoneAntarctica_Mawson, // Antarctica/Mawson - &kZoneAntarctica_Palmer, // Antarctica/Palmer - &kZoneAntarctica_Rothera, // Antarctica/Rothera - &kZoneAntarctica_Syowa, // Antarctica/Syowa - &kZoneAntarctica_Troll, // Antarctica/Troll - &kZoneAntarctica_Vostok, // Antarctica/Vostok - &kZoneAsia_Almaty, // Asia/Almaty - &kZoneAsia_Amman, // Asia/Amman - &kZoneAsia_Anadyr, // Asia/Anadyr - &kZoneAsia_Aqtau, // Asia/Aqtau - &kZoneAsia_Aqtobe, // Asia/Aqtobe - &kZoneAsia_Ashgabat, // Asia/Ashgabat - &kZoneAsia_Atyrau, // Asia/Atyrau - &kZoneAsia_Baghdad, // Asia/Baghdad - &kZoneAsia_Baku, // Asia/Baku - &kZoneAsia_Bangkok, // Asia/Bangkok - &kZoneAsia_Barnaul, // Asia/Barnaul - &kZoneAsia_Beirut, // Asia/Beirut - &kZoneAsia_Bishkek, // Asia/Bishkek - &kZoneAsia_Brunei, // Asia/Brunei - &kZoneAsia_Chita, // Asia/Chita - &kZoneAsia_Choibalsan, // Asia/Choibalsan - &kZoneAsia_Colombo, // Asia/Colombo - &kZoneAsia_Damascus, // Asia/Damascus - &kZoneAsia_Dhaka, // Asia/Dhaka - &kZoneAsia_Dili, // Asia/Dili - &kZoneAsia_Dubai, // Asia/Dubai - &kZoneAsia_Dushanbe, // Asia/Dushanbe - &kZoneAsia_Famagusta, // Asia/Famagusta - &kZoneAsia_Gaza, // Asia/Gaza - &kZoneAsia_Hebron, // Asia/Hebron - &kZoneAsia_Ho_Chi_Minh, // Asia/Ho_Chi_Minh - &kZoneAsia_Hong_Kong, // Asia/Hong_Kong - &kZoneAsia_Hovd, // Asia/Hovd - &kZoneAsia_Irkutsk, // Asia/Irkutsk - &kZoneAsia_Jakarta, // Asia/Jakarta - &kZoneAsia_Jayapura, // Asia/Jayapura - &kZoneAsia_Jerusalem, // Asia/Jerusalem - &kZoneAsia_Kabul, // Asia/Kabul - &kZoneAsia_Kamchatka, // Asia/Kamchatka - &kZoneAsia_Karachi, // Asia/Karachi - &kZoneAsia_Kathmandu, // Asia/Kathmandu - &kZoneAsia_Khandyga, // Asia/Khandyga - &kZoneAsia_Kolkata, // Asia/Kolkata - &kZoneAsia_Krasnoyarsk, // Asia/Krasnoyarsk - &kZoneAsia_Kuala_Lumpur, // Asia/Kuala_Lumpur - &kZoneAsia_Kuching, // Asia/Kuching - &kZoneAsia_Macau, // Asia/Macau - &kZoneAsia_Magadan, // Asia/Magadan - &kZoneAsia_Makassar, // Asia/Makassar - &kZoneAsia_Manila, // Asia/Manila - &kZoneAsia_Nicosia, // Asia/Nicosia - &kZoneAsia_Novokuznetsk, // Asia/Novokuznetsk - &kZoneAsia_Novosibirsk, // Asia/Novosibirsk - &kZoneAsia_Omsk, // Asia/Omsk - &kZoneAsia_Oral, // Asia/Oral - &kZoneAsia_Pontianak, // Asia/Pontianak - &kZoneAsia_Pyongyang, // Asia/Pyongyang - &kZoneAsia_Qatar, // Asia/Qatar - &kZoneAsia_Qostanay, // Asia/Qostanay - &kZoneAsia_Qyzylorda, // Asia/Qyzylorda - &kZoneAsia_Riyadh, // Asia/Riyadh - &kZoneAsia_Sakhalin, // Asia/Sakhalin - &kZoneAsia_Samarkand, // Asia/Samarkand - &kZoneAsia_Seoul, // Asia/Seoul - &kZoneAsia_Shanghai, // Asia/Shanghai - &kZoneAsia_Singapore, // Asia/Singapore - &kZoneAsia_Srednekolymsk, // Asia/Srednekolymsk - &kZoneAsia_Taipei, // Asia/Taipei - &kZoneAsia_Tashkent, // Asia/Tashkent - &kZoneAsia_Tbilisi, // Asia/Tbilisi - &kZoneAsia_Tehran, // Asia/Tehran - &kZoneAsia_Thimphu, // Asia/Thimphu - &kZoneAsia_Tokyo, // Asia/Tokyo - &kZoneAsia_Tomsk, // Asia/Tomsk - &kZoneAsia_Ulaanbaatar, // Asia/Ulaanbaatar - &kZoneAsia_Urumqi, // Asia/Urumqi - &kZoneAsia_Ust_Nera, // Asia/Ust-Nera - &kZoneAsia_Vladivostok, // Asia/Vladivostok - &kZoneAsia_Yakutsk, // Asia/Yakutsk - &kZoneAsia_Yangon, // Asia/Yangon - &kZoneAsia_Yekaterinburg, // Asia/Yekaterinburg - &kZoneAsia_Yerevan, // Asia/Yerevan - &kZoneAtlantic_Azores, // Atlantic/Azores - &kZoneAtlantic_Bermuda, // Atlantic/Bermuda - &kZoneAtlantic_Canary, // Atlantic/Canary - &kZoneAtlantic_Cape_Verde, // Atlantic/Cape_Verde - &kZoneAtlantic_Faroe, // Atlantic/Faroe - &kZoneAtlantic_Madeira, // Atlantic/Madeira - &kZoneAtlantic_Reykjavik, // Atlantic/Reykjavik - &kZoneAtlantic_South_Georgia, // Atlantic/South_Georgia - &kZoneAtlantic_Stanley, // Atlantic/Stanley - &kZoneAustralia_Adelaide, // Australia/Adelaide - &kZoneAustralia_Brisbane, // Australia/Brisbane - &kZoneAustralia_Broken_Hill, // Australia/Broken_Hill - &kZoneAustralia_Darwin, // Australia/Darwin - &kZoneAustralia_Eucla, // Australia/Eucla - &kZoneAustralia_Hobart, // Australia/Hobart - &kZoneAustralia_Lindeman, // Australia/Lindeman - &kZoneAustralia_Lord_Howe, // Australia/Lord_Howe - &kZoneAustralia_Melbourne, // Australia/Melbourne - &kZoneAustralia_Perth, // Australia/Perth - &kZoneAustralia_Sydney, // Australia/Sydney - &kZoneCET, // CET - &kZoneCST6CDT, // CST6CDT - &kZoneEET, // EET - &kZoneEST, // EST - &kZoneEST5EDT, // EST5EDT - &kZoneEtc_GMT, // Etc/GMT - &kZoneEtc_GMT_PLUS_1, // Etc/GMT+1 - &kZoneEtc_GMT_PLUS_10, // Etc/GMT+10 - &kZoneEtc_GMT_PLUS_11, // Etc/GMT+11 - &kZoneEtc_GMT_PLUS_12, // Etc/GMT+12 - &kZoneEtc_GMT_PLUS_2, // Etc/GMT+2 - &kZoneEtc_GMT_PLUS_3, // Etc/GMT+3 - &kZoneEtc_GMT_PLUS_4, // Etc/GMT+4 - &kZoneEtc_GMT_PLUS_5, // Etc/GMT+5 - &kZoneEtc_GMT_PLUS_6, // Etc/GMT+6 - &kZoneEtc_GMT_PLUS_7, // Etc/GMT+7 - &kZoneEtc_GMT_PLUS_8, // Etc/GMT+8 - &kZoneEtc_GMT_PLUS_9, // Etc/GMT+9 - &kZoneEtc_GMT_1, // Etc/GMT-1 - &kZoneEtc_GMT_10, // Etc/GMT-10 - &kZoneEtc_GMT_11, // Etc/GMT-11 - &kZoneEtc_GMT_12, // Etc/GMT-12 - &kZoneEtc_GMT_13, // Etc/GMT-13 - &kZoneEtc_GMT_14, // Etc/GMT-14 - &kZoneEtc_GMT_2, // Etc/GMT-2 - &kZoneEtc_GMT_3, // Etc/GMT-3 - &kZoneEtc_GMT_4, // Etc/GMT-4 - &kZoneEtc_GMT_5, // Etc/GMT-5 - &kZoneEtc_GMT_6, // Etc/GMT-6 - &kZoneEtc_GMT_7, // Etc/GMT-7 - &kZoneEtc_GMT_8, // Etc/GMT-8 - &kZoneEtc_GMT_9, // Etc/GMT-9 - &kZoneEtc_UTC, // Etc/UTC - &kZoneEurope_Amsterdam, // Europe/Amsterdam - &kZoneEurope_Andorra, // Europe/Andorra - &kZoneEurope_Astrakhan, // Europe/Astrakhan - &kZoneEurope_Athens, // Europe/Athens - &kZoneEurope_Belgrade, // Europe/Belgrade - &kZoneEurope_Berlin, // Europe/Berlin - &kZoneEurope_Brussels, // Europe/Brussels - &kZoneEurope_Bucharest, // Europe/Bucharest - &kZoneEurope_Budapest, // Europe/Budapest - &kZoneEurope_Chisinau, // Europe/Chisinau - &kZoneEurope_Copenhagen, // Europe/Copenhagen - &kZoneEurope_Dublin, // Europe/Dublin - &kZoneEurope_Gibraltar, // Europe/Gibraltar - &kZoneEurope_Helsinki, // Europe/Helsinki - &kZoneEurope_Istanbul, // Europe/Istanbul - &kZoneEurope_Kaliningrad, // Europe/Kaliningrad - &kZoneEurope_Kiev, // Europe/Kiev - &kZoneEurope_Kirov, // Europe/Kirov - &kZoneEurope_Lisbon, // Europe/Lisbon - &kZoneEurope_London, // Europe/London - &kZoneEurope_Luxembourg, // Europe/Luxembourg - &kZoneEurope_Madrid, // Europe/Madrid - &kZoneEurope_Malta, // Europe/Malta - &kZoneEurope_Minsk, // Europe/Minsk - &kZoneEurope_Monaco, // Europe/Monaco - &kZoneEurope_Moscow, // Europe/Moscow - &kZoneEurope_Oslo, // Europe/Oslo - &kZoneEurope_Paris, // Europe/Paris - &kZoneEurope_Prague, // Europe/Prague - &kZoneEurope_Riga, // Europe/Riga - &kZoneEurope_Rome, // Europe/Rome - &kZoneEurope_Samara, // Europe/Samara - &kZoneEurope_Saratov, // Europe/Saratov - &kZoneEurope_Simferopol, // Europe/Simferopol - &kZoneEurope_Sofia, // Europe/Sofia - &kZoneEurope_Stockholm, // Europe/Stockholm - &kZoneEurope_Tallinn, // Europe/Tallinn - &kZoneEurope_Tirane, // Europe/Tirane - &kZoneEurope_Ulyanovsk, // Europe/Ulyanovsk - &kZoneEurope_Uzhgorod, // Europe/Uzhgorod - &kZoneEurope_Vienna, // Europe/Vienna - &kZoneEurope_Vilnius, // Europe/Vilnius - &kZoneEurope_Volgograd, // Europe/Volgograd - &kZoneEurope_Warsaw, // Europe/Warsaw - &kZoneEurope_Zaporozhye, // Europe/Zaporozhye - &kZoneEurope_Zurich, // Europe/Zurich - &kZoneHST, // HST - &kZoneIndian_Chagos, // Indian/Chagos - &kZoneIndian_Christmas, // Indian/Christmas - &kZoneIndian_Cocos, // Indian/Cocos - &kZoneIndian_Kerguelen, // Indian/Kerguelen - &kZoneIndian_Mahe, // Indian/Mahe - &kZoneIndian_Maldives, // Indian/Maldives - &kZoneIndian_Mauritius, // Indian/Mauritius - &kZoneIndian_Reunion, // Indian/Reunion - &kZoneMET, // MET - &kZoneMST, // MST - &kZoneMST7MDT, // MST7MDT - &kZonePST8PDT, // PST8PDT - &kZonePacific_Apia, // Pacific/Apia - &kZonePacific_Auckland, // Pacific/Auckland - &kZonePacific_Bougainville, // Pacific/Bougainville - &kZonePacific_Chatham, // Pacific/Chatham - &kZonePacific_Chuuk, // Pacific/Chuuk - &kZonePacific_Easter, // Pacific/Easter - &kZonePacific_Efate, // Pacific/Efate - &kZonePacific_Enderbury, // Pacific/Enderbury - &kZonePacific_Fakaofo, // Pacific/Fakaofo - &kZonePacific_Fiji, // Pacific/Fiji - &kZonePacific_Funafuti, // Pacific/Funafuti - &kZonePacific_Galapagos, // Pacific/Galapagos - &kZonePacific_Gambier, // Pacific/Gambier - &kZonePacific_Guadalcanal, // Pacific/Guadalcanal - &kZonePacific_Guam, // Pacific/Guam - &kZonePacific_Honolulu, // Pacific/Honolulu - &kZonePacific_Kiritimati, // Pacific/Kiritimati - &kZonePacific_Kosrae, // Pacific/Kosrae - &kZonePacific_Kwajalein, // Pacific/Kwajalein - &kZonePacific_Majuro, // Pacific/Majuro - &kZonePacific_Marquesas, // Pacific/Marquesas - &kZonePacific_Nauru, // Pacific/Nauru - &kZonePacific_Niue, // Pacific/Niue - &kZonePacific_Norfolk, // Pacific/Norfolk - &kZonePacific_Noumea, // Pacific/Noumea - &kZonePacific_Pago_Pago, // Pacific/Pago_Pago - &kZonePacific_Palau, // Pacific/Palau - &kZonePacific_Pitcairn, // Pacific/Pitcairn - &kZonePacific_Pohnpei, // Pacific/Pohnpei - &kZonePacific_Port_Moresby, // Pacific/Port_Moresby - &kZonePacific_Rarotonga, // Pacific/Rarotonga - &kZonePacific_Tahiti, // Pacific/Tahiti - &kZonePacific_Tarawa, // Pacific/Tarawa - &kZonePacific_Tongatapu, // Pacific/Tongatapu - &kZonePacific_Wake, // Pacific/Wake - &kZonePacific_Wallis, // Pacific/Wallis - &kZoneWET, // WET + &kZoneAsia_Kuala_Lumpur, // Asia/Kuala_Lumpur - 0x014763c4 + &kZoneIndian_Cocos, // Indian/Cocos - 0x021e86de + &kZoneAmerica_St_Johns, // America/St_Johns - 0x04b14e6e + &kZoneAmerica_North_Dakota_New_Salem, // America/North_Dakota/New_Salem - 0x04f9958e + &kZoneAsia_Jakarta, // Asia/Jakarta - 0x0506ab50 + &kZoneAmerica_Mazatlan, // America/Mazatlan - 0x0532189e + &kZonePacific_Fakaofo, // Pacific/Fakaofo - 0x06532bba + &kZoneAmerica_Hermosillo, // America/Hermosillo - 0x065d21c4 + &kZoneAsia_Tbilisi, // Asia/Tbilisi - 0x0903e442 + &kZoneAmerica_Indiana_Tell_City, // America/Indiana/Tell_City - 0x09263612 + &kZoneAmerica_Boa_Vista, // America/Boa_Vista - 0x0a7b7efe + &kZoneAsia_Colombo, // Asia/Colombo - 0x0af0e91d + &kZoneCET, // CET - 0x0b87d921 + &kZoneEET, // EET - 0x0b87e1a3 + &kZoneEST, // EST - 0x0b87e371 + &kZoneHST, // HST - 0x0b87f034 + &kZoneMET, // MET - 0x0b8803ab + &kZoneMST, // MST - 0x0b880579 + &kZoneWET, // WET - 0x0b882e35 + &kZoneAmerica_Guatemala, // America/Guatemala - 0x0c8259f7 + &kZoneAfrica_Monrovia, // Africa/Monrovia - 0x0ce90385 + &kZoneAntarctica_Rothera, // Antarctica/Rothera - 0x0e86d203 + &kZoneAmerica_Yellowknife, // America/Yellowknife - 0x0f76c76f + &kZoneAustralia_Melbourne, // Australia/Melbourne - 0x0fe559a3 + &kZoneAmerica_Sao_Paulo, // America/Sao_Paulo - 0x1063bfc9 + &kZoneEurope_Amsterdam, // Europe/Amsterdam - 0x109395c2 + &kZoneAmerica_Indiana_Vevay, // America/Indiana/Vevay - 0x10aca054 + &kZoneAmerica_Scoresbysund, // America/Scoresbysund - 0x123f8d2a + &kZoneAsia_Samarkand, // Asia/Samarkand - 0x13ae5104 + &kZoneAsia_Amman, // Asia/Amman - 0x148d21bc + &kZoneAsia_Aqtau, // Asia/Aqtau - 0x148f710e + &kZoneAsia_Chita, // Asia/Chita - 0x14ae863b + &kZoneAsia_Dhaka, // Asia/Dhaka - 0x14c07b8b + &kZoneAsia_Dubai, // Asia/Dubai - 0x14c79f77 + &kZoneAmerica_Bahia_Banderas, // America/Bahia_Banderas - 0x14f6329a + &kZoneAsia_Kabul, // Asia/Kabul - 0x153b5601 + &kZoneAsia_Macau, // Asia/Macau - 0x155f88b9 + &kZoneAsia_Qatar, // Asia/Qatar - 0x15a8330b + &kZoneAsia_Seoul, // Asia/Seoul - 0x15ce82da + &kZoneAsia_Tokyo, // Asia/Tokyo - 0x15e606a8 + &kZoneAsia_Tomsk, // Asia/Tomsk - 0x15e60e60 + &kZoneAsia_Thimphu, // Asia/Thimphu - 0x170380d1 + &kZoneAmerica_Guayaquil, // America/Guayaquil - 0x17e64958 + &kZoneAmerica_Kentucky_Louisville, // America/Kentucky/Louisville - 0x1a21024b + &kZoneAsia_Pontianak, // Asia/Pontianak - 0x1a76c057 + &kZoneAtlantic_Reykjavik, // Atlantic/Reykjavik - 0x1c2b4f74 + &kZoneAmerica_New_York, // America/New_York - 0x1e2a7654 + &kZoneEurope_Luxembourg, // Europe/Luxembourg - 0x1f8bc6ce + &kZoneAsia_Baku, // Asia/Baku - 0x1fa788b5 + &kZoneAsia_Dili, // Asia/Dili - 0x1fa8c394 + &kZoneAsia_Gaza, // Asia/Gaza - 0x1faa4875 + &kZoneAsia_Hovd, // Asia/Hovd - 0x1fab0fe3 + &kZoneAsia_Omsk, // Asia/Omsk - 0x1faeddac + &kZoneAsia_Oral, // Asia/Oral - 0x1faef0a0 + &kZoneAsia_Ho_Chi_Minh, // Asia/Ho_Chi_Minh - 0x20f2d127 + &kZoneAsia_Damascus, // Asia/Damascus - 0x20fbb063 + &kZonePacific_Apia, // Pacific/Apia - 0x23359b5e + &kZonePacific_Fiji, // Pacific/Fiji - 0x23383ba5 + &kZonePacific_Guam, // Pacific/Guam - 0x2338f9ed + &kZonePacific_Niue, // Pacific/Niue - 0x233ca014 + &kZonePacific_Wake, // Pacific/Wake - 0x23416c2b + &kZoneAustralia_Adelaide, // Australia/Adelaide - 0x2428e8a3 + &kZonePacific_Auckland, // Pacific/Auckland - 0x25062f86 + &kZonePacific_Tongatapu, // Pacific/Tongatapu - 0x262ca836 + &kZoneAmerica_Monterrey, // America/Monterrey - 0x269a1deb + &kZoneAustralia_Darwin, // Australia/Darwin - 0x2876bdff + &kZonePacific_Pohnpei, // Pacific/Pohnpei - 0x28929f96 + &kZoneAsia_Famagusta, // Asia/Famagusta - 0x289b4f8b + &kZoneAmerica_Indiana_Vincennes, // America/Indiana/Vincennes - 0x28a0b212 + &kZoneAmerica_Indiana_Indianapolis, // America/Indiana/Indianapolis - 0x28a669a4 + &kZoneAsia_Vladivostok, // Asia/Vladivostok - 0x29de34a8 + &kZoneAmerica_Fortaleza, // America/Fortaleza - 0x2ad018ee + &kZoneAmerica_Vancouver, // America/Vancouver - 0x2c6f6b1f + &kZoneAmerica_Pangnirtung, // America/Pangnirtung - 0x2d999193 + &kZoneAmerica_Iqaluit, // America/Iqaluit - 0x2de310bf + &kZonePacific_Chatham, // Pacific/Chatham - 0x2f0de999 + &kZoneAmerica_Indiana_Marengo, // America/Indiana/Marengo - 0x2feeee72 + &kZoneEurope_Tallinn, // Europe/Tallinn - 0x30c4e096 + &kZoneAsia_Ulaanbaatar, // Asia/Ulaanbaatar - 0x30f0cc4e + &kZoneAmerica_Argentina_Ushuaia, // America/Argentina/Ushuaia - 0x320dcdde + &kZoneAustralia_Hobart, // Australia/Hobart - 0x32bf951a + &kZoneAsia_Dushanbe, // Asia/Dushanbe - 0x32fc5c3c + &kZoneAtlantic_South_Georgia, // Atlantic/South_Georgia - 0x33013174 + &kZoneAmerica_Phoenix, // America/Phoenix - 0x34b5af01 + &kZoneAntarctica_Mawson, // Antarctica/Mawson - 0x399cd863 + &kZoneAmerica_Caracas, // America/Caracas - 0x3be064f4 + &kZoneAmerica_Cayenne, // America/Cayenne - 0x3c617269 + &kZoneAtlantic_Bermuda, // Atlantic/Bermuda - 0x3d4bb1c4 + &kZoneAmerica_Managua, // America/Managua - 0x3d5e7600 + &kZoneAmerica_Argentina_San_Juan, // America/Argentina/San_Juan - 0x3e1009bd + &kZoneAmerica_Argentina_San_Luis, // America/Argentina/San_Luis - 0x3e11238c + &kZoneEurope_Volgograd, // Europe/Volgograd - 0x3ed0f389 + &kZoneAmerica_Fort_Nelson, // America/Fort_Nelson - 0x3f437e0f + &kZoneEtc_GMT_PLUS_10, // Etc/GMT+10 - 0x3f8f1cc4 + &kZoneEtc_GMT_PLUS_11, // Etc/GMT+11 - 0x3f8f1cc5 + &kZoneEtc_GMT_PLUS_12, // Etc/GMT+12 - 0x3f8f1cc6 + &kZoneEtc_GMT_10, // Etc/GMT-10 - 0x3f8f2546 + &kZoneEtc_GMT_11, // Etc/GMT-11 - 0x3f8f2547 + &kZoneEtc_GMT_12, // Etc/GMT-12 - 0x3f8f2548 + &kZoneEtc_GMT_13, // Etc/GMT-13 - 0x3f8f2549 + &kZoneEtc_GMT_14, // Etc/GMT-14 - 0x3f8f254a + &kZoneAntarctica_Palmer, // Antarctica/Palmer - 0x40962f4f + &kZoneEurope_Athens, // Europe/Athens - 0x4318fa27 + &kZoneIndian_Kerguelen, // Indian/Kerguelen - 0x4351b389 + &kZoneAmerica_Indiana_Winamac, // America/Indiana/Winamac - 0x4413fa69 + &kZoneEurope_Berlin, // Europe/Berlin - 0x44644c20 + &kZoneIndian_Chagos, // Indian/Chagos - 0x456f7c3c + &kZoneIndian_Mahe, // Indian/Mahe - 0x45e725e2 + &kZoneAsia_Ust_Nera, // Asia/Ust-Nera - 0x4785f921 + &kZoneEurope_Dublin, // Europe/Dublin - 0x4a275f62 + &kZoneAsia_Nicosia, // Asia/Nicosia - 0x4b0fcf78 + &kZoneAmerica_Chicago, // America/Chicago - 0x4b92b5d4 + &kZoneAustralia_Sydney, // Australia/Sydney - 0x4d1e9776 + &kZoneAntarctica_Vostok, // Antarctica/Vostok - 0x4f966fd4 + &kZoneAustralia_Brisbane, // Australia/Brisbane - 0x4fedc9c0 + &kZoneAmerica_Asuncion, // America/Asuncion - 0x50ec79a6 + &kZoneAsia_Karachi, // Asia/Karachi - 0x527f5245 + &kZonePacific_Gambier, // Pacific/Gambier - 0x53720c3a + &kZoneAmerica_Whitehorse, // America/Whitehorse - 0x54e0e3e8 + &kZoneAmerica_Martinique, // America/Martinique - 0x551e84c5 + &kZoneAmerica_Jamaica, // America/Jamaica - 0x565dad6c + &kZoneAsia_Hong_Kong, // Asia/Hong_Kong - 0x577f28ac + &kZonePacific_Marquesas, // Pacific/Marquesas - 0x57ca7135 + &kZoneAmerica_Miquelon, // America/Miquelon - 0x59674330 + &kZoneAntarctica_DumontDUrville, // Antarctica/DumontDUrville - 0x5a3c656c + &kZoneAmerica_Anchorage, // America/Anchorage - 0x5a79260e + &kZoneAsia_Jerusalem, // Asia/Jerusalem - 0x5becd23a + &kZoneEurope_Stockholm, // Europe/Stockholm - 0x5bf6fbb8 + &kZoneEurope_Lisbon, // Europe/Lisbon - 0x5c00a70b + &kZoneAtlantic_Cape_Verde, // Atlantic/Cape_Verde - 0x5c5e1772 + &kZoneEurope_London, // Europe/London - 0x5c6a84ae + &kZoneEurope_Madrid, // Europe/Madrid - 0x5dbd1535 + &kZoneAmerica_Moncton, // America/Moncton - 0x5e07fe24 + &kZonePacific_Bougainville, // Pacific/Bougainville - 0x5e10f7a4 + &kZoneEurope_Monaco, // Europe/Monaco - 0x5ebf9f01 + &kZoneEurope_Moscow, // Europe/Moscow - 0x5ec266fc + &kZoneAmerica_Argentina_Jujuy, // America/Argentina/Jujuy - 0x5f2f46c5 + &kZoneAmerica_Argentina_Salta, // America/Argentina/Salta - 0x5fc73403 + &kZonePacific_Pago_Pago, // Pacific/Pago_Pago - 0x603aebd0 + &kZonePacific_Enderbury, // Pacific/Enderbury - 0x61599a93 + &kZoneAfrica_Sao_Tome, // Africa/Sao_Tome - 0x61b319d1 + &kZoneAmerica_Creston, // America/Creston - 0x62a70204 + &kZoneAmerica_Costa_Rica, // America/Costa_Rica - 0x63ff66be + &kZoneAsia_Qostanay, // Asia/Qostanay - 0x654fe522 + &kZoneAmerica_Indiana_Knox, // America/Indiana/Knox - 0x6554adc9 + &kZoneEurope_Prague, // Europe/Prague - 0x65ee5d48 + &kZoneAmerica_Puerto_Rico, // America/Puerto_Rico - 0x6752ca31 + &kZoneIndian_Christmas, // Indian/Christmas - 0x68c207d5 + &kZoneAsia_Novokuznetsk, // Asia/Novokuznetsk - 0x69264f93 + &kZoneAmerica_Curacao, // America/Curacao - 0x6a879184 + &kZoneAmerica_Tijuana, // America/Tijuana - 0x6aa1df72 + &kZoneAsia_Makassar, // Asia/Makassar - 0x6aa21c85 + &kZoneEurope_Helsinki, // Europe/Helsinki - 0x6ab2975b + &kZoneAmerica_Porto_Velho, // America/Porto_Velho - 0x6b1aac77 + &kZoneEurope_Samara, // Europe/Samara - 0x6bc0b139 + &kZoneAmerica_Edmonton, // America/Edmonton - 0x6cb9484a + &kZoneAmerica_Dawson_Creek, // America/Dawson_Creek - 0x6cf24e5b + &kZoneAmerica_Grand_Turk, // America/Grand_Turk - 0x6e216197 + &kZoneAmerica_Blanc_Sablon, // America/Blanc-Sablon - 0x6e299892 + &kZoneEurope_Tirane, // Europe/Tirane - 0x6ea95b47 + &kZoneAmerica_Araguaina, // America/Araguaina - 0x6f9a3aef + &kZoneIndian_Reunion, // Indian/Reunion - 0x7076c047 + &kZoneAsia_Qyzylorda, // Asia/Qyzylorda - 0x71282e81 + &kZoneAsia_Kolkata, // Asia/Kolkata - 0x72c06cd9 + &kZoneEurope_Vienna, // Europe/Vienna - 0x734cc2e5 + &kZoneAsia_Kamchatka, // Asia/Kamchatka - 0x73baf9d7 + &kZoneAmerica_Santarem, // America/Santarem - 0x740caec1 + &kZoneAmerica_Santiago, // America/Santiago - 0x7410c9bc + &kZoneEurope_Warsaw, // Europe/Warsaw - 0x75185c19 + &kZoneAmerica_El_Salvador, // America/El_Salvador - 0x752ad652 + &kZoneAfrica_Bissau, // Africa/Bissau - 0x75564141 + &kZoneAmerica_Santo_Domingo, // America/Santo_Domingo - 0x75a0d177 + &kZoneAfrica_Accra, // Africa/Accra - 0x77d5b054 + &kZoneAfrica_Cairo, // Africa/Cairo - 0x77f8e228 + &kZoneAfrica_Ceuta, // Africa/Ceuta - 0x77fb46ec + &kZoneAfrica_Lagos, // Africa/Lagos - 0x789bb5d0 + &kZoneAfrica_Windhoek, // Africa/Windhoek - 0x789c9bd3 + &kZoneAmerica_Toronto, // America/Toronto - 0x792e851b + &kZoneAfrica_Tunis, // Africa/Tunis - 0x79378e6d + &kZoneIndian_Mauritius, // Indian/Mauritius - 0x7b09c02a + &kZoneAtlantic_Stanley, // Atlantic/Stanley - 0x7bb3e1c4 + &kZoneEurope_Zurich, // Europe/Zurich - 0x7d8195b9 + &kZoneAsia_Kuching, // Asia/Kuching - 0x801b003b + &kZoneAtlantic_Madeira, // Atlantic/Madeira - 0x81b5c037 + &kZoneAmerica_Atikokan, // America/Atikokan - 0x81b92098 + &kZonePacific_Kiritimati, // Pacific/Kiritimati - 0x8305073a + &kZoneAmerica_Metlakatla, // America/Metlakatla - 0x84de2686 + &kZoneAsia_Yakutsk, // Asia/Yakutsk - 0x87bb3a9e + &kZoneAmerica_Chihuahua, // America/Chihuahua - 0x8827d776 + &kZonePacific_Pitcairn, // Pacific/Pitcairn - 0x8837d8bd + &kZonePacific_Chuuk, // Pacific/Chuuk - 0x8a090b23 + &kZonePacific_Efate, // Pacific/Efate - 0x8a2bce28 + &kZonePacific_Nauru, // Pacific/Nauru - 0x8acc41ae + &kZoneEST5EDT, // EST5EDT - 0x8adc72a3 + &kZonePacific_Palau, // Pacific/Palau - 0x8af04a36 + &kZoneAmerica_Winnipeg, // America/Winnipeg - 0x8c7dafc7 + &kZoneAustralia_Eucla, // Australia/Eucla - 0x8cf99e44 + &kZoneAmerica_Argentina_Catamarca, // America/Argentina/Catamarca - 0x8d40986b + &kZoneAustralia_Perth, // Australia/Perth - 0x8db8269d + &kZonePacific_Kwajalein, // Pacific/Kwajalein - 0x8e216759 + &kZoneAmerica_Port_au_Prince, // America/Port-au-Prince - 0x8e4a7bdc + &kZoneAfrica_Maputo, // Africa/Maputo - 0x8e6ca1f0 + &kZonePacific_Norfolk, // Pacific/Norfolk - 0x8f4eb4be + &kZoneAsia_Yerevan, // Asia/Yerevan - 0x9185c8cc + &kZoneAmerica_Detroit, // America/Detroit - 0x925cfbc1 + &kZoneAsia_Choibalsan, // Asia/Choibalsan - 0x928aa4a6 + &kZoneAntarctica_Macquarie, // Antarctica/Macquarie - 0x92f47626 + &kZoneAmerica_Belize, // America/Belize - 0x93256c81 + &kZoneAmerica_Bogota, // America/Bogota - 0x93d7bc62 + &kZoneAsia_Pyongyang, // Asia/Pyongyang - 0x93ed1c8e + &kZoneAmerica_Indiana_Petersburg, // America/Indiana/Petersburg - 0x94ac7acc + &kZoneAmerica_Cancun, // America/Cancun - 0x953331be + &kZoneAmerica_Glace_Bay, // America/Glace_Bay - 0x9681f8dd + &kZoneAsia_Khandyga, // Asia/Khandyga - 0x9685a4d9 + &kZoneAmerica_Cuiaba, // America/Cuiaba - 0x969a52eb + &kZoneAmerica_Dawson, // America/Dawson - 0x978d8d12 + &kZoneAmerica_Denver, // America/Denver - 0x97d10b2a + &kZoneAmerica_Bahia, // America/Bahia - 0x97d815fb + &kZoneAmerica_Belem, // America/Belem - 0x97da580b + &kZoneAmerica_Boise, // America/Boise - 0x97dfc8d8 + &kZoneEurope_Andorra, // Europe/Andorra - 0x97f6764b + &kZoneAmerica_Adak, // America/Adak - 0x97fe49d7 + &kZoneAmerica_Lima, // America/Lima - 0x980468c9 + &kZoneAmerica_Nome, // America/Nome - 0x98059b15 + &kZoneAmerica_Nuuk, // America/Nuuk - 0x9805b5a9 + &kZoneIndian_Maldives, // Indian/Maldives - 0x9869681c + &kZoneAmerica_Sitka, // America/Sitka - 0x99104ce2 + &kZoneAmerica_Thule, // America/Thule - 0x9921dd68 + &kZonePacific_Rarotonga, // Pacific/Rarotonga - 0x9981a3b0 + &kZoneAsia_Kathmandu, // Asia/Kathmandu - 0x9a96ce6f + &kZoneAmerica_North_Dakota_Beulah, // America/North_Dakota/Beulah - 0x9b52b384 + &kZoneAmerica_Rainy_River, // America/Rainy_River - 0x9cd58a10 + &kZoneEurope_Budapest, // Europe/Budapest - 0x9ce0197c + &kZoneAsia_Baghdad, // Asia/Baghdad - 0x9ceffbed + &kZoneEtc_GMT_PLUS_1, // Etc/GMT+1 - 0x9d13da14 + &kZoneEtc_GMT_PLUS_2, // Etc/GMT+2 - 0x9d13da15 + &kZoneEtc_GMT_PLUS_3, // Etc/GMT+3 - 0x9d13da16 + &kZoneEtc_GMT_PLUS_4, // Etc/GMT+4 - 0x9d13da17 + &kZoneEtc_GMT_PLUS_5, // Etc/GMT+5 - 0x9d13da18 + &kZoneEtc_GMT_PLUS_6, // Etc/GMT+6 - 0x9d13da19 + &kZoneEtc_GMT_PLUS_7, // Etc/GMT+7 - 0x9d13da1a + &kZoneEtc_GMT_PLUS_8, // Etc/GMT+8 - 0x9d13da1b + &kZoneEtc_GMT_PLUS_9, // Etc/GMT+9 - 0x9d13da1c + &kZoneEtc_GMT_1, // Etc/GMT-1 - 0x9d13da56 + &kZoneEtc_GMT_2, // Etc/GMT-2 - 0x9d13da57 + &kZoneEtc_GMT_3, // Etc/GMT-3 - 0x9d13da58 + &kZoneEtc_GMT_4, // Etc/GMT-4 - 0x9d13da59 + &kZoneEtc_GMT_5, // Etc/GMT-5 - 0x9d13da5a + &kZoneEtc_GMT_6, // Etc/GMT-6 - 0x9d13da5b + &kZoneEtc_GMT_7, // Etc/GMT-7 - 0x9d13da5c + &kZoneEtc_GMT_8, // Etc/GMT-8 - 0x9d13da5d + &kZoneEtc_GMT_9, // Etc/GMT-9 - 0x9d13da5e + &kZoneAmerica_Nipigon, // America/Nipigon - 0x9d2a8b1a + &kZoneAmerica_Rio_Branco, // America/Rio_Branco - 0x9d352764 + &kZoneAsia_Bangkok, // Asia/Bangkok - 0x9d6e3aaf + &kZoneAfrica_El_Aaiun, // Africa/El_Aaiun - 0x9d6fb118 + &kZoneAmerica_North_Dakota_Center, // America/North_Dakota/Center - 0x9da42814 + &kZoneAsia_Barnaul, // Asia/Barnaul - 0x9dba4997 + &kZoneAfrica_Tripoli, // Africa/Tripoli - 0x9dfebd3d + &kZoneEurope_Istanbul, // Europe/Istanbul - 0x9e09d6e6 + &kZoneAfrica_Ndjamena, // Africa/Ndjamena - 0x9fe09898 + &kZoneAmerica_Guyana, // America/Guyana - 0x9ff7bd0b + &kZoneAmerica_Havana, // America/Havana - 0xa0e15675 + &kZoneAsia_Novosibirsk, // Asia/Novosibirsk - 0xa2a435cb + &kZoneEurope_Kiev, // Europe/Kiev - 0xa2c19eb3 + &kZoneEurope_Oslo, // Europe/Oslo - 0xa2c3fba1 + &kZoneEurope_Riga, // Europe/Riga - 0xa2c57587 + &kZoneEurope_Rome, // Europe/Rome - 0xa2c58fd7 + &kZoneAmerica_Inuvik, // America/Inuvik - 0xa42189fc + &kZoneAmerica_Argentina_La_Rioja, // America/Argentina/La_Rioja - 0xa46b7eef + &kZoneAsia_Almaty, // Asia/Almaty - 0xa61f41fa + &kZoneAsia_Anadyr, // Asia/Anadyr - 0xa63cebd1 + &kZoneAsia_Aqtobe, // Asia/Aqtobe - 0xa67dcc4e + &kZoneAsia_Atyrau, // Asia/Atyrau - 0xa6b6e068 + &kZoneAmerica_Juneau, // America/Juneau - 0xa6f13e2e + &kZoneAustralia_Lord_Howe, // Australia/Lord_Howe - 0xa748b67d + &kZonePacific_Port_Moresby, // Pacific/Port_Moresby - 0xa7ba7f68 + &kZoneAsia_Beirut, // Asia/Beirut - 0xa7f3d5fd + &kZoneAfrica_Nairobi, // Africa/Nairobi - 0xa87ab57e + &kZoneAsia_Brunei, // Asia/Brunei - 0xa8e595f7 + &kZonePacific_Galapagos, // Pacific/Galapagos - 0xa952f752 + &kZoneAmerica_Argentina_Mendoza, // America/Argentina/Mendoza - 0xa9f72d5c + &kZoneAmerica_La_Paz, // America/La_Paz - 0xaa29125d + &kZoneAmerica_Noronha, // America/Noronha - 0xab5116fb + &kZoneAmerica_Maceio, // America/Maceio - 0xac80c6d4 + &kZoneAmerica_Manaus, // America/Manaus - 0xac86bf8b + &kZoneAmerica_Merida, // America/Merida - 0xacd172d8 + &kZoneEurope_Chisinau, // Europe/Chisinau - 0xad58aa18 + &kZoneAmerica_Nassau, // America/Nassau - 0xaedef011 + &kZoneEurope_Uzhgorod, // Europe/Uzhgorod - 0xb066f5d6 + &kZoneAustralia_Broken_Hill, // Australia/Broken_Hill - 0xb06eada3 + &kZoneAsia_Bishkek, // Asia/Bishkek - 0xb0728553 + &kZoneAmerica_Paramaribo, // America/Paramaribo - 0xb319e4c4 + &kZoneAmerica_Panama, // America/Panama - 0xb3863854 + &kZoneAsia_Hebron, // Asia/Hebron - 0xb5eef250 + &kZoneAmerica_Goose_Bay, // America/Goose_Bay - 0xb649541e + &kZoneAmerica_Los_Angeles, // America/Los_Angeles - 0xb7f7e8f2 + &kZoneAmerica_Recife, // America/Recife - 0xb8730494 + &kZoneAmerica_Regina, // America/Regina - 0xb875371c + &kZoneAsia_Ashgabat, // Asia/Ashgabat - 0xba87598d + &kZoneAmerica_Halifax, // America/Halifax - 0xbc5b7183 + &kZoneAsia_Srednekolymsk, // Asia/Srednekolymsk - 0xbf8e337d + &kZoneAmerica_Argentina_Cordoba, // America/Argentina/Cordoba - 0xbfccc308 + &kZoneAmerica_Tegucigalpa, // America/Tegucigalpa - 0xbfd6fd4c + &kZoneAsia_Manila, // Asia/Manila - 0xc156c944 + &kZoneAfrica_Abidjan, // Africa/Abidjan - 0xc21305a3 + &kZoneAmerica_Punta_Arenas, // America/Punta_Arenas - 0xc2c3bce7 + &kZoneAfrica_Casablanca, // Africa/Casablanca - 0xc59f1b33 + &kZoneAmerica_Argentina_Rio_Gallegos, // America/Argentina/Rio_Gallegos - 0xc5b0f565 + &kZoneAsia_Jayapura, // Asia/Jayapura - 0xc6833c2f + &kZoneAmerica_Resolute, // America/Resolute - 0xc7093459 + &kZoneAmerica_Rankin_Inlet, // America/Rankin_Inlet - 0xc8de4984 + &kZoneAmerica_Barbados, // America/Barbados - 0xcbbc3b04 + &kZoneAsia_Riyadh, // Asia/Riyadh - 0xcd973d93 + &kZonePacific_Easter, // Pacific/Easter - 0xcf54f7e7 + &kZoneAsia_Singapore, // Asia/Singapore - 0xcf8581fa + &kZoneAsia_Krasnoyarsk, // Asia/Krasnoyarsk - 0xd0376c6a + &kZoneAmerica_Mexico_City, // America/Mexico_City - 0xd0d93f43 + &kZoneAsia_Taipei, // Asia/Taipei - 0xd1a844ae + &kZoneAsia_Tehran, // Asia/Tehran - 0xd1f02254 + &kZoneEurope_Kaliningrad, // Europe/Kaliningrad - 0xd33b2f28 + &kZoneAmerica_Argentina_Buenos_Aires, // America/Argentina/Buenos_Aires - 0xd43b4c0d + &kZoneAfrica_Juba, // Africa/Juba - 0xd51b395c + &kZoneAsia_Urumqi, // Asia/Urumqi - 0xd5379735 + &kZoneAmerica_Cambridge_Bay, // America/Cambridge_Bay - 0xd5a44aff + &kZoneAfrica_Johannesburg, // Africa/Johannesburg - 0xd5d157a0 + &kZoneAmerica_Port_of_Spain, // America/Port_of_Spain - 0xd8b28d59 + &kZoneEtc_GMT, // Etc/GMT - 0xd8e2de58 + &kZoneEtc_UTC, // Etc/UTC - 0xd8e31abc + &kZoneAmerica_Yakutat, // America/Yakutat - 0xd8ee31e9 + &kZoneAfrica_Algiers, // Africa/Algiers - 0xd94515c1 + &kZonePST8PDT, // PST8PDT - 0xd99ee2dc + &kZoneEurope_Simferopol, // Europe/Simferopol - 0xda9eb724 + &kZonePacific_Funafuti, // Pacific/Funafuti - 0xdb402d65 + &kZoneAmerica_Matamoros, // America/Matamoros - 0xdd1b0259 + &kZoneAsia_Yangon, // Asia/Yangon - 0xdd54a8be + &kZoneEurope_Vilnius, // Europe/Vilnius - 0xdd63b8ce + &kZonePacific_Kosrae, // Pacific/Kosrae - 0xde5139a8 + &kZoneAmerica_Kentucky_Monticello, // America/Kentucky/Monticello - 0xde71c439 + &kZoneEurope_Brussels, // Europe/Brussels - 0xdee07337 + &kZoneAmerica_Swift_Current, // America/Swift_Current - 0xdef98e55 + &kZoneAsia_Irkutsk, // Asia/Irkutsk - 0xdfbf213f + &kZoneEurope_Ulyanovsk, // Europe/Ulyanovsk - 0xe03783d0 + &kZoneAustralia_Lindeman, // Australia/Lindeman - 0xe05029e2 + &kZoneEurope_Belgrade, // Europe/Belgrade - 0xe0532b3a + &kZoneAmerica_Menominee, // America/Menominee - 0xe0e9c583 + &kZoneEurope_Copenhagen, // Europe/Copenhagen - 0xe0ed30bc + &kZoneAtlantic_Faroe, // Atlantic/Faroe - 0xe110a971 + &kZonePacific_Majuro, // Pacific/Majuro - 0xe1f95371 + &kZoneAntarctica_Casey, // Antarctica/Casey - 0xe2022583 + &kZoneAntarctica_Davis, // Antarctica/Davis - 0xe2144b45 + &kZoneEurope_Astrakhan, // Europe/Astrakhan - 0xe22256e1 + &kZoneAntarctica_Syowa, // Antarctica/Syowa - 0xe330c7e1 + &kZoneAntarctica_Troll, // Antarctica/Troll - 0xe33f085b + &kZoneEurope_Saratov, // Europe/Saratov - 0xe4315da4 + &kZonePacific_Noumea, // Pacific/Noumea - 0xe551b788 + &kZonePacific_Honolulu, // Pacific/Honolulu - 0xe6e70af9 + &kZoneAmerica_Argentina_Tucuman, // America/Argentina/Tucuman - 0xe96399eb + &kZoneEurope_Zaporozhye, // Europe/Zaporozhye - 0xeab9767f + &kZoneAsia_Magadan, // Asia/Magadan - 0xebacc19b + &kZoneAmerica_Ojinaga, // America/Ojinaga - 0xebfde83f + &kZoneCST6CDT, // CST6CDT - 0xf0e87d00 + &kZonePacific_Tahiti, // Pacific/Tahiti - 0xf24c2446 + &kZonePacific_Tarawa, // Pacific/Tarawa - 0xf2517e63 + &kZoneMST7MDT, // MST7MDT - 0xf2af9375 + &kZoneAsia_Tashkent, // Asia/Tashkent - 0xf3924254 + &kZoneAsia_Sakhalin, // Asia/Sakhalin - 0xf4a1c9bd + &kZonePacific_Guadalcanal, // Pacific/Guadalcanal - 0xf4dd25f0 + &kZoneAmerica_Danmarkshavn, // America/Danmarkshavn - 0xf554d204 + &kZoneAsia_Shanghai, // Asia/Shanghai - 0xf895a7f5 + &kZoneEurope_Gibraltar, // Europe/Gibraltar - 0xf8e325fc + &kZoneAtlantic_Azores, // Atlantic/Azores - 0xf93ed918 + &kZonePacific_Wallis, // Pacific/Wallis - 0xf94ddb0f + &kZoneAmerica_Thunder_Bay, // America/Thunder_Bay - 0xf962e71b + &kZoneAmerica_Eirunepe, // America/Eirunepe - 0xf9b29683 + &kZoneAmerica_Montevideo, // America/Montevideo - 0xfa214780 + &kZoneEurope_Kirov, // Europe/Kirov - 0xfaf5abef + &kZoneEurope_Malta, // Europe/Malta - 0xfb1560f3 + &kZoneEurope_Minsk, // Europe/Minsk - 0xfb19cc66 + &kZoneEurope_Bucharest, // Europe/Bucharest - 0xfb349ec5 + &kZoneAfrica_Khartoum, // Africa/Khartoum - 0xfb3d4205 + &kZoneEurope_Paris, // Europe/Paris - 0xfb4bc2a3 + &kZoneAsia_Yekaterinburg, // Asia/Yekaterinburg - 0xfb544c6e + &kZoneEurope_Sofia, // Europe/Sofia - 0xfb898656 + &kZoneAtlantic_Canary, // Atlantic/Canary - 0xfc23f2c2 + &kZoneAmerica_Campo_Grande, // America/Campo_Grande - 0xfec3e7a6 }; diff --git a/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino b/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino index 592785568..997e25d0d 100644 --- a/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino +++ b/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino @@ -50,9 +50,7 @@ test(BasicZoneRegistrarTest, registrySize) { test(BasicZoneRegistrarTest, getZoneInfo_Los_Angeles) { BasicZoneRegistrar zoneRegistrar( zonedb::kZoneRegistrySize, zonedb::kZoneRegistry); - // FIXME: tzcompiler.py must be updated to sort the kZoneRegistry using - // zoneId, not zoneName. - //assertTrue(zoneRegistrar.isSorted()); + assertTrue(zoneRegistrar.isSorted()); const basic::ZoneInfo* zoneInfo = zoneRegistrar.getZoneInfoForName("America/Los_Angeles"); @@ -70,14 +68,6 @@ test(BasicZoneRegistrarTest, getZoneInfo_not_found) { assertEqual(zoneInfo, nullptr); } -test(BasicZoneRegistrarTest, getZoneInfo_Index_0) { - BasicZoneRegistrar zoneRegistrar( - zonedb::kZoneRegistrySize, zonedb::kZoneRegistry); - const basic::ZoneInfo* zoneInfo = zoneRegistrar.getZoneInfoForIndex(0); - assertNotEqual(zoneInfo, nullptr); - assertEqual(F("Africa/Abidjan"), BasicZone(zoneInfo).name()); -} - test(BasicZoneRegistrarTest, getZoneInfo_Index_not_found) { BasicZoneRegistrar zoneRegistrar( zonedb::kZoneRegistrySize, zonedb::kZoneRegistry); diff --git a/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino b/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino index d534a1bb0..c5dfb20dc 100644 --- a/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino +++ b/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino @@ -26,9 +26,7 @@ test(ExtendedZoneRegistrarTest, registrySize) { test(ExtendedZoneRegistrarTest, getZoneInfoForName_Los_Angeles) { ExtendedZoneRegistrar zoneRegistrar( zonedbx::kZoneRegistrySize, zonedbx::kZoneRegistry); - // FIXME: tzcompiler.py must be updated to sort the kZoneRegistry using - // zoneId, not zoneName. - //assertTrue(zoneRegistrar.isSorted()); + assertTrue(zoneRegistrar.isSorted()); const extended::ZoneInfo* zoneInfo = zoneRegistrar.getZoneInfoForName("America/Los_Angeles"); @@ -46,14 +44,6 @@ test(ExtendedZoneRegistrarTest, getZoneInfoForName_not_found) { assertEqual(zoneInfo, nullptr); } -test(ExtendedZoneRegistrarTest, getZoneInfo_Index_0) { - ExtendedZoneRegistrar zoneRegistrar( - zonedbx::kZoneRegistrySize, zonedbx::kZoneRegistry); - const extended::ZoneInfo* zoneInfo = zoneRegistrar.getZoneInfoForIndex(0); - assertNotEqual(zoneInfo, nullptr); - assertEqual(F("Africa/Abidjan"), ExtendedZone(zoneInfo).name()); -} - test(ExtendedZoneRegistrarTest, getZoneInfo_Index_not_found) { ExtendedZoneRegistrar zoneRegistrar( zonedbx::kZoneRegistrySize, zonedbx::kZoneRegistry); diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index ad2d08f22..f298d7c98 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -103,6 +103,7 @@ def __init__( tz_version=zidb['tz_version'], scope=zidb['scope'], zones_map=zidb['zones_map'], + zone_ids=zidb['zone_ids'], ) def generate_files(self, output_dir: str) -> None: @@ -1005,7 +1006,7 @@ class ZoneRegistryGenerator: namespace {dbNamespace} {{ //--------------------------------------------------------------------------- -// Zone registry. Sorted by zone name. +// Zone registry. Sorted by zoneId. //--------------------------------------------------------------------------- const {scope}::ZoneInfo* const kZoneRegistry[{numZones}] {progmem} = {{ {zoneRegistryItems} @@ -1053,6 +1054,7 @@ def __init__( scope: str, db_namespace: str, zones_map: ZonesMap, + zone_ids: Dict[str, int], ): self.invocation = invocation self.tz_version = tz_version @@ -1060,14 +1062,24 @@ def __init__( self.scope = scope self.db_namespace = db_namespace self.zones_map = zones_map + self.zone_ids = zone_ids self.db_header_namespace = self.db_namespace.upper() def generate_registry_cpp(self) -> str: + # Sort the zones by zoneId (instead of zoneName) to enable + # ZoneRegistrar::binarySearchById(). zone_registry_items = '' - for zone_name, eras in sorted(self.zones_map.items()): + for zone_name, eras in sorted( + self.zones_map.items(), + key=lambda x: self.zone_ids[x[0]], + ): name = normalize_name(zone_name) - zone_registry_items += f' &kZone{name}, // {zone_name}\n' + zone_id = self.zone_ids[zone_name] + zone_registry_items += f"""\ + &kZone{name}, // {zone_name} - 0x{zone_id:08x} +""" + return self.ZONE_REGISTRY_CPP_FILE.format( invocation=self.invocation, tz_files=self.tz_files, From d3036af888559540ec8dc556909bdff5b30adff0 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 4 Jan 2021 20:16:21 -0800 Subject: [PATCH 15/74] CHANGELOG.md: Explain performance improvements for ZoneManager::createForZoneName() and createForZoneId() --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 881178a74..1fd36a461 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ * Unreleased * Experimental `--fat_links` flag when generating zonedb and zonedbx files. + * Use binary search for both `ZoneManager::createForZoneName()` and + `ZoneManager::createForZoneId()`. Previously, the `zone_registry.cpp` was + sorted by zoneName, so only the `createForZoneName()` could use the binary + search. The new solution sorts the `zone_registry.cpp` entries by `zoneId` + instead of `zoneName`. The `createForZoneId()` can use the binary search + algorith. The `createForZoneName()` can also use the binary search because + the `zoneName` is converted dynamically to its `zoneId` using the same + djb2 hash algorithm used by the `tzcompiler.py`. If there is a match, a + final verification against the exact `zoneName` is performed to make sure + that there was no hash collision. Updated `AutoBenchmark.ino` to determine + that a binary search on the 386 zones in `zonedbx/zone_registry.cpp` is + 10X faster (on average) than a linear search through the same list. + (Linear search takes ~190 iterations; binary search takes ~9 iterations.) * 1.4.1 (2020-12-30, TZDB version 2020f for real) * Actually update `src/ace_time/zonedb` and `src/ace_time/zonedbx` zone info files to 2020f. Oops. From 3ad5494b9641c3da0e6e03f484ca97a1fc0ccc7d Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 13:08:43 -0800 Subject: [PATCH 16/74] AutoBenchmark: Run binary and linear algorithms separately --- examples/AutoBenchmark/Benchmark.cpp | 58 +++++++++++++++++++++------- src/ace_time/ZoneRegistrar.h | 18 ++++++++- 2 files changed, 61 insertions(+), 15 deletions(-) diff --git a/examples/AutoBenchmark/Benchmark.cpp b/examples/AutoBenchmark/Benchmark.cpp index d69a7c4a4..ad7aaa633 100644 --- a/examples/AutoBenchmark/Benchmark.cpp +++ b/examples/AutoBenchmark/Benchmark.cpp @@ -20,7 +20,7 @@ const uint32_t COUNT = 100000; const uint32_t COUNT = 100000; #elif defined(UNIX_HOST_DUINO) // Linux or MacOS -const uint32_t COUNT = 200000; +const uint32_t COUNT = 100000; #else // A generic Arduino board that we have not looked at. const uint32_t COUNT = 10000; @@ -401,21 +401,21 @@ static void runZonedDateTimeForEpochSecondsExtendedZoneManagerCached() { #if ! defined(ARDUINO_ARCH_AVR) static void runIndexForZoneName() { - ExtendedZoneManager<2> manager( + ExtendedZoneRegistrar registrar( zonedbx::kZoneRegistrySize, zonedbx::kZoneRegistry); - unsigned long runMillis = runLambda(COUNT, [&manager]() { + unsigned long runMillis = runLambda(COUNT, [®istrar]() { PrintStr<20> printStr; // deliberately short to truncate some zones uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; const __FlashStringHelper* name = ExtendedZone(info).name(); printStr.print(name); - uint16_t index = manager.indexForZoneName(printStr.getCstr()); + uint16_t index = registrar.findIndexForName(printStr.getCstr()); disableOptimization(index); }); - unsigned long emptyLoopMillis = runLambda(COUNT, [&manager]() { + unsigned long emptyLoopMillis = runLambda(COUNT, []() { PrintStr<20> printStr; // deliberately short to truncate some zones uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; @@ -433,24 +433,55 @@ static void runIndexForZoneName() { long elapsedMillis = runMillis - emptyLoopMillis; - SERIAL_PORT_MONITOR.print(F("ExtendedZoneManager::indexForZoneName()")); + SERIAL_PORT_MONITOR.print(F("ExtendedZoneManager::indexForZoneName(binary)")); printMicrosPerIteration(elapsedMillis); SERIAL_PORT_MONITOR.println(); } -static void runIndexForZoneId() { - ExtendedZoneManager<2> manager( +// non-static to allow friend access into ExtendedZoneRegistrar +void runIndexForZoneIdBinary() { + ExtendedZoneRegistrar registrar( + zonedbx::kZoneRegistrySize, zonedbx::kZoneRegistry); + + unsigned long runMillis = runLambda(COUNT, [®istrar]() { + uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); + const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; + uint32_t zoneId = ExtendedZone(info).zoneId(); + + uint16_t index = registrar.findIndexForIdBinary(zoneId); + disableOptimization(index); + }); + + unsigned long emptyLoopMillis = runLambda(COUNT, []() { + uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); + const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; + uint32_t zoneId = ExtendedZone(info).zoneId(); + + disableOptimization(zoneId); + }); + + long elapsedMillis = runMillis - emptyLoopMillis; + + SERIAL_PORT_MONITOR.print(F("ExtendedZoneManager::indexForZoneId(binary)")); + printMicrosPerIteration(elapsedMillis); + SERIAL_PORT_MONITOR.println(); +} + +// non-static to allow friend access into ExtendedZoneRegistrar +void runIndexForZoneIdLinear() { + ExtendedZoneRegistrar registrar( zonedbx::kZoneRegistrySize, zonedbx::kZoneRegistry); - unsigned long runMillis = runLambda(COUNT, [&manager]() { + + unsigned long runMillis = runLambda(COUNT, [®istrar]() { uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; uint32_t zoneId = ExtendedZone(info).zoneId(); - uint16_t index = manager.indexForZoneId(zoneId); + uint16_t index = registrar.findIndexForIdLinear(zoneId); disableOptimization(index); }); - unsigned long emptyLoopMillis = runLambda(COUNT, [&manager]() { + unsigned long emptyLoopMillis = runLambda(COUNT, []() { uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; uint32_t zoneId = ExtendedZone(info).zoneId(); @@ -460,7 +491,7 @@ static void runIndexForZoneId() { long elapsedMillis = runMillis - emptyLoopMillis; - SERIAL_PORT_MONITOR.print(F("ExtendedZoneManager::indexForZoneId()")); + SERIAL_PORT_MONITOR.print(F("ExtendedZoneManager::indexForZoneId(linear)")); printMicrosPerIteration(elapsedMillis); SERIAL_PORT_MONITOR.println(); } @@ -488,7 +519,8 @@ void runBenchmarks() { #if ! defined(ARDUINO_ARCH_AVR) runIndexForZoneName(); - runIndexForZoneId(); + runIndexForZoneIdBinary(); + runIndexForZoneIdLinear(); #endif SERIAL_PORT_MONITOR.print(F("Iterations_per_run ")); diff --git a/src/ace_time/ZoneRegistrar.h b/src/ace_time/ZoneRegistrar.h index a22cf69ec..f9b45f407 100644 --- a/src/ace_time/ZoneRegistrar.h +++ b/src/ace_time/ZoneRegistrar.h @@ -13,6 +13,8 @@ #include "internal/ZoneInfo.h" #include "internal/Brokers.h" +void runIndexForZoneIdBinary(); +void runIndexForZoneIdLinear(); class BasicZoneRegistrarTest_Sorted_isSorted; class BasicZoneRegistrarTest_Unsorted_isSorted; class BasicZoneRegistrarTest_Sorted_linearSearchById; @@ -102,7 +104,7 @@ class ZoneRegistrar { /** Find the index for zone id. Return kInvalidIndex if not found. */ uint16_t findIndexForId(uint32_t zoneId) const { - if (mIsSorted && mRegistrySize > 8) { + if (mIsSorted && mRegistrySize >= kBinarySearchThreshold) { return binarySearchById(mZoneRegistry, mRegistrySize, zoneId); } else { return linearSearchById(mZoneRegistry, mRegistrySize, zoneId); @@ -110,6 +112,8 @@ class ZoneRegistrar { } protected: + friend void ::runIndexForZoneIdBinary(); + friend void ::runIndexForZoneIdLinear(); friend class ::BasicZoneRegistrarTest_Sorted_isSorted; friend class ::BasicZoneRegistrarTest_Unsorted_isSorted; friend class ::BasicZoneRegistrarTest_Sorted_linearSearchById; @@ -121,7 +125,7 @@ class ZoneRegistrar { friend class ::BasicZoneRegistrarTest_Unsorted_linearSearchById_not_found; /** Use binarySearch() if registrySize >= threshold. */ - static const uint8_t kBinarySearchThreshold = 6; + static const uint8_t kBinarySearchThreshold = 8; /** Determine if the given zone registry is sorted by id. */ static bool isSorted(const ZI* const* registry, uint16_t registrySize) { @@ -199,6 +203,16 @@ class ZoneRegistrar { return kInvalidIndex; } + /** Exposed only for benchmarking purposes. */ + uint16_t findIndexForIdLinear(uint32_t zoneId) const { + return linearSearchById(mZoneRegistry, mRegistrySize, zoneId); + } + + /** Exposed only for benchmarking purposes. */ + uint16_t findIndexForIdBinary(uint32_t zoneId) const { + return binarySearchById(mZoneRegistry, mRegistrySize, zoneId); + } + uint16_t const mRegistrySize; bool const mIsSorted; const ZI* const* const mZoneRegistry; From 296c96a8ab0c43a15ee029331564449bc53c98fa Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 09:36:50 -0800 Subject: [PATCH 17/74] src/internal/Brokers: Add zoneContext() method that returns the ZoneContext --- src/ace_time/internal/Brokers.h | 28 +++++++++++-------- tests/BasicBrokerTest/BasicBrokerTest.ino | 1 + .../ExtendedBrokerTest/ExtendedBrokerTest.ino | 1 + 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/ace_time/internal/Brokers.h b/src/ace_time/internal/Brokers.h index a85407f3d..ee6698014 100644 --- a/src/ace_time/internal/Brokers.h +++ b/src/ace_time/internal/Brokers.h @@ -318,6 +318,10 @@ class ZoneInfoBroker { #if ACE_TIME_USE_PROGMEM + const ZoneContext* zoneContext() const { + return (const ZoneContext*) pgm_read_ptr(&mZoneInfo->zoneContext); + } + const char* name() const { return (const char*) pgm_read_ptr(&mZoneInfo->name); } @@ -327,15 +331,11 @@ class ZoneInfoBroker { } int16_t startYear() const { - const ZoneContext* zoneContext = - (const ZoneContext*) pgm_read_ptr(&mZoneInfo->zoneContext); - return zoneContext->startYear; + return zoneContext()->startYear; } int16_t untilYear() const { - const ZoneContext* zoneContext = - (const ZoneContext*) pgm_read_ptr(&mZoneInfo->zoneContext); - return zoneContext->untilYear; + return zoneContext()->untilYear; } uint8_t numEras() const { @@ -349,6 +349,8 @@ class ZoneInfoBroker { #else + const ZoneContext* zoneContext() const { return mZoneInfo->zoneContext; } + const char* name() const { return mZoneInfo->name; } uint32_t zoneId() const { return mZoneInfo->zoneId; } @@ -691,6 +693,10 @@ class ZoneInfoBroker { #if ACE_TIME_USE_PROGMEM + const ZoneContext* zoneContext() const { + return (const ZoneContext*) pgm_read_ptr(&mZoneInfo->zoneContext); + } + const char* name() const { return (const char*) pgm_read_ptr(&mZoneInfo->name); } @@ -700,15 +706,11 @@ class ZoneInfoBroker { } int16_t startYear() const { - const ZoneContext* zoneContext = - (const ZoneContext*) pgm_read_ptr(&mZoneInfo->zoneContext); - return zoneContext->startYear; + return zoneContext()->startYear; } int16_t untilYear() const { - const ZoneContext* zoneContext = - (const ZoneContext*) pgm_read_ptr(&mZoneInfo->zoneContext); - return zoneContext->untilYear; + return zoneContext()->untilYear; } uint8_t numEras() const { @@ -722,6 +724,8 @@ class ZoneInfoBroker { #else + const ZoneContext* zoneContext() const { return mZoneInfo->zoneContext; } + const char* name() const { return mZoneInfo->name; } uint32_t zoneId() const { return mZoneInfo->zoneId; } diff --git a/tests/BasicBrokerTest/BasicBrokerTest.ino b/tests/BasicBrokerTest/BasicBrokerTest.ino index 653bd45bc..3930befb0 100644 --- a/tests/BasicBrokerTest/BasicBrokerTest.ino +++ b/tests/BasicBrokerTest/BasicBrokerTest.ino @@ -108,6 +108,7 @@ test(BasicBrokerTest, ZoneEraBroker) { test(BasicBrokerTest, ZoneInfoBroker) { basic::ZoneInfoBroker info(&kZoneAmerica_Los_Angeles); + assertEqual(&kZoneContext, info.zoneContext()); assertEqual(kZoneNameAmerica_Los_Angeles, info.name()); assertEqual((uint32_t) 0xb7f7e8f2, info.zoneId()); assertEqual(2000, info.startYear()); diff --git a/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino b/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino index 88cfd2ba6..b25e415eb 100644 --- a/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino +++ b/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino @@ -109,6 +109,7 @@ test(ExtendedBrokerTest, ZoneEraBroker) { test(ExtendedBrokerTest, ZoneInfoBroker) { extended::ZoneInfoBroker info(&kZoneAmerica_Los_Angeles); + assertEqual(&kZoneContext, info.zoneContext()); assertEqual(kZoneNameAmerica_Los_Angeles, info.name()); assertEqual((uint32_t) 0xb7f7e8f2, info.zoneId()); assertEqual(2000, info.startYear()); From 595a9988fa8ff587f3c78b4afaa94bf2665c2f95 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 16:39:05 -0800 Subject: [PATCH 18/74] MemoryBenchmark: Update to 1.4.1, to provide baseline for various experiments --- examples/MemoryBenchmark/README.md | 122 ++++++++++---------- examples/MemoryBenchmark/esp32.txt | 28 ++--- examples/MemoryBenchmark/esp8266.txt | 20 ++-- examples/MemoryBenchmark/generate_readme.py | 2 +- examples/MemoryBenchmark/micro.txt | 8 +- examples/MemoryBenchmark/nano.txt | 8 +- examples/MemoryBenchmark/samd.txt | 20 ++-- examples/MemoryBenchmark/teensy32.txt | 30 ++--- 8 files changed, 119 insertions(+), 119 deletions(-) diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index 82f100ced..0baf8c08c 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -7,7 +7,7 @@ the baseline, and its memory usage numbers are subtracted from the subsequent **NOTE**: This file was auto-generated using `make README.md`. DO NOT EDIT. -**Version**: AceTime v1.4 +**Version**: AceTime v1.4.1 ## How to Regenerate @@ -62,12 +62,12 @@ this penalty in flash size. | Manual ZoneManager | 2684/ 123 | 2236/ 113 | | Basic TimeZone (1 zone) | 6910/ 187 | 6462/ 177 | | Basic TimeZone (2 zones) | 7488/ 193 | 7040/ 183 | -| Basic ZoneManager (1 zone) | 8374/ 213 | 7926/ 203 | -| Basic ZoneManager (all) | 23290/ 601 | 22842/ 591 | +| Basic ZoneManager (1 zone) | 8428/ 213 | 7980/ 203 | +| Basic ZoneManager (all) | 23206/ 591 | 22758/ 581 | | Extended TimeZone (1 zone) | 9690/ 187 | 9242/ 177 | | Extended TimeZone (2 zones) | 10166/ 193 | 9718/ 183 | -| Extended ZoneManager (1 zone) | 11314/ 213 | 10866/ 203 | -| Extended ZoneManager (all) | 36242/ 707 | 35794/ 697 | +| Extended ZoneManager (1 zone) | 11368/ 213 | 10920/ 203 | +| Extended ZoneManager (all) | 36232/ 697 | 35784/ 687 | |---------------------------------+--------------+-------------| | SystemClock | 5662/ 282 | 5214/ 272 | | SystemClock+Basic TimeZone | 9990/ 334 | 9542/ 324 | @@ -92,12 +92,12 @@ this penalty in flash size. | Manual ZoneManager | 5808/ 263 | 2344/ 113 | | Basic TimeZone (1 zone) | 10012/ 327 | 6548/ 177 | | Basic TimeZone (2 zones) | 10588/ 331 | 7124/ 181 | -| Basic ZoneManager (1 zone) | 11476/ 353 | 8012/ 203 | -| Basic ZoneManager (all) | 26390/ 739 | 22926/ 589 | +| Basic ZoneManager (1 zone) | 11530/ 353 | 8066/ 203 | +| Basic ZoneManager (all) | 26306/ 729 | 22842/ 579 | | Extended TimeZone (1 zone) | 12792/ 327 | 9328/ 177 | | Extended TimeZone (2 zones) | 13266/ 331 | 9802/ 181 | -| Extended ZoneManager (1 zone) | 14416/ 353 | 10952/ 203 | -| Extended ZoneManager (all) | 39344/ 847 | 35880/ 697 | +| Extended ZoneManager (1 zone) | 14470/ 353 | 11006/ 203 | +| Extended ZoneManager (all) | 39334/ 837 | 35870/ 687 | |---------------------------------+--------------+-------------| | SystemClock | 8646/ 422 | 5182/ 272 | | SystemClock+Basic TimeZone | 12974/ 474 | 9510/ 324 | @@ -120,18 +120,18 @@ this penalty in flash size. | LocalDateTime | 10920/ 0 | 856/ 0 | | ZonedDateTime | 11160/ 0 | 1096/ 0 | | Manual ZoneManager | 11184/ 0 | 1120/ 0 | -| Basic TimeZone (1 zone) | 15060/ 0 | 4996/ 0 | -| Basic TimeZone (2 zones) | 15444/ 0 | 5380/ 0 | -| Basic ZoneManager (1 zone) | 15924/ 0 | 5860/ 0 | -| Basic ZoneManager (all) | 35196/ 0 | 25132/ 0 | -| Extended TimeZone (1 zone) | 16828/ 0 | 6764/ 0 | -| Extended TimeZone (2 zones) | 17252/ 0 | 7188/ 0 | -| Extended ZoneManager (1 zone) | 17692/ 0 | 7628/ 0 | -| Extended ZoneManager (all) | 50276/ 0 | 40212/ 0 | +| Basic TimeZone (1 zone) | 15044/ 0 | 4980/ 0 | +| Basic TimeZone (2 zones) | 15436/ 0 | 5372/ 0 | +| Basic ZoneManager (1 zone) | 15972/ 0 | 5908/ 0 | +| Basic ZoneManager (all) | 35004/ 0 | 24940/ 0 | +| Extended TimeZone (1 zone) | 16820/ 0 | 6756/ 0 | +| Extended TimeZone (2 zones) | 17244/ 0 | 7180/ 0 | +| Extended ZoneManager (1 zone) | 17748/ 0 | 7684/ 0 | +| Extended ZoneManager (all) | 50196/ 0 | 40132/ 0 | |---------------------------------+--------------+-------------| | SystemClock | 13264/ 0 | 3200/ 0 | -| SystemClock+Basic TimeZone | 16700/ 0 | 6636/ 0 | -| SystemClock+Extended TimeZone | 18652/ 0 | 8588/ 0 | +| SystemClock+Basic TimeZone | 16684/ 0 | 6620/ 0 | +| SystemClock+Extended TimeZone | 18644/ 0 | 8580/ 0 | +--------------------------------------------------------------+ ``` @@ -152,18 +152,18 @@ this penalty in flash size. | LocalDateTime | 258820/27264 | 2120/ 488 | | ZonedDateTime | 259492/27264 | 2792/ 488 | | Manual ZoneManager | 259540/27264 | 2840/ 488 | -| Basic TimeZone (1 zone) | 264800/27692 | 8100/ 916 | -| Basic TimeZone (2 zones) | 265024/27692 | 8324/ 916 | -| Basic ZoneManager (1 zone) | 265776/27692 | 9076/ 916 | -| Basic ZoneManager (all) | 285200/27692 | 28500/ 916 | -| Extended TimeZone (1 zone) | 266808/27788 | 10108/ 1012 | -| Extended TimeZone (2 zones) | 267128/27788 | 10428/ 1012 | -| Extended ZoneManager (1 zone) | 267800/27788 | 11100/ 1012 | -| Extended ZoneManager (all) | 300604/27792 | 43904/ 1016 | +| Basic TimeZone (1 zone) | 264792/27676 | 8092/ 900 | +| Basic TimeZone (2 zones) | 265016/27676 | 8316/ 900 | +| Basic ZoneManager (1 zone) | 265768/27676 | 9068/ 900 | +| Basic ZoneManager (all) | 284952/27676 | 28252/ 900 | +| Extended TimeZone (1 zone) | 266800/27788 | 10100/ 1012 | +| Extended TimeZone (2 zones) | 267120/27788 | 10420/ 1012 | +| Extended ZoneManager (1 zone) | 267792/27788 | 11092/ 1012 | +| Extended ZoneManager (all) | 300468/27792 | 43768/ 1016 | |---------------------------------+--------------+-------------| | SystemClock | 262268/27276 | 5568/ 500 | -| SystemClock+Basic TimeZone | 267196/27692 | 10496/ 916 | -| SystemClock+Extended TimeZone | 269460/27788 | 12760/ 1012 | +| SystemClock+Basic TimeZone | 267188/27676 | 10488/ 900 | +| SystemClock+Extended TimeZone | 269452/27788 | 12752/ 1012 | +--------------------------------------------------------------+ ``` @@ -179,21 +179,21 @@ this penalty in flash size. |---------------------------------+--------------+-------------| | Baseline | 206435/14564 | 0/ 0 | |---------------------------------+--------------+-------------| -| LocalDateTime | 218129/16084 | 11694/ 1520 | -| ZonedDateTime | 218933/16084 | 12498/ 1520 | -| Manual ZoneManager | 218965/16084 | 12530/ 1520 | -| Basic TimeZone (1 zone) | 222633/16084 | 16198/ 1520 | -| Basic TimeZone (2 zones) | 222885/16084 | 16450/ 1520 | -| Basic ZoneManager (1 zone) | 223465/16084 | 17030/ 1520 | -| Basic ZoneManager (all) | 242861/16084 | 36426/ 1520 | -| Extended TimeZone (1 zone) | 224521/16084 | 18086/ 1520 | -| Extended TimeZone (2 zones) | 224797/16084 | 18362/ 1520 | -| Extended ZoneManager (1 zone) | 225329/16084 | 18894/ 1520 | -| Extended ZoneManager (all) | 258137/16084 | 51702/ 1520 | -|---------------------------------+--------------+-------------| -| SystemClock | 225717/16188 | 19282/ 1624 | -| SystemClock+Basic TimeZone | 229317/16188 | 22882/ 1624 | -| SystemClock+Extended TimeZone | 231269/16188 | 24834/ 1624 | +| LocalDateTime | 218233/16100 | 11798/ 1536 | +| ZonedDateTime | 219037/16100 | 12602/ 1536 | +| Manual ZoneManager | 219069/16100 | 12634/ 1536 | +| Basic TimeZone (1 zone) | 222729/16100 | 16294/ 1536 | +| Basic TimeZone (2 zones) | 222981/16100 | 16546/ 1536 | +| Basic ZoneManager (1 zone) | 223461/16100 | 17026/ 1536 | +| Basic ZoneManager (all) | 242749/16100 | 36314/ 1536 | +| Extended TimeZone (1 zone) | 224617/16100 | 18182/ 1536 | +| Extended TimeZone (2 zones) | 224893/16100 | 18458/ 1536 | +| Extended ZoneManager (1 zone) | 225445/16100 | 19010/ 1536 | +| Extended ZoneManager (all) | 258213/16100 | 51778/ 1536 | +|---------------------------------+--------------+-------------| +| SystemClock | 225821/16204 | 19386/ 1640 | +| SystemClock+Basic TimeZone | 229413/16204 | 22978/ 1640 | +| SystemClock+Extended TimeZone | 231365/16204 | 24930/ 1640 | +--------------------------------------------------------------+ ``` @@ -211,23 +211,23 @@ usage by objects. +--------------------------------------------------------------+ | Functionality | flash/ ram | delta | |---------------------------------+--------------+-------------| -| Baseline | 7656/ 3048 | 0/ 0 | -|---------------------------------+--------------+-------------| -| LocalDateTime | 13300/ 4812 | 5644/ 1764 | -| ZonedDateTime | 13300/ 4812 | 5644/ 1764 | -| Manual ZoneManager | 13300/ 4812 | 5644/ 1764 | -| Basic TimeZone (1 zone) | 22024/ 4812 | 14368/ 1764 | -| Basic TimeZone (2 zones) | 22760/ 4812 | 15104/ 1764 | -| Basic ZoneManager (1 zone) | 23680/ 4812 | 16024/ 1764 | -| Basic ZoneManager (all) | 43176/ 4812 | 35520/ 1764 | -| Extended TimeZone (1 zone) | 24280/ 4812 | 16624/ 1764 | -| Extended TimeZone (2 zones) | 24952/ 4812 | 17296/ 1764 | -| Extended ZoneManager (1 zone) | 25872/ 4812 | 18216/ 1764 | -| Extended ZoneManager (all) | 58840/ 4812 | 51184/ 1764 | -|---------------------------------+--------------+-------------| -| SystemClock | 16224/ 4812 | 8568/ 1764 | -| SystemClock+Basic TimeZone | 25132/ 4812 | 17476/ 1764 | -| SystemClock+Extended TimeZone | 27324/ 4812 | 19668/ 1764 | +| Baseline | 7624/ 3048 | 0/ 0 | +|---------------------------------+--------------+-------------| +| LocalDateTime | 13268/ 4812 | 5644/ 1764 | +| ZonedDateTime | 13268/ 4812 | 5644/ 1764 | +| Manual ZoneManager | 13268/ 4812 | 5644/ 1764 | +| Basic TimeZone (1 zone) | 22012/ 4812 | 14388/ 1764 | +| Basic TimeZone (2 zones) | 22684/ 4812 | 15060/ 1764 | +| Basic ZoneManager (1 zone) | 23860/ 4812 | 16236/ 1764 | +| Basic ZoneManager (all) | 43116/ 4812 | 35492/ 1764 | +| Extended TimeZone (1 zone) | 24204/ 4812 | 16580/ 1764 | +| Extended TimeZone (2 zones) | 24940/ 4812 | 17316/ 1764 | +| Extended ZoneManager (1 zone) | 26052/ 4812 | 18428/ 1764 | +| Extended ZoneManager (all) | 58880/ 4812 | 51256/ 1764 | +|---------------------------------+--------------+-------------| +| SystemClock | 16192/ 4812 | 8568/ 1764 | +| SystemClock+Basic TimeZone | 25120/ 4812 | 17496/ 1764 | +| SystemClock+Extended TimeZone | 27312/ 4812 | 19688/ 1764 | +--------------------------------------------------------------+ ``` diff --git a/examples/MemoryBenchmark/esp32.txt b/examples/MemoryBenchmark/esp32.txt index d61c1c94e..bf9d99a69 100644 --- a/examples/MemoryBenchmark/esp32.txt +++ b/examples/MemoryBenchmark/esp32.txt @@ -1,15 +1,15 @@ 0 206435 1310720 14564 327680 -1 218129 1310720 16084 327680 -2 218933 1310720 16084 327680 -3 218965 1310720 16084 327680 -4 222633 1310720 16084 327680 -5 222885 1310720 16084 327680 -6 223465 1310720 16084 327680 -7 242861 1310720 16084 327680 -8 224521 1310720 16084 327680 -9 224797 1310720 16084 327680 -10 225329 1310720 16084 327680 -11 258137 1310720 16084 327680 -12 225717 1310720 16188 327680 -13 229317 1310720 16188 327680 -14 231269 1310720 16188 327680 +1 218233 1310720 16100 327680 +2 219037 1310720 16100 327680 +3 219069 1310720 16100 327680 +4 222729 1310720 16100 327680 +5 222981 1310720 16100 327680 +6 223461 1310720 16100 327680 +7 242749 1310720 16100 327680 +8 224617 1310720 16100 327680 +9 224893 1310720 16100 327680 +10 225445 1310720 16100 327680 +11 258213 1310720 16100 327680 +12 225821 1310720 16204 327680 +13 229413 1310720 16204 327680 +14 231365 1310720 16204 327680 diff --git a/examples/MemoryBenchmark/esp8266.txt b/examples/MemoryBenchmark/esp8266.txt index e8f1f9ae6..b8967b524 100644 --- a/examples/MemoryBenchmark/esp8266.txt +++ b/examples/MemoryBenchmark/esp8266.txt @@ -2,14 +2,14 @@ 1 258820 1044464 27264 81920 2 259492 1044464 27264 81920 3 259540 1044464 27264 81920 -4 264800 1044464 27692 81920 -5 265024 1044464 27692 81920 -6 265776 1044464 27692 81920 -7 285200 1044464 27692 81920 -8 266808 1044464 27788 81920 -9 267128 1044464 27788 81920 -10 267800 1044464 27788 81920 -11 300604 1044464 27792 81920 +4 264792 1044464 27676 81920 +5 265016 1044464 27676 81920 +6 265768 1044464 27676 81920 +7 284952 1044464 27676 81920 +8 266800 1044464 27788 81920 +9 267120 1044464 27788 81920 +10 267792 1044464 27788 81920 +11 300468 1044464 27792 81920 12 262268 1044464 27276 81920 -13 267196 1044464 27692 81920 -14 269460 1044464 27788 81920 +13 267188 1044464 27676 81920 +14 269452 1044464 27788 81920 diff --git a/examples/MemoryBenchmark/generate_readme.py b/examples/MemoryBenchmark/generate_readme.py index 0faa2fb6b..d53b6cf76 100755 --- a/examples/MemoryBenchmark/generate_readme.py +++ b/examples/MemoryBenchmark/generate_readme.py @@ -29,7 +29,7 @@ **NOTE**: This file was auto-generated using `make README.md`. DO NOT EDIT. -**Version**: AceTime v1.4 +**Version**: AceTime v1.4.1 ## How to Regenerate diff --git a/examples/MemoryBenchmark/micro.txt b/examples/MemoryBenchmark/micro.txt index 79466a361..aafc36346 100644 --- a/examples/MemoryBenchmark/micro.txt +++ b/examples/MemoryBenchmark/micro.txt @@ -4,12 +4,12 @@ 3 5808 28672 263 2560 4 10012 28672 327 2560 5 10588 28672 331 2560 -6 11476 28672 353 2560 -7 26390 28672 739 2560 +6 11530 28672 353 2560 +7 26306 28672 729 2560 8 12792 28672 327 2560 9 13266 28672 331 2560 -10 14416 28672 353 2560 -11 39344 28672 847 2560 +10 14470 28672 353 2560 +11 39334 28672 837 2560 12 8646 28672 422 2560 13 12974 28672 474 2560 14 15980 28672 474 2560 diff --git a/examples/MemoryBenchmark/nano.txt b/examples/MemoryBenchmark/nano.txt index 99db588bb..b282e24ef 100644 --- a/examples/MemoryBenchmark/nano.txt +++ b/examples/MemoryBenchmark/nano.txt @@ -4,12 +4,12 @@ 3 2684 30720 123 2048 4 6910 30720 187 2048 5 7488 30720 193 2048 -6 8374 30720 213 2048 -7 23290 30720 601 2048 +6 8428 30720 213 2048 +7 23206 30720 591 2048 8 9690 30720 187 2048 9 10166 30720 193 2048 -10 11314 30720 213 2048 -11 36242 30720 707 2048 +10 11368 30720 213 2048 +11 36232 30720 697 2048 12 5662 30720 282 2048 13 9990 30720 334 2048 14 12996 30720 334 2048 diff --git a/examples/MemoryBenchmark/samd.txt b/examples/MemoryBenchmark/samd.txt index 35b78fbf5..68cb1d751 100644 --- a/examples/MemoryBenchmark/samd.txt +++ b/examples/MemoryBenchmark/samd.txt @@ -2,14 +2,14 @@ 1 10920 262144 2 11160 262144 3 11184 262144 -4 15060 262144 -5 15444 262144 -6 15924 262144 -7 35196 262144 -8 16828 262144 -9 17252 262144 -10 17692 262144 -11 50276 262144 +4 15044 262144 +5 15436 262144 +6 15972 262144 +7 35004 262144 +8 16820 262144 +9 17244 262144 +10 17748 262144 +11 50196 262144 12 13264 262144 -13 16700 262144 -14 18652 262144 +13 16684 262144 +14 18644 262144 diff --git a/examples/MemoryBenchmark/teensy32.txt b/examples/MemoryBenchmark/teensy32.txt index d028a4062..8fc9761f7 100644 --- a/examples/MemoryBenchmark/teensy32.txt +++ b/examples/MemoryBenchmark/teensy32.txt @@ -1,15 +1,15 @@ -0 7656 262144 3048 65536 -1 13300 262144 4812 65536 -2 13300 262144 4812 65536 -3 13300 262144 4812 65536 -4 22024 262144 4812 65536 -5 22760 262144 4812 65536 -6 23680 262144 4812 65536 -7 43176 262144 4812 65536 -8 24280 262144 4812 65536 -9 24952 262144 4812 65536 -10 25872 262144 4812 65536 -11 58840 262144 4812 65536 -12 16224 262144 4812 65536 -13 25132 262144 4812 65536 -14 27324 262144 4812 65536 +0 7624 262144 3048 65536 +1 13268 262144 4812 65536 +2 13268 262144 4812 65536 +3 13268 262144 4812 65536 +4 22012 262144 4812 65536 +5 22684 262144 4812 65536 +6 23860 262144 4812 65536 +7 43116 262144 4812 65536 +8 24204 262144 4812 65536 +9 24940 262144 4812 65536 +10 26052 262144 4812 65536 +11 58880 262144 4812 65536 +12 16192 262144 4812 65536 +13 25120 262144 4812 65536 +14 27312 262144 4812 65536 From b5dcbcd7714019ad7fd8db8cd23b622e23b54017 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 16:31:06 -0800 Subject: [PATCH 19/74] tools/arvalgenerator.py: Extract kZoneBufSize{xxx} into zone_info.h and use it in ExtendedTransitionTest --- src/ace_time/testing/BasicTransitionTest.h | 3 ++- src/ace_time/testing/ExtendedTransitionTest.h | 11 +++------ tools/generator/argenerator.py | 24 ++++++++++++++++--- tools/validation/arvalgenerator.py | 12 ++++++---- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/src/ace_time/testing/BasicTransitionTest.h b/src/ace_time/testing/BasicTransitionTest.h index e04a8294e..d0bbaff59 100644 --- a/src/ace_time/testing/BasicTransitionTest.h +++ b/src/ace_time/testing/BasicTransitionTest.h @@ -32,7 +32,8 @@ class BasicTransitionTest: public aunit::TestOnce { const basic::ZoneInfo* const zoneInfo, const ValidationData* const testData, ValidationScope dstValidationScope, - ValidationScope abbrevValidationScope) { + ValidationScope abbrevValidationScope, + uint8_t /*bufSize*/) { BasicZoneProcessor zoneProcessor; TimeZone tz = TimeZone::forZoneInfo(zoneInfo, &zoneProcessor); diff --git a/src/ace_time/testing/ExtendedTransitionTest.h b/src/ace_time/testing/ExtendedTransitionTest.h index 9994871be..d2d1b9fba 100644 --- a/src/ace_time/testing/ExtendedTransitionTest.h +++ b/src/ace_time/testing/ExtendedTransitionTest.h @@ -33,7 +33,8 @@ class ExtendedTransitionTest: public aunit::TestOnce { const extended::ZoneInfo* const zoneInfo, const ValidationData* const testData, ValidationScope dstValidationScope, - ValidationScope abbrevValidationScope) { + ValidationScope abbrevValidationScope, + uint8_t bufSize) { ExtendedZoneProcessor zoneProcessor; TimeZone tz = TimeZone::forZoneInfo(zoneInfo, &zoneProcessor); @@ -82,13 +83,7 @@ class ExtendedTransitionTest: public aunit::TestOnce { // Assert that size of the internal Transitions buffer never got // above the expected buffer size. The buffer size is only relevant for // the ExtendedZoneProcessor class. - // - // TODO: In theory, we should use - // ExtendedZone(zoneInfo).transitionBufSize() for compability with - // PROGMEM but this code works only on Linux or MacOS, not on an actual - // Arduino microncontroller, so it doesn't really matter. - assertLess(zoneProcessor.getTransitionHighWater(), - zoneInfo->transitionBufSize); + assertLess(zoneProcessor.getTransitionHighWater(), bufSize); } void checkComponent(bool& passed, int i, const ValidationItem& item, diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index f298d7c98..ce1a3d258 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -507,6 +507,12 @@ class ZoneInfosGenerator: {linkIds} +//--------------------------------------------------------------------------- +// Transition buffer sizes (for validation tests) +//--------------------------------------------------------------------------- + +{bufSizes} + //--------------------------------------------------------------------------- // Unsupported zones: {numRemovedInfos} //--------------------------------------------------------------------------- @@ -688,20 +694,30 @@ def generate_infos_h(self) -> str: """ ZONE_INFOS_H_INFO_ZONE_ID = """\ const uint32_t kZoneId{zoneNormalizedName} = 0x{zoneId:08x}; // {zoneFullName} +""" + ZONE_INFOS_H_BUF_SIZE = """\ +const uint8_t kZoneBufSize{zoneNormalizedName} = {bufSize}; // {zoneFullName} """ info_items = '' info_zone_ids = '' + info_buf_sizes = '' for zone_name, eras in sorted(self.zones_map.items()): + normalized_name = normalize_name(zone_name) info_items += ZONE_INFOS_H_INFO_ITEM.format( scope=self.scope, - zoneNormalizedName=normalize_name(zone_name), + zoneNormalizedName=normalized_name, zoneFullName=zone_name, ) info_zone_ids += ZONE_INFOS_H_INFO_ZONE_ID.format( - zoneNormalizedName=normalize_name(zone_name), + zoneNormalizedName=normalized_name, zoneFullName=zone_name, zoneId=self.zone_ids[zone_name], ) + info_buf_sizes += ZONE_INFOS_H_BUF_SIZE.format( + zoneNormalizedName=normalized_name, + zoneFullName=zone_name, + bufSize=self.buf_sizes[zone_name], + ) ZONE_INFOS_H_FAT_LINK_ITEM = """\ extern const {scope}::ZoneInfo kZone{linkNormalizedName}; \ @@ -788,7 +804,9 @@ def generate_infos_h(self) -> str: numRemovedLinks=len(self.removed_links), removedLinkItems=removed_link_items, numNotableLinks=len(self.notable_links), - notableLinkItems=notable_link_items) + notableLinkItems=notable_link_items, + bufSizes=info_buf_sizes, + ) def generate_infos_cpp(self) -> str: string_length = 0 diff --git a/tools/validation/arvalgenerator.py b/tools/validation/arvalgenerator.py index 6f3f75967..96dd1a08d 100644 --- a/tools/validation/arvalgenerator.py +++ b/tools/validation/arvalgenerator.py @@ -264,11 +264,13 @@ def _generate_test_cases(self, test_data: TestData) -> str: test_case = f"""\ testF({self.test_class}, {normalized_name}) {{ assertValid( - &kZone{normalized_name}, - &kValidationData{normalized_name}, - {dst_validation_scope} /*dstValidationScope{dst_validation_comment}*/, - {abbrev_validation_scope} \ -/*abbrevValidationScope{abbrev_validation_comment}*/); + &kZone{normalized_name}, + &kValidationData{normalized_name}, + {dst_validation_scope} /*dstValidationScope{dst_validation_comment}*/, + {abbrev_validation_scope} \ +/*abbrevValidationScope{abbrev_validation_comment}*/, + kZoneBufSize{normalized_name} /*bufSize*/ + ); }} """ test_cases += test_case From e865717247625b02631faa7e5f0bdb2818665a71 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 16:58:49 -0800 Subject: [PATCH 20/74] src/ZoneInfo.inc,argenerator.py: Remove 'transitionBufSize' from ZoneInfo, replaced by kZoneBufSize{xxx} constants --- src/ace_time/ExtendedZoneProcessor.h | 9 +++++---- src/ace_time/internal/ZoneInfo.inc | 9 --------- tests/BasicBrokerTest/BasicBrokerTest.ino | 1 - .../BasicZoneProcessorTest.ino | 1 - tests/ExtendedBrokerTest/ExtendedBrokerTest.ino | 1 - .../ExtendedZoneProcessorTest.ino | 2 -- tools/generator/argenerator.py | 12 +++++------- 7 files changed, 10 insertions(+), 25 deletions(-) diff --git a/src/ace_time/ExtendedZoneProcessor.h b/src/ace_time/ExtendedZoneProcessor.h index 314dea426..db832322c 100644 --- a/src/ace_time/ExtendedZoneProcessor.h +++ b/src/ace_time/ExtendedZoneProcessor.h @@ -819,10 +819,11 @@ class ExtendedZoneProcessor: public ZoneProcessor { /** * Max number of Transitions required for a given Zone, including the most - * recent prior Transition. This value for each Zone is given by - * ZoneInfo.transitionBufSize, and ExtendedPythonTest - * and ExtendedJavaTest show that the maximum is 7. Set - * this to 8 for safety. + * recent prior Transition. This value for each Zone is given by the + * kZoneBufSize{zoneName} constant in the generated + * `zonedb[x]/zone_infos.h` file. The ExtendedPythonTest and + * ExtendedJavaTest tests show that the maximum is 7. Set this to 8 for + * safety. */ static const uint8_t kMaxTransitions = 8; diff --git a/src/ace_time/internal/ZoneInfo.inc b/src/ace_time/internal/ZoneInfo.inc index 3cd29fba4..89633fe6f 100644 --- a/src/ace_time/internal/ZoneInfo.inc +++ b/src/ace_time/internal/ZoneInfo.inc @@ -129,15 +129,6 @@ struct ZoneInfo { /** ZoneContext metadata. */ const ZoneContext* const zoneContext; - /** - * Estimated size of Transition buffer. Currently, this is used only in the - * validation unit test for ExtendedZoneProcessor. It is slightly wasteful to - * include it for the ZoneInfo and ZoneInfo classes used by - * BasicZoneProcessor, but it's only one byte and it seemed worth having this - * additional validation capability. - */ - uint8_t const transitionBufSize; - /** Number of ZoneEra entries. */ uint8_t const numEras; diff --git a/tests/BasicBrokerTest/BasicBrokerTest.ino b/tests/BasicBrokerTest/BasicBrokerTest.ino index 3930befb0..31d63993d 100644 --- a/tests/BasicBrokerTest/BasicBrokerTest.ino +++ b/tests/BasicBrokerTest/BasicBrokerTest.ino @@ -66,7 +66,6 @@ const basic::ZoneInfo kZoneAmerica_Los_Angeles ACE_TIME_PROGMEM = { kZoneNameAmerica_Los_Angeles /*name*/, 0xb7f7e8f2 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Los_Angeles /*eras*/, }; diff --git a/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino b/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino index 4b0aca565..2fa9fa0d4 100644 --- a/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino +++ b/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino @@ -107,7 +107,6 @@ static const basic::ZoneInfo kZonePacific_Galapagos ACE_TIME_PROGMEM = { kZoneNamePacific_Galapagos /*name*/, 0xa952f752 /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraPacific_Galapagos /*eras*/, }; diff --git a/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino b/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino index b25e415eb..b4c163287 100644 --- a/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino +++ b/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino @@ -67,7 +67,6 @@ const extended::ZoneInfo kZoneAmerica_Los_Angeles ACE_TIME_PROGMEM = { kZoneNameAmerica_Los_Angeles /*name*/, 0xb7f7e8f2 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Los_Angeles /*eras*/, }; diff --git a/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino b/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino index bf802bc5b..16fa9a7cc 100644 --- a/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino +++ b/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino @@ -59,7 +59,6 @@ static const ZoneInfo kZoneAlmostLosAngeles ACE_TIME_PROGMEM = { "Almost_Los_Angeles" /*name*/, 0x70166020 /*zoneId*/, &::kZoneContext /*zoneContext*/, - 7 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAlmostLosAngeles /*eras*/, }; @@ -159,7 +158,6 @@ static const ZoneInfo kZoneTestLos_Angeles ACE_TIME_PROGMEM = { "America/Los_Angeles" /*name*/, 0xb7f7e8f2 /*zoneId*/, &::kZoneContext /*zoneContext*/, - 7 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraTestLos_Angeles /*eras*/, }; diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index ce1a3d258..9cd3f33ea 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -508,7 +508,11 @@ class ZoneInfosGenerator: {linkIds} //--------------------------------------------------------------------------- -// Transition buffer sizes (for validation tests) +// Estimated size of the Transition buffer in ExtendedZoneProcessor for each +// zone. Used only in the tests/validation/Extended*Test tests for +// ExtendedZoneProcessor. This used to be included in the ZoneInfo data struct +// above, but it is used only for tests, so pulling them out to these constants +// means that they take up no permanent storage space. //--------------------------------------------------------------------------- {bufSizes} @@ -615,7 +619,6 @@ class ZoneInfosGenerator: kZoneName{zoneNormalizedName} /*name*/, 0x{zoneId:08x} /*zoneId*/, &kZoneContext /*zoneContext*/, - {transitionBufSize} /*transitionBufSize*/, {numEras} /*numEras*/, kZoneEra{zoneNormalizedName} /*eras*/, }}; @@ -887,14 +890,11 @@ def _generate_info_item( + num_eras * self.SIZEOF_ZONE_ERA_32 + 1 * self.SIZEOF_ZONE_INFO_32) - transition_buf_size = self.buf_sizes[zone_name] - info_item = self.ZONE_INFOS_CPP_INFO_ITEM.format( scope=self.scope, zoneFullName=zone_name, zoneNormalizedName=normalize_name(zone_name), zoneId=self.zone_ids[zone_name], - transitionBufSize=transition_buf_size, numEras=num_eras, stringLength=string_length, memory8=memory8, @@ -965,7 +965,6 @@ def _generate_link_item( kZoneName{linkNormalizedName} /*name*/, 0x{linkId:08x} /*zoneId*/, &kZoneContext /*zoneContext*/, - {transitionBufSize} /*transitionBufSize*/, {numEras} /*numEras*/, kZoneEra{zoneNormalizedName} /*eras*/, }}; @@ -983,7 +982,6 @@ def _generate_link_item( linkId=self.link_ids[link_name], zoneFullName=zone_name, zoneNormalizedName=normalize_name(zone_name), - transitionBufSize=self.buf_sizes[zone_name], numEras=len(self.zones_map[zone_name]), progmem='ACE_TIME_PROGMEM', ) From 101d18c8714853faa54891de047e97233d2ae95e Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 16:59:52 -0800 Subject: [PATCH 21/74] src/zonedb,zonedbx: Regenerate after moving transitionBufSize from ZoneInfo to kZoneBufSize{xxx} constants --- src/ace_time/zonedb/zone_infos.cpp | 266 ------------------- src/ace_time/zonedb/zone_infos.h | 276 +++++++++++++++++++ src/ace_time/zonedbx/zone_infos.cpp | 386 --------------------------- src/ace_time/zonedbx/zone_infos.h | 396 ++++++++++++++++++++++++++++ 4 files changed, 672 insertions(+), 652 deletions(-) diff --git a/src/ace_time/zonedb/zone_infos.cpp b/src/ace_time/zonedb/zone_infos.cpp index 4b2ff2aa5..f39ba0d54 100644 --- a/src/ace_time/zonedb/zone_infos.cpp +++ b/src/ace_time/zonedb/zone_infos.cpp @@ -85,7 +85,6 @@ const basic::ZoneInfo kZoneAfrica_Abidjan ACE_TIME_PROGMEM = { kZoneNameAfrica_Abidjan /*name*/, 0xc21305a3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Abidjan /*eras*/, }; @@ -120,7 +119,6 @@ const basic::ZoneInfo kZoneAfrica_Algiers ACE_TIME_PROGMEM = { kZoneNameAfrica_Algiers /*name*/, 0xd94515c1 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Algiers /*eras*/, }; @@ -155,7 +153,6 @@ const basic::ZoneInfo kZoneAfrica_Bissau ACE_TIME_PROGMEM = { kZoneNameAfrica_Bissau /*name*/, 0x75564141 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Bissau /*eras*/, }; @@ -190,7 +187,6 @@ const basic::ZoneInfo kZoneAfrica_Ceuta ACE_TIME_PROGMEM = { kZoneNameAfrica_Ceuta /*name*/, 0x77fb46ec /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Ceuta /*eras*/, }; @@ -225,7 +221,6 @@ const basic::ZoneInfo kZoneAfrica_Johannesburg ACE_TIME_PROGMEM = { kZoneNameAfrica_Johannesburg /*name*/, 0xd5d157a0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Johannesburg /*eras*/, }; @@ -260,7 +255,6 @@ const basic::ZoneInfo kZoneAfrica_Lagos ACE_TIME_PROGMEM = { kZoneNameAfrica_Lagos /*name*/, 0x789bb5d0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Lagos /*eras*/, }; @@ -295,7 +289,6 @@ const basic::ZoneInfo kZoneAfrica_Maputo ACE_TIME_PROGMEM = { kZoneNameAfrica_Maputo /*name*/, 0x8e6ca1f0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Maputo /*eras*/, }; @@ -330,7 +323,6 @@ const basic::ZoneInfo kZoneAfrica_Monrovia ACE_TIME_PROGMEM = { kZoneNameAfrica_Monrovia /*name*/, 0x0ce90385 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Monrovia /*eras*/, }; @@ -365,7 +357,6 @@ const basic::ZoneInfo kZoneAfrica_Nairobi ACE_TIME_PROGMEM = { kZoneNameAfrica_Nairobi /*name*/, 0xa87ab57e /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Nairobi /*eras*/, }; @@ -400,7 +391,6 @@ const basic::ZoneInfo kZoneAfrica_Ndjamena ACE_TIME_PROGMEM = { kZoneNameAfrica_Ndjamena /*name*/, 0x9fe09898 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Ndjamena /*eras*/, }; @@ -435,7 +425,6 @@ const basic::ZoneInfo kZoneAfrica_Tunis ACE_TIME_PROGMEM = { kZoneNameAfrica_Tunis /*name*/, 0x79378e6d /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Tunis /*eras*/, }; @@ -470,7 +459,6 @@ const basic::ZoneInfo kZoneAmerica_Adak ACE_TIME_PROGMEM = { kZoneNameAmerica_Adak /*name*/, 0x97fe49d7 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Adak /*eras*/, }; @@ -505,7 +493,6 @@ const basic::ZoneInfo kZoneAmerica_Anchorage ACE_TIME_PROGMEM = { kZoneNameAmerica_Anchorage /*name*/, 0x5a79260e /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Anchorage /*eras*/, }; @@ -540,7 +527,6 @@ const basic::ZoneInfo kZoneAmerica_Asuncion ACE_TIME_PROGMEM = { kZoneNameAmerica_Asuncion /*name*/, 0x50ec79a6 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Asuncion /*eras*/, }; @@ -575,7 +561,6 @@ const basic::ZoneInfo kZoneAmerica_Atikokan ACE_TIME_PROGMEM = { kZoneNameAmerica_Atikokan /*name*/, 0x81b92098 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Atikokan /*eras*/, }; @@ -610,7 +595,6 @@ const basic::ZoneInfo kZoneAmerica_Barbados ACE_TIME_PROGMEM = { kZoneNameAmerica_Barbados /*name*/, 0xcbbc3b04 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Barbados /*eras*/, }; @@ -645,7 +629,6 @@ const basic::ZoneInfo kZoneAmerica_Belem ACE_TIME_PROGMEM = { kZoneNameAmerica_Belem /*name*/, 0x97da580b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Belem /*eras*/, }; @@ -680,7 +663,6 @@ const basic::ZoneInfo kZoneAmerica_Blanc_Sablon ACE_TIME_PROGMEM = { kZoneNameAmerica_Blanc_Sablon /*name*/, 0x6e299892 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Blanc_Sablon /*eras*/, }; @@ -715,7 +697,6 @@ const basic::ZoneInfo kZoneAmerica_Bogota ACE_TIME_PROGMEM = { kZoneNameAmerica_Bogota /*name*/, 0x93d7bc62 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Bogota /*eras*/, }; @@ -750,7 +731,6 @@ const basic::ZoneInfo kZoneAmerica_Boise ACE_TIME_PROGMEM = { kZoneNameAmerica_Boise /*name*/, 0x97dfc8d8 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Boise /*eras*/, }; @@ -785,7 +765,6 @@ const basic::ZoneInfo kZoneAmerica_Campo_Grande ACE_TIME_PROGMEM = { kZoneNameAmerica_Campo_Grande /*name*/, 0xfec3e7a6 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Campo_Grande /*eras*/, }; @@ -820,7 +799,6 @@ const basic::ZoneInfo kZoneAmerica_Cayenne ACE_TIME_PROGMEM = { kZoneNameAmerica_Cayenne /*name*/, 0x3c617269 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Cayenne /*eras*/, }; @@ -855,7 +833,6 @@ const basic::ZoneInfo kZoneAmerica_Chicago ACE_TIME_PROGMEM = { kZoneNameAmerica_Chicago /*name*/, 0x4b92b5d4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Chicago /*eras*/, }; @@ -890,7 +867,6 @@ const basic::ZoneInfo kZoneAmerica_Chihuahua ACE_TIME_PROGMEM = { kZoneNameAmerica_Chihuahua /*name*/, 0x8827d776 /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Chihuahua /*eras*/, }; @@ -925,7 +901,6 @@ const basic::ZoneInfo kZoneAmerica_Costa_Rica ACE_TIME_PROGMEM = { kZoneNameAmerica_Costa_Rica /*name*/, 0x63ff66be /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Costa_Rica /*eras*/, }; @@ -960,7 +935,6 @@ const basic::ZoneInfo kZoneAmerica_Creston ACE_TIME_PROGMEM = { kZoneNameAmerica_Creston /*name*/, 0x62a70204 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Creston /*eras*/, }; @@ -995,7 +969,6 @@ const basic::ZoneInfo kZoneAmerica_Curacao ACE_TIME_PROGMEM = { kZoneNameAmerica_Curacao /*name*/, 0x6a879184 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Curacao /*eras*/, }; @@ -1030,7 +1003,6 @@ const basic::ZoneInfo kZoneAmerica_Danmarkshavn ACE_TIME_PROGMEM = { kZoneNameAmerica_Danmarkshavn /*name*/, 0xf554d204 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Danmarkshavn /*eras*/, }; @@ -1065,7 +1037,6 @@ const basic::ZoneInfo kZoneAmerica_Dawson_Creek ACE_TIME_PROGMEM = { kZoneNameAmerica_Dawson_Creek /*name*/, 0x6cf24e5b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Dawson_Creek /*eras*/, }; @@ -1100,7 +1071,6 @@ const basic::ZoneInfo kZoneAmerica_Denver ACE_TIME_PROGMEM = { kZoneNameAmerica_Denver /*name*/, 0x97d10b2a /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Denver /*eras*/, }; @@ -1135,7 +1105,6 @@ const basic::ZoneInfo kZoneAmerica_Detroit ACE_TIME_PROGMEM = { kZoneNameAmerica_Detroit /*name*/, 0x925cfbc1 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Detroit /*eras*/, }; @@ -1170,7 +1139,6 @@ const basic::ZoneInfo kZoneAmerica_Edmonton ACE_TIME_PROGMEM = { kZoneNameAmerica_Edmonton /*name*/, 0x6cb9484a /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Edmonton /*eras*/, }; @@ -1205,7 +1173,6 @@ const basic::ZoneInfo kZoneAmerica_El_Salvador ACE_TIME_PROGMEM = { kZoneNameAmerica_El_Salvador /*name*/, 0x752ad652 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_El_Salvador /*eras*/, }; @@ -1240,7 +1207,6 @@ const basic::ZoneInfo kZoneAmerica_Glace_Bay ACE_TIME_PROGMEM = { kZoneNameAmerica_Glace_Bay /*name*/, 0x9681f8dd /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Glace_Bay /*eras*/, }; @@ -1275,7 +1241,6 @@ const basic::ZoneInfo kZoneAmerica_Guatemala ACE_TIME_PROGMEM = { kZoneNameAmerica_Guatemala /*name*/, 0x0c8259f7 /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Guatemala /*eras*/, }; @@ -1310,7 +1275,6 @@ const basic::ZoneInfo kZoneAmerica_Guayaquil ACE_TIME_PROGMEM = { kZoneNameAmerica_Guayaquil /*name*/, 0x17e64958 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Guayaquil /*eras*/, }; @@ -1345,7 +1309,6 @@ const basic::ZoneInfo kZoneAmerica_Guyana ACE_TIME_PROGMEM = { kZoneNameAmerica_Guyana /*name*/, 0x9ff7bd0b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Guyana /*eras*/, }; @@ -1380,7 +1343,6 @@ const basic::ZoneInfo kZoneAmerica_Halifax ACE_TIME_PROGMEM = { kZoneNameAmerica_Halifax /*name*/, 0xbc5b7183 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Halifax /*eras*/, }; @@ -1415,7 +1377,6 @@ const basic::ZoneInfo kZoneAmerica_Havana ACE_TIME_PROGMEM = { kZoneNameAmerica_Havana /*name*/, 0xa0e15675 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Havana /*eras*/, }; @@ -1462,7 +1423,6 @@ const basic::ZoneInfo kZoneAmerica_Hermosillo ACE_TIME_PROGMEM = { kZoneNameAmerica_Hermosillo /*name*/, 0x065d21c4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Hermosillo /*eras*/, }; @@ -1509,7 +1469,6 @@ const basic::ZoneInfo kZoneAmerica_Indiana_Indianapolis ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Indianapolis /*name*/, 0x28a669a4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Indiana_Indianapolis /*eras*/, }; @@ -1556,7 +1515,6 @@ const basic::ZoneInfo kZoneAmerica_Indiana_Marengo ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Marengo /*name*/, 0x2feeee72 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Indiana_Marengo /*eras*/, }; @@ -1603,7 +1561,6 @@ const basic::ZoneInfo kZoneAmerica_Indiana_Vevay ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Vevay /*name*/, 0x10aca054 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Indiana_Vevay /*eras*/, }; @@ -1638,7 +1595,6 @@ const basic::ZoneInfo kZoneAmerica_Inuvik ACE_TIME_PROGMEM = { kZoneNameAmerica_Inuvik /*name*/, 0xa42189fc /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Inuvik /*eras*/, }; @@ -1673,7 +1629,6 @@ const basic::ZoneInfo kZoneAmerica_Jamaica ACE_TIME_PROGMEM = { kZoneNameAmerica_Jamaica /*name*/, 0x565dad6c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Jamaica /*eras*/, }; @@ -1708,7 +1663,6 @@ const basic::ZoneInfo kZoneAmerica_Juneau ACE_TIME_PROGMEM = { kZoneNameAmerica_Juneau /*name*/, 0xa6f13e2e /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Juneau /*eras*/, }; @@ -1743,7 +1697,6 @@ const basic::ZoneInfo kZoneAmerica_Kentucky_Louisville ACE_TIME_PROGMEM = { kZoneNameAmerica_Kentucky_Louisville /*name*/, 0x1a21024b /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Kentucky_Louisville /*eras*/, }; @@ -1778,7 +1731,6 @@ const basic::ZoneInfo kZoneAmerica_La_Paz ACE_TIME_PROGMEM = { kZoneNameAmerica_La_Paz /*name*/, 0xaa29125d /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_La_Paz /*eras*/, }; @@ -1813,7 +1765,6 @@ const basic::ZoneInfo kZoneAmerica_Lima ACE_TIME_PROGMEM = { kZoneNameAmerica_Lima /*name*/, 0x980468c9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Lima /*eras*/, }; @@ -1848,7 +1799,6 @@ const basic::ZoneInfo kZoneAmerica_Los_Angeles ACE_TIME_PROGMEM = { kZoneNameAmerica_Los_Angeles /*name*/, 0xb7f7e8f2 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Los_Angeles /*eras*/, }; @@ -1883,7 +1833,6 @@ const basic::ZoneInfo kZoneAmerica_Managua ACE_TIME_PROGMEM = { kZoneNameAmerica_Managua /*name*/, 0x3d5e7600 /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Managua /*eras*/, }; @@ -1918,7 +1867,6 @@ const basic::ZoneInfo kZoneAmerica_Manaus ACE_TIME_PROGMEM = { kZoneNameAmerica_Manaus /*name*/, 0xac86bf8b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Manaus /*eras*/, }; @@ -1953,7 +1901,6 @@ const basic::ZoneInfo kZoneAmerica_Martinique ACE_TIME_PROGMEM = { kZoneNameAmerica_Martinique /*name*/, 0x551e84c5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Martinique /*eras*/, }; @@ -2000,7 +1947,6 @@ const basic::ZoneInfo kZoneAmerica_Matamoros ACE_TIME_PROGMEM = { kZoneNameAmerica_Matamoros /*name*/, 0xdd1b0259 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Matamoros /*eras*/, }; @@ -2035,7 +1981,6 @@ const basic::ZoneInfo kZoneAmerica_Mazatlan ACE_TIME_PROGMEM = { kZoneNameAmerica_Mazatlan /*name*/, 0x0532189e /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Mazatlan /*eras*/, }; @@ -2070,7 +2015,6 @@ const basic::ZoneInfo kZoneAmerica_Menominee ACE_TIME_PROGMEM = { kZoneNameAmerica_Menominee /*name*/, 0xe0e9c583 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Menominee /*eras*/, }; @@ -2105,7 +2049,6 @@ const basic::ZoneInfo kZoneAmerica_Merida ACE_TIME_PROGMEM = { kZoneNameAmerica_Merida /*name*/, 0xacd172d8 /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Merida /*eras*/, }; @@ -2140,7 +2083,6 @@ const basic::ZoneInfo kZoneAmerica_Miquelon ACE_TIME_PROGMEM = { kZoneNameAmerica_Miquelon /*name*/, 0x59674330 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Miquelon /*eras*/, }; @@ -2187,7 +2129,6 @@ const basic::ZoneInfo kZoneAmerica_Moncton ACE_TIME_PROGMEM = { kZoneNameAmerica_Moncton /*name*/, 0x5e07fe24 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Moncton /*eras*/, }; @@ -2222,7 +2163,6 @@ const basic::ZoneInfo kZoneAmerica_Monterrey ACE_TIME_PROGMEM = { kZoneNameAmerica_Monterrey /*name*/, 0x269a1deb /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Monterrey /*eras*/, }; @@ -2257,7 +2197,6 @@ const basic::ZoneInfo kZoneAmerica_Montevideo ACE_TIME_PROGMEM = { kZoneNameAmerica_Montevideo /*name*/, 0xfa214780 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Montevideo /*eras*/, }; @@ -2292,7 +2231,6 @@ const basic::ZoneInfo kZoneAmerica_Nassau ACE_TIME_PROGMEM = { kZoneNameAmerica_Nassau /*name*/, 0xaedef011 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Nassau /*eras*/, }; @@ -2327,7 +2265,6 @@ const basic::ZoneInfo kZoneAmerica_New_York ACE_TIME_PROGMEM = { kZoneNameAmerica_New_York /*name*/, 0x1e2a7654 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_New_York /*eras*/, }; @@ -2362,7 +2299,6 @@ const basic::ZoneInfo kZoneAmerica_Nipigon ACE_TIME_PROGMEM = { kZoneNameAmerica_Nipigon /*name*/, 0x9d2a8b1a /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Nipigon /*eras*/, }; @@ -2397,7 +2333,6 @@ const basic::ZoneInfo kZoneAmerica_Nome ACE_TIME_PROGMEM = { kZoneNameAmerica_Nome /*name*/, 0x98059b15 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Nome /*eras*/, }; @@ -2432,7 +2367,6 @@ const basic::ZoneInfo kZoneAmerica_North_Dakota_Center ACE_TIME_PROGMEM = { kZoneNameAmerica_North_Dakota_Center /*name*/, 0x9da42814 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_North_Dakota_Center /*eras*/, }; @@ -2467,7 +2401,6 @@ const basic::ZoneInfo kZoneAmerica_Nuuk ACE_TIME_PROGMEM = { kZoneNameAmerica_Nuuk /*name*/, 0x9805b5a9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Nuuk /*eras*/, }; @@ -2514,7 +2447,6 @@ const basic::ZoneInfo kZoneAmerica_Ojinaga ACE_TIME_PROGMEM = { kZoneNameAmerica_Ojinaga /*name*/, 0xebfde83f /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Ojinaga /*eras*/, }; @@ -2549,7 +2481,6 @@ const basic::ZoneInfo kZoneAmerica_Panama ACE_TIME_PROGMEM = { kZoneNameAmerica_Panama /*name*/, 0xb3863854 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Panama /*eras*/, }; @@ -2584,7 +2515,6 @@ const basic::ZoneInfo kZoneAmerica_Paramaribo ACE_TIME_PROGMEM = { kZoneNameAmerica_Paramaribo /*name*/, 0xb319e4c4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Paramaribo /*eras*/, }; @@ -2619,7 +2549,6 @@ const basic::ZoneInfo kZoneAmerica_Phoenix ACE_TIME_PROGMEM = { kZoneNameAmerica_Phoenix /*name*/, 0x34b5af01 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Phoenix /*eras*/, }; @@ -2654,7 +2583,6 @@ const basic::ZoneInfo kZoneAmerica_Port_au_Prince ACE_TIME_PROGMEM = { kZoneNameAmerica_Port_au_Prince /*name*/, 0x8e4a7bdc /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Port_au_Prince /*eras*/, }; @@ -2689,7 +2617,6 @@ const basic::ZoneInfo kZoneAmerica_Port_of_Spain ACE_TIME_PROGMEM = { kZoneNameAmerica_Port_of_Spain /*name*/, 0xd8b28d59 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Port_of_Spain /*eras*/, }; @@ -2724,7 +2651,6 @@ const basic::ZoneInfo kZoneAmerica_Porto_Velho ACE_TIME_PROGMEM = { kZoneNameAmerica_Porto_Velho /*name*/, 0x6b1aac77 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Porto_Velho /*eras*/, }; @@ -2759,7 +2685,6 @@ const basic::ZoneInfo kZoneAmerica_Puerto_Rico ACE_TIME_PROGMEM = { kZoneNameAmerica_Puerto_Rico /*name*/, 0x6752ca31 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Puerto_Rico /*eras*/, }; @@ -2794,7 +2719,6 @@ const basic::ZoneInfo kZoneAmerica_Rainy_River ACE_TIME_PROGMEM = { kZoneNameAmerica_Rainy_River /*name*/, 0x9cd58a10 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Rainy_River /*eras*/, }; @@ -2829,7 +2753,6 @@ const basic::ZoneInfo kZoneAmerica_Regina ACE_TIME_PROGMEM = { kZoneNameAmerica_Regina /*name*/, 0xb875371c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Regina /*eras*/, }; @@ -2864,7 +2787,6 @@ const basic::ZoneInfo kZoneAmerica_Santiago ACE_TIME_PROGMEM = { kZoneNameAmerica_Santiago /*name*/, 0x7410c9bc /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Santiago /*eras*/, }; @@ -2899,7 +2821,6 @@ const basic::ZoneInfo kZoneAmerica_Sao_Paulo ACE_TIME_PROGMEM = { kZoneNameAmerica_Sao_Paulo /*name*/, 0x1063bfc9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Sao_Paulo /*eras*/, }; @@ -2934,7 +2855,6 @@ const basic::ZoneInfo kZoneAmerica_Scoresbysund ACE_TIME_PROGMEM = { kZoneNameAmerica_Scoresbysund /*name*/, 0x123f8d2a /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Scoresbysund /*eras*/, }; @@ -2969,7 +2889,6 @@ const basic::ZoneInfo kZoneAmerica_Sitka ACE_TIME_PROGMEM = { kZoneNameAmerica_Sitka /*name*/, 0x99104ce2 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Sitka /*eras*/, }; @@ -3004,7 +2923,6 @@ const basic::ZoneInfo kZoneAmerica_Swift_Current ACE_TIME_PROGMEM = { kZoneNameAmerica_Swift_Current /*name*/, 0xdef98e55 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Swift_Current /*eras*/, }; @@ -3039,7 +2957,6 @@ const basic::ZoneInfo kZoneAmerica_Tegucigalpa ACE_TIME_PROGMEM = { kZoneNameAmerica_Tegucigalpa /*name*/, 0xbfd6fd4c /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Tegucigalpa /*eras*/, }; @@ -3074,7 +2991,6 @@ const basic::ZoneInfo kZoneAmerica_Thule ACE_TIME_PROGMEM = { kZoneNameAmerica_Thule /*name*/, 0x9921dd68 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Thule /*eras*/, }; @@ -3109,7 +3025,6 @@ const basic::ZoneInfo kZoneAmerica_Thunder_Bay ACE_TIME_PROGMEM = { kZoneNameAmerica_Thunder_Bay /*name*/, 0xf962e71b /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Thunder_Bay /*eras*/, }; @@ -3144,7 +3059,6 @@ const basic::ZoneInfo kZoneAmerica_Toronto ACE_TIME_PROGMEM = { kZoneNameAmerica_Toronto /*name*/, 0x792e851b /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Toronto /*eras*/, }; @@ -3179,7 +3093,6 @@ const basic::ZoneInfo kZoneAmerica_Vancouver ACE_TIME_PROGMEM = { kZoneNameAmerica_Vancouver /*name*/, 0x2c6f6b1f /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Vancouver /*eras*/, }; @@ -3226,7 +3139,6 @@ const basic::ZoneInfo kZoneAmerica_Winnipeg ACE_TIME_PROGMEM = { kZoneNameAmerica_Winnipeg /*name*/, 0x8c7dafc7 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Winnipeg /*eras*/, }; @@ -3261,7 +3173,6 @@ const basic::ZoneInfo kZoneAmerica_Yakutat ACE_TIME_PROGMEM = { kZoneNameAmerica_Yakutat /*name*/, 0xd8ee31e9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Yakutat /*eras*/, }; @@ -3296,7 +3207,6 @@ const basic::ZoneInfo kZoneAmerica_Yellowknife ACE_TIME_PROGMEM = { kZoneNameAmerica_Yellowknife /*name*/, 0x0f76c76f /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Yellowknife /*eras*/, }; @@ -3331,7 +3241,6 @@ const basic::ZoneInfo kZoneAntarctica_DumontDUrville ACE_TIME_PROGMEM = { kZoneNameAntarctica_DumontDUrville /*name*/, 0x5a3c656c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAntarctica_DumontDUrville /*eras*/, }; @@ -3366,7 +3275,6 @@ const basic::ZoneInfo kZoneAntarctica_Rothera ACE_TIME_PROGMEM = { kZoneNameAntarctica_Rothera /*name*/, 0x0e86d203 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAntarctica_Rothera /*eras*/, }; @@ -3401,7 +3309,6 @@ const basic::ZoneInfo kZoneAntarctica_Syowa ACE_TIME_PROGMEM = { kZoneNameAntarctica_Syowa /*name*/, 0xe330c7e1 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAntarctica_Syowa /*eras*/, }; @@ -3436,7 +3343,6 @@ const basic::ZoneInfo kZoneAntarctica_Vostok ACE_TIME_PROGMEM = { kZoneNameAntarctica_Vostok /*name*/, 0x4f966fd4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAntarctica_Vostok /*eras*/, }; @@ -3471,7 +3377,6 @@ const basic::ZoneInfo kZoneAsia_Amman ACE_TIME_PROGMEM = { kZoneNameAsia_Amman /*name*/, 0x148d21bc /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Amman /*eras*/, }; @@ -3506,7 +3411,6 @@ const basic::ZoneInfo kZoneAsia_Ashgabat ACE_TIME_PROGMEM = { kZoneNameAsia_Ashgabat /*name*/, 0xba87598d /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Ashgabat /*eras*/, }; @@ -3541,7 +3445,6 @@ const basic::ZoneInfo kZoneAsia_Baghdad ACE_TIME_PROGMEM = { kZoneNameAsia_Baghdad /*name*/, 0x9ceffbed /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Baghdad /*eras*/, }; @@ -3576,7 +3479,6 @@ const basic::ZoneInfo kZoneAsia_Baku ACE_TIME_PROGMEM = { kZoneNameAsia_Baku /*name*/, 0x1fa788b5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Baku /*eras*/, }; @@ -3611,7 +3513,6 @@ const basic::ZoneInfo kZoneAsia_Bangkok ACE_TIME_PROGMEM = { kZoneNameAsia_Bangkok /*name*/, 0x9d6e3aaf /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Bangkok /*eras*/, }; @@ -3646,7 +3547,6 @@ const basic::ZoneInfo kZoneAsia_Beirut ACE_TIME_PROGMEM = { kZoneNameAsia_Beirut /*name*/, 0xa7f3d5fd /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Beirut /*eras*/, }; @@ -3681,7 +3581,6 @@ const basic::ZoneInfo kZoneAsia_Brunei ACE_TIME_PROGMEM = { kZoneNameAsia_Brunei /*name*/, 0xa8e595f7 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Brunei /*eras*/, }; @@ -3716,7 +3615,6 @@ const basic::ZoneInfo kZoneAsia_Damascus ACE_TIME_PROGMEM = { kZoneNameAsia_Damascus /*name*/, 0x20fbb063 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Damascus /*eras*/, }; @@ -3763,7 +3661,6 @@ const basic::ZoneInfo kZoneAsia_Dhaka ACE_TIME_PROGMEM = { kZoneNameAsia_Dhaka /*name*/, 0x14c07b8b /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAsia_Dhaka /*eras*/, }; @@ -3798,7 +3695,6 @@ const basic::ZoneInfo kZoneAsia_Dubai ACE_TIME_PROGMEM = { kZoneNameAsia_Dubai /*name*/, 0x14c79f77 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Dubai /*eras*/, }; @@ -3833,7 +3729,6 @@ const basic::ZoneInfo kZoneAsia_Dushanbe ACE_TIME_PROGMEM = { kZoneNameAsia_Dushanbe /*name*/, 0x32fc5c3c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Dushanbe /*eras*/, }; @@ -3868,7 +3763,6 @@ const basic::ZoneInfo kZoneAsia_Ho_Chi_Minh ACE_TIME_PROGMEM = { kZoneNameAsia_Ho_Chi_Minh /*name*/, 0x20f2d127 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Ho_Chi_Minh /*eras*/, }; @@ -3903,7 +3797,6 @@ const basic::ZoneInfo kZoneAsia_Hong_Kong ACE_TIME_PROGMEM = { kZoneNameAsia_Hong_Kong /*name*/, 0x577f28ac /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Hong_Kong /*eras*/, }; @@ -3938,7 +3831,6 @@ const basic::ZoneInfo kZoneAsia_Hovd ACE_TIME_PROGMEM = { kZoneNameAsia_Hovd /*name*/, 0x1fab0fe3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Hovd /*eras*/, }; @@ -3973,7 +3865,6 @@ const basic::ZoneInfo kZoneAsia_Jakarta ACE_TIME_PROGMEM = { kZoneNameAsia_Jakarta /*name*/, 0x0506ab50 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Jakarta /*eras*/, }; @@ -4008,7 +3899,6 @@ const basic::ZoneInfo kZoneAsia_Jayapura ACE_TIME_PROGMEM = { kZoneNameAsia_Jayapura /*name*/, 0xc6833c2f /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Jayapura /*eras*/, }; @@ -4043,7 +3933,6 @@ const basic::ZoneInfo kZoneAsia_Jerusalem ACE_TIME_PROGMEM = { kZoneNameAsia_Jerusalem /*name*/, 0x5becd23a /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Jerusalem /*eras*/, }; @@ -4078,7 +3967,6 @@ const basic::ZoneInfo kZoneAsia_Kabul ACE_TIME_PROGMEM = { kZoneNameAsia_Kabul /*name*/, 0x153b5601 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Kabul /*eras*/, }; @@ -4113,7 +4001,6 @@ const basic::ZoneInfo kZoneAsia_Karachi ACE_TIME_PROGMEM = { kZoneNameAsia_Karachi /*name*/, 0x527f5245 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Karachi /*eras*/, }; @@ -4148,7 +4035,6 @@ const basic::ZoneInfo kZoneAsia_Kathmandu ACE_TIME_PROGMEM = { kZoneNameAsia_Kathmandu /*name*/, 0x9a96ce6f /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Kathmandu /*eras*/, }; @@ -4183,7 +4069,6 @@ const basic::ZoneInfo kZoneAsia_Kolkata ACE_TIME_PROGMEM = { kZoneNameAsia_Kolkata /*name*/, 0x72c06cd9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Kolkata /*eras*/, }; @@ -4218,7 +4103,6 @@ const basic::ZoneInfo kZoneAsia_Kuala_Lumpur ACE_TIME_PROGMEM = { kZoneNameAsia_Kuala_Lumpur /*name*/, 0x014763c4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Kuala_Lumpur /*eras*/, }; @@ -4253,7 +4137,6 @@ const basic::ZoneInfo kZoneAsia_Kuching ACE_TIME_PROGMEM = { kZoneNameAsia_Kuching /*name*/, 0x801b003b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Kuching /*eras*/, }; @@ -4288,7 +4171,6 @@ const basic::ZoneInfo kZoneAsia_Macau ACE_TIME_PROGMEM = { kZoneNameAsia_Macau /*name*/, 0x155f88b9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Macau /*eras*/, }; @@ -4323,7 +4205,6 @@ const basic::ZoneInfo kZoneAsia_Makassar ACE_TIME_PROGMEM = { kZoneNameAsia_Makassar /*name*/, 0x6aa21c85 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Makassar /*eras*/, }; @@ -4358,7 +4239,6 @@ const basic::ZoneInfo kZoneAsia_Manila ACE_TIME_PROGMEM = { kZoneNameAsia_Manila /*name*/, 0xc156c944 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Manila /*eras*/, }; @@ -4393,7 +4273,6 @@ const basic::ZoneInfo kZoneAsia_Nicosia ACE_TIME_PROGMEM = { kZoneNameAsia_Nicosia /*name*/, 0x4b0fcf78 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Nicosia /*eras*/, }; @@ -4428,7 +4307,6 @@ const basic::ZoneInfo kZoneAsia_Pontianak ACE_TIME_PROGMEM = { kZoneNameAsia_Pontianak /*name*/, 0x1a76c057 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Pontianak /*eras*/, }; @@ -4463,7 +4341,6 @@ const basic::ZoneInfo kZoneAsia_Qatar ACE_TIME_PROGMEM = { kZoneNameAsia_Qatar /*name*/, 0x15a8330b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Qatar /*eras*/, }; @@ -4498,7 +4375,6 @@ const basic::ZoneInfo kZoneAsia_Riyadh ACE_TIME_PROGMEM = { kZoneNameAsia_Riyadh /*name*/, 0xcd973d93 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Riyadh /*eras*/, }; @@ -4533,7 +4409,6 @@ const basic::ZoneInfo kZoneAsia_Samarkand ACE_TIME_PROGMEM = { kZoneNameAsia_Samarkand /*name*/, 0x13ae5104 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Samarkand /*eras*/, }; @@ -4568,7 +4443,6 @@ const basic::ZoneInfo kZoneAsia_Seoul ACE_TIME_PROGMEM = { kZoneNameAsia_Seoul /*name*/, 0x15ce82da /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Seoul /*eras*/, }; @@ -4603,7 +4477,6 @@ const basic::ZoneInfo kZoneAsia_Shanghai ACE_TIME_PROGMEM = { kZoneNameAsia_Shanghai /*name*/, 0xf895a7f5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Shanghai /*eras*/, }; @@ -4638,7 +4511,6 @@ const basic::ZoneInfo kZoneAsia_Singapore ACE_TIME_PROGMEM = { kZoneNameAsia_Singapore /*name*/, 0xcf8581fa /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Singapore /*eras*/, }; @@ -4673,7 +4545,6 @@ const basic::ZoneInfo kZoneAsia_Taipei ACE_TIME_PROGMEM = { kZoneNameAsia_Taipei /*name*/, 0xd1a844ae /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Taipei /*eras*/, }; @@ -4708,7 +4579,6 @@ const basic::ZoneInfo kZoneAsia_Tashkent ACE_TIME_PROGMEM = { kZoneNameAsia_Tashkent /*name*/, 0xf3924254 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Tashkent /*eras*/, }; @@ -4743,7 +4613,6 @@ const basic::ZoneInfo kZoneAsia_Tehran ACE_TIME_PROGMEM = { kZoneNameAsia_Tehran /*name*/, 0xd1f02254 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Tehran /*eras*/, }; @@ -4778,7 +4647,6 @@ const basic::ZoneInfo kZoneAsia_Thimphu ACE_TIME_PROGMEM = { kZoneNameAsia_Thimphu /*name*/, 0x170380d1 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Thimphu /*eras*/, }; @@ -4813,7 +4681,6 @@ const basic::ZoneInfo kZoneAsia_Tokyo ACE_TIME_PROGMEM = { kZoneNameAsia_Tokyo /*name*/, 0x15e606a8 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Tokyo /*eras*/, }; @@ -4848,7 +4715,6 @@ const basic::ZoneInfo kZoneAsia_Ulaanbaatar ACE_TIME_PROGMEM = { kZoneNameAsia_Ulaanbaatar /*name*/, 0x30f0cc4e /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Ulaanbaatar /*eras*/, }; @@ -4883,7 +4749,6 @@ const basic::ZoneInfo kZoneAsia_Urumqi ACE_TIME_PROGMEM = { kZoneNameAsia_Urumqi /*name*/, 0xd5379735 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Urumqi /*eras*/, }; @@ -4918,7 +4783,6 @@ const basic::ZoneInfo kZoneAsia_Yangon ACE_TIME_PROGMEM = { kZoneNameAsia_Yangon /*name*/, 0xdd54a8be /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Yangon /*eras*/, }; @@ -4965,7 +4829,6 @@ const basic::ZoneInfo kZoneAsia_Yerevan ACE_TIME_PROGMEM = { kZoneNameAsia_Yerevan /*name*/, 0x9185c8cc /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAsia_Yerevan /*eras*/, }; @@ -5000,7 +4863,6 @@ const basic::ZoneInfo kZoneAtlantic_Azores ACE_TIME_PROGMEM = { kZoneNameAtlantic_Azores /*name*/, 0xf93ed918 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_Azores /*eras*/, }; @@ -5035,7 +4897,6 @@ const basic::ZoneInfo kZoneAtlantic_Bermuda ACE_TIME_PROGMEM = { kZoneNameAtlantic_Bermuda /*name*/, 0x3d4bb1c4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_Bermuda /*eras*/, }; @@ -5070,7 +4931,6 @@ const basic::ZoneInfo kZoneAtlantic_Canary ACE_TIME_PROGMEM = { kZoneNameAtlantic_Canary /*name*/, 0xfc23f2c2 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_Canary /*eras*/, }; @@ -5105,7 +4965,6 @@ const basic::ZoneInfo kZoneAtlantic_Cape_Verde ACE_TIME_PROGMEM = { kZoneNameAtlantic_Cape_Verde /*name*/, 0x5c5e1772 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_Cape_Verde /*eras*/, }; @@ -5140,7 +4999,6 @@ const basic::ZoneInfo kZoneAtlantic_Faroe ACE_TIME_PROGMEM = { kZoneNameAtlantic_Faroe /*name*/, 0xe110a971 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_Faroe /*eras*/, }; @@ -5175,7 +5033,6 @@ const basic::ZoneInfo kZoneAtlantic_Madeira ACE_TIME_PROGMEM = { kZoneNameAtlantic_Madeira /*name*/, 0x81b5c037 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_Madeira /*eras*/, }; @@ -5210,7 +5067,6 @@ const basic::ZoneInfo kZoneAtlantic_Reykjavik ACE_TIME_PROGMEM = { kZoneNameAtlantic_Reykjavik /*name*/, 0x1c2b4f74 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_Reykjavik /*eras*/, }; @@ -5245,7 +5101,6 @@ const basic::ZoneInfo kZoneAtlantic_South_Georgia ACE_TIME_PROGMEM = { kZoneNameAtlantic_South_Georgia /*name*/, 0x33013174 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_South_Georgia /*eras*/, }; @@ -5280,7 +5135,6 @@ const basic::ZoneInfo kZoneAustralia_Adelaide ACE_TIME_PROGMEM = { kZoneNameAustralia_Adelaide /*name*/, 0x2428e8a3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Adelaide /*eras*/, }; @@ -5315,7 +5169,6 @@ const basic::ZoneInfo kZoneAustralia_Brisbane ACE_TIME_PROGMEM = { kZoneNameAustralia_Brisbane /*name*/, 0x4fedc9c0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Brisbane /*eras*/, }; @@ -5362,7 +5215,6 @@ const basic::ZoneInfo kZoneAustralia_Broken_Hill ACE_TIME_PROGMEM = { kZoneNameAustralia_Broken_Hill /*name*/, 0xb06eada3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAustralia_Broken_Hill /*eras*/, }; @@ -5397,7 +5249,6 @@ const basic::ZoneInfo kZoneAustralia_Darwin ACE_TIME_PROGMEM = { kZoneNameAustralia_Darwin /*name*/, 0x2876bdff /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Darwin /*eras*/, }; @@ -5432,7 +5283,6 @@ const basic::ZoneInfo kZoneAustralia_Eucla ACE_TIME_PROGMEM = { kZoneNameAustralia_Eucla /*name*/, 0x8cf99e44 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Eucla /*eras*/, }; @@ -5467,7 +5317,6 @@ const basic::ZoneInfo kZoneAustralia_Hobart ACE_TIME_PROGMEM = { kZoneNameAustralia_Hobart /*name*/, 0x32bf951a /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Hobart /*eras*/, }; @@ -5502,7 +5351,6 @@ const basic::ZoneInfo kZoneAustralia_Lindeman ACE_TIME_PROGMEM = { kZoneNameAustralia_Lindeman /*name*/, 0xe05029e2 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Lindeman /*eras*/, }; @@ -5537,7 +5385,6 @@ const basic::ZoneInfo kZoneAustralia_Lord_Howe ACE_TIME_PROGMEM = { kZoneNameAustralia_Lord_Howe /*name*/, 0xa748b67d /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Lord_Howe /*eras*/, }; @@ -5572,7 +5419,6 @@ const basic::ZoneInfo kZoneAustralia_Melbourne ACE_TIME_PROGMEM = { kZoneNameAustralia_Melbourne /*name*/, 0x0fe559a3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Melbourne /*eras*/, }; @@ -5607,7 +5453,6 @@ const basic::ZoneInfo kZoneAustralia_Perth ACE_TIME_PROGMEM = { kZoneNameAustralia_Perth /*name*/, 0x8db8269d /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Perth /*eras*/, }; @@ -5642,7 +5487,6 @@ const basic::ZoneInfo kZoneAustralia_Sydney ACE_TIME_PROGMEM = { kZoneNameAustralia_Sydney /*name*/, 0x4d1e9776 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Sydney /*eras*/, }; @@ -5677,7 +5521,6 @@ const basic::ZoneInfo kZoneCET ACE_TIME_PROGMEM = { kZoneNameCET /*name*/, 0x0b87d921 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraCET /*eras*/, }; @@ -5712,7 +5555,6 @@ const basic::ZoneInfo kZoneCST6CDT ACE_TIME_PROGMEM = { kZoneNameCST6CDT /*name*/, 0xf0e87d00 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraCST6CDT /*eras*/, }; @@ -5747,7 +5589,6 @@ const basic::ZoneInfo kZoneEET ACE_TIME_PROGMEM = { kZoneNameEET /*name*/, 0x0b87e1a3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEET /*eras*/, }; @@ -5782,7 +5623,6 @@ const basic::ZoneInfo kZoneEST ACE_TIME_PROGMEM = { kZoneNameEST /*name*/, 0x0b87e371 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEST /*eras*/, }; @@ -5817,7 +5657,6 @@ const basic::ZoneInfo kZoneEST5EDT ACE_TIME_PROGMEM = { kZoneNameEST5EDT /*name*/, 0x8adc72a3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEST5EDT /*eras*/, }; @@ -5852,7 +5691,6 @@ const basic::ZoneInfo kZoneEtc_GMT ACE_TIME_PROGMEM = { kZoneNameEtc_GMT /*name*/, 0xd8e2de58 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT /*eras*/, }; @@ -5887,7 +5725,6 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_1 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_1 /*name*/, 0x9d13da14 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_1 /*eras*/, }; @@ -5922,7 +5759,6 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_10 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_10 /*name*/, 0x3f8f1cc4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_10 /*eras*/, }; @@ -5957,7 +5793,6 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_11 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_11 /*name*/, 0x3f8f1cc5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_11 /*eras*/, }; @@ -5992,7 +5827,6 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_12 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_12 /*name*/, 0x3f8f1cc6 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_12 /*eras*/, }; @@ -6027,7 +5861,6 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_2 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_2 /*name*/, 0x9d13da15 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_2 /*eras*/, }; @@ -6062,7 +5895,6 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_3 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_3 /*name*/, 0x9d13da16 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_3 /*eras*/, }; @@ -6097,7 +5929,6 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_4 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_4 /*name*/, 0x9d13da17 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_4 /*eras*/, }; @@ -6132,7 +5963,6 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_5 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_5 /*name*/, 0x9d13da18 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_5 /*eras*/, }; @@ -6167,7 +5997,6 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_6 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_6 /*name*/, 0x9d13da19 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_6 /*eras*/, }; @@ -6202,7 +6031,6 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_7 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_7 /*name*/, 0x9d13da1a /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_7 /*eras*/, }; @@ -6237,7 +6065,6 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_8 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_8 /*name*/, 0x9d13da1b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_8 /*eras*/, }; @@ -6272,7 +6099,6 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_9 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_9 /*name*/, 0x9d13da1c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_9 /*eras*/, }; @@ -6307,7 +6133,6 @@ const basic::ZoneInfo kZoneEtc_GMT_1 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_1 /*name*/, 0x9d13da56 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_1 /*eras*/, }; @@ -6342,7 +6167,6 @@ const basic::ZoneInfo kZoneEtc_GMT_10 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_10 /*name*/, 0x3f8f2546 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_10 /*eras*/, }; @@ -6377,7 +6201,6 @@ const basic::ZoneInfo kZoneEtc_GMT_11 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_11 /*name*/, 0x3f8f2547 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_11 /*eras*/, }; @@ -6412,7 +6235,6 @@ const basic::ZoneInfo kZoneEtc_GMT_12 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_12 /*name*/, 0x3f8f2548 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_12 /*eras*/, }; @@ -6447,7 +6269,6 @@ const basic::ZoneInfo kZoneEtc_GMT_13 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_13 /*name*/, 0x3f8f2549 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_13 /*eras*/, }; @@ -6482,7 +6303,6 @@ const basic::ZoneInfo kZoneEtc_GMT_14 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_14 /*name*/, 0x3f8f254a /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_14 /*eras*/, }; @@ -6517,7 +6337,6 @@ const basic::ZoneInfo kZoneEtc_GMT_2 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_2 /*name*/, 0x9d13da57 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_2 /*eras*/, }; @@ -6552,7 +6371,6 @@ const basic::ZoneInfo kZoneEtc_GMT_3 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_3 /*name*/, 0x9d13da58 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_3 /*eras*/, }; @@ -6587,7 +6405,6 @@ const basic::ZoneInfo kZoneEtc_GMT_4 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_4 /*name*/, 0x9d13da59 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_4 /*eras*/, }; @@ -6622,7 +6439,6 @@ const basic::ZoneInfo kZoneEtc_GMT_5 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_5 /*name*/, 0x9d13da5a /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_5 /*eras*/, }; @@ -6657,7 +6473,6 @@ const basic::ZoneInfo kZoneEtc_GMT_6 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_6 /*name*/, 0x9d13da5b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_6 /*eras*/, }; @@ -6692,7 +6507,6 @@ const basic::ZoneInfo kZoneEtc_GMT_7 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_7 /*name*/, 0x9d13da5c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_7 /*eras*/, }; @@ -6727,7 +6541,6 @@ const basic::ZoneInfo kZoneEtc_GMT_8 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_8 /*name*/, 0x9d13da5d /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_8 /*eras*/, }; @@ -6762,7 +6575,6 @@ const basic::ZoneInfo kZoneEtc_GMT_9 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_9 /*name*/, 0x9d13da5e /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_9 /*eras*/, }; @@ -6797,7 +6609,6 @@ const basic::ZoneInfo kZoneEtc_UTC ACE_TIME_PROGMEM = { kZoneNameEtc_UTC /*name*/, 0xd8e31abc /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_UTC /*eras*/, }; @@ -6832,7 +6643,6 @@ const basic::ZoneInfo kZoneEurope_Amsterdam ACE_TIME_PROGMEM = { kZoneNameEurope_Amsterdam /*name*/, 0x109395c2 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Amsterdam /*eras*/, }; @@ -6867,7 +6677,6 @@ const basic::ZoneInfo kZoneEurope_Andorra ACE_TIME_PROGMEM = { kZoneNameEurope_Andorra /*name*/, 0x97f6764b /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Andorra /*eras*/, }; @@ -6902,7 +6711,6 @@ const basic::ZoneInfo kZoneEurope_Athens ACE_TIME_PROGMEM = { kZoneNameEurope_Athens /*name*/, 0x4318fa27 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Athens /*eras*/, }; @@ -6937,7 +6745,6 @@ const basic::ZoneInfo kZoneEurope_Belgrade ACE_TIME_PROGMEM = { kZoneNameEurope_Belgrade /*name*/, 0xe0532b3a /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Belgrade /*eras*/, }; @@ -6972,7 +6779,6 @@ const basic::ZoneInfo kZoneEurope_Berlin ACE_TIME_PROGMEM = { kZoneNameEurope_Berlin /*name*/, 0x44644c20 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Berlin /*eras*/, }; @@ -7007,7 +6813,6 @@ const basic::ZoneInfo kZoneEurope_Brussels ACE_TIME_PROGMEM = { kZoneNameEurope_Brussels /*name*/, 0xdee07337 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Brussels /*eras*/, }; @@ -7042,7 +6847,6 @@ const basic::ZoneInfo kZoneEurope_Bucharest ACE_TIME_PROGMEM = { kZoneNameEurope_Bucharest /*name*/, 0xfb349ec5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Bucharest /*eras*/, }; @@ -7077,7 +6881,6 @@ const basic::ZoneInfo kZoneEurope_Budapest ACE_TIME_PROGMEM = { kZoneNameEurope_Budapest /*name*/, 0x9ce0197c /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Budapest /*eras*/, }; @@ -7112,7 +6915,6 @@ const basic::ZoneInfo kZoneEurope_Chisinau ACE_TIME_PROGMEM = { kZoneNameEurope_Chisinau /*name*/, 0xad58aa18 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Chisinau /*eras*/, }; @@ -7147,7 +6949,6 @@ const basic::ZoneInfo kZoneEurope_Copenhagen ACE_TIME_PROGMEM = { kZoneNameEurope_Copenhagen /*name*/, 0xe0ed30bc /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Copenhagen /*eras*/, }; @@ -7182,7 +6983,6 @@ const basic::ZoneInfo kZoneEurope_Dublin ACE_TIME_PROGMEM = { kZoneNameEurope_Dublin /*name*/, 0x4a275f62 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Dublin /*eras*/, }; @@ -7217,7 +7017,6 @@ const basic::ZoneInfo kZoneEurope_Gibraltar ACE_TIME_PROGMEM = { kZoneNameEurope_Gibraltar /*name*/, 0xf8e325fc /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Gibraltar /*eras*/, }; @@ -7252,7 +7051,6 @@ const basic::ZoneInfo kZoneEurope_Helsinki ACE_TIME_PROGMEM = { kZoneNameEurope_Helsinki /*name*/, 0x6ab2975b /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Helsinki /*eras*/, }; @@ -7287,7 +7085,6 @@ const basic::ZoneInfo kZoneEurope_Kiev ACE_TIME_PROGMEM = { kZoneNameEurope_Kiev /*name*/, 0xa2c19eb3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Kiev /*eras*/, }; @@ -7322,7 +7119,6 @@ const basic::ZoneInfo kZoneEurope_Lisbon ACE_TIME_PROGMEM = { kZoneNameEurope_Lisbon /*name*/, 0x5c00a70b /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Lisbon /*eras*/, }; @@ -7357,7 +7153,6 @@ const basic::ZoneInfo kZoneEurope_London ACE_TIME_PROGMEM = { kZoneNameEurope_London /*name*/, 0x5c6a84ae /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_London /*eras*/, }; @@ -7392,7 +7187,6 @@ const basic::ZoneInfo kZoneEurope_Luxembourg ACE_TIME_PROGMEM = { kZoneNameEurope_Luxembourg /*name*/, 0x1f8bc6ce /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Luxembourg /*eras*/, }; @@ -7427,7 +7221,6 @@ const basic::ZoneInfo kZoneEurope_Madrid ACE_TIME_PROGMEM = { kZoneNameEurope_Madrid /*name*/, 0x5dbd1535 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Madrid /*eras*/, }; @@ -7462,7 +7255,6 @@ const basic::ZoneInfo kZoneEurope_Malta ACE_TIME_PROGMEM = { kZoneNameEurope_Malta /*name*/, 0xfb1560f3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Malta /*eras*/, }; @@ -7497,7 +7289,6 @@ const basic::ZoneInfo kZoneEurope_Monaco ACE_TIME_PROGMEM = { kZoneNameEurope_Monaco /*name*/, 0x5ebf9f01 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Monaco /*eras*/, }; @@ -7532,7 +7323,6 @@ const basic::ZoneInfo kZoneEurope_Oslo ACE_TIME_PROGMEM = { kZoneNameEurope_Oslo /*name*/, 0xa2c3fba1 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Oslo /*eras*/, }; @@ -7567,7 +7357,6 @@ const basic::ZoneInfo kZoneEurope_Paris ACE_TIME_PROGMEM = { kZoneNameEurope_Paris /*name*/, 0xfb4bc2a3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Paris /*eras*/, }; @@ -7602,7 +7391,6 @@ const basic::ZoneInfo kZoneEurope_Prague ACE_TIME_PROGMEM = { kZoneNameEurope_Prague /*name*/, 0x65ee5d48 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Prague /*eras*/, }; @@ -7637,7 +7425,6 @@ const basic::ZoneInfo kZoneEurope_Rome ACE_TIME_PROGMEM = { kZoneNameEurope_Rome /*name*/, 0xa2c58fd7 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Rome /*eras*/, }; @@ -7672,7 +7459,6 @@ const basic::ZoneInfo kZoneEurope_Sofia ACE_TIME_PROGMEM = { kZoneNameEurope_Sofia /*name*/, 0xfb898656 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Sofia /*eras*/, }; @@ -7707,7 +7493,6 @@ const basic::ZoneInfo kZoneEurope_Stockholm ACE_TIME_PROGMEM = { kZoneNameEurope_Stockholm /*name*/, 0x5bf6fbb8 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Stockholm /*eras*/, }; @@ -7742,7 +7527,6 @@ const basic::ZoneInfo kZoneEurope_Tirane ACE_TIME_PROGMEM = { kZoneNameEurope_Tirane /*name*/, 0x6ea95b47 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Tirane /*eras*/, }; @@ -7777,7 +7561,6 @@ const basic::ZoneInfo kZoneEurope_Uzhgorod ACE_TIME_PROGMEM = { kZoneNameEurope_Uzhgorod /*name*/, 0xb066f5d6 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Uzhgorod /*eras*/, }; @@ -7812,7 +7595,6 @@ const basic::ZoneInfo kZoneEurope_Vienna ACE_TIME_PROGMEM = { kZoneNameEurope_Vienna /*name*/, 0x734cc2e5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Vienna /*eras*/, }; @@ -7847,7 +7629,6 @@ const basic::ZoneInfo kZoneEurope_Warsaw ACE_TIME_PROGMEM = { kZoneNameEurope_Warsaw /*name*/, 0x75185c19 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Warsaw /*eras*/, }; @@ -7882,7 +7663,6 @@ const basic::ZoneInfo kZoneEurope_Zaporozhye ACE_TIME_PROGMEM = { kZoneNameEurope_Zaporozhye /*name*/, 0xeab9767f /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Zaporozhye /*eras*/, }; @@ -7917,7 +7697,6 @@ const basic::ZoneInfo kZoneEurope_Zurich ACE_TIME_PROGMEM = { kZoneNameEurope_Zurich /*name*/, 0x7d8195b9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Zurich /*eras*/, }; @@ -7952,7 +7731,6 @@ const basic::ZoneInfo kZoneHST ACE_TIME_PROGMEM = { kZoneNameHST /*name*/, 0x0b87f034 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraHST /*eras*/, }; @@ -7987,7 +7765,6 @@ const basic::ZoneInfo kZoneIndian_Chagos ACE_TIME_PROGMEM = { kZoneNameIndian_Chagos /*name*/, 0x456f7c3c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Chagos /*eras*/, }; @@ -8022,7 +7799,6 @@ const basic::ZoneInfo kZoneIndian_Christmas ACE_TIME_PROGMEM = { kZoneNameIndian_Christmas /*name*/, 0x68c207d5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Christmas /*eras*/, }; @@ -8057,7 +7833,6 @@ const basic::ZoneInfo kZoneIndian_Cocos ACE_TIME_PROGMEM = { kZoneNameIndian_Cocos /*name*/, 0x021e86de /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Cocos /*eras*/, }; @@ -8092,7 +7867,6 @@ const basic::ZoneInfo kZoneIndian_Kerguelen ACE_TIME_PROGMEM = { kZoneNameIndian_Kerguelen /*name*/, 0x4351b389 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Kerguelen /*eras*/, }; @@ -8127,7 +7901,6 @@ const basic::ZoneInfo kZoneIndian_Mahe ACE_TIME_PROGMEM = { kZoneNameIndian_Mahe /*name*/, 0x45e725e2 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Mahe /*eras*/, }; @@ -8162,7 +7935,6 @@ const basic::ZoneInfo kZoneIndian_Maldives ACE_TIME_PROGMEM = { kZoneNameIndian_Maldives /*name*/, 0x9869681c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Maldives /*eras*/, }; @@ -8197,7 +7969,6 @@ const basic::ZoneInfo kZoneIndian_Mauritius ACE_TIME_PROGMEM = { kZoneNameIndian_Mauritius /*name*/, 0x7b09c02a /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Mauritius /*eras*/, }; @@ -8232,7 +8003,6 @@ const basic::ZoneInfo kZoneIndian_Reunion ACE_TIME_PROGMEM = { kZoneNameIndian_Reunion /*name*/, 0x7076c047 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Reunion /*eras*/, }; @@ -8267,7 +8037,6 @@ const basic::ZoneInfo kZoneMET ACE_TIME_PROGMEM = { kZoneNameMET /*name*/, 0x0b8803ab /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraMET /*eras*/, }; @@ -8302,7 +8071,6 @@ const basic::ZoneInfo kZoneMST ACE_TIME_PROGMEM = { kZoneNameMST /*name*/, 0x0b880579 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraMST /*eras*/, }; @@ -8337,7 +8105,6 @@ const basic::ZoneInfo kZoneMST7MDT ACE_TIME_PROGMEM = { kZoneNameMST7MDT /*name*/, 0xf2af9375 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraMST7MDT /*eras*/, }; @@ -8372,7 +8139,6 @@ const basic::ZoneInfo kZonePST8PDT ACE_TIME_PROGMEM = { kZoneNamePST8PDT /*name*/, 0xd99ee2dc /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPST8PDT /*eras*/, }; @@ -8407,7 +8173,6 @@ const basic::ZoneInfo kZonePacific_Auckland ACE_TIME_PROGMEM = { kZoneNamePacific_Auckland /*name*/, 0x25062f86 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Auckland /*eras*/, }; @@ -8442,7 +8207,6 @@ const basic::ZoneInfo kZonePacific_Chatham ACE_TIME_PROGMEM = { kZoneNamePacific_Chatham /*name*/, 0x2f0de999 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Chatham /*eras*/, }; @@ -8477,7 +8241,6 @@ const basic::ZoneInfo kZonePacific_Chuuk ACE_TIME_PROGMEM = { kZoneNamePacific_Chuuk /*name*/, 0x8a090b23 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Chuuk /*eras*/, }; @@ -8512,7 +8275,6 @@ const basic::ZoneInfo kZonePacific_Easter ACE_TIME_PROGMEM = { kZoneNamePacific_Easter /*name*/, 0xcf54f7e7 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Easter /*eras*/, }; @@ -8547,7 +8309,6 @@ const basic::ZoneInfo kZonePacific_Efate ACE_TIME_PROGMEM = { kZoneNamePacific_Efate /*name*/, 0x8a2bce28 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Efate /*eras*/, }; @@ -8582,7 +8343,6 @@ const basic::ZoneInfo kZonePacific_Enderbury ACE_TIME_PROGMEM = { kZoneNamePacific_Enderbury /*name*/, 0x61599a93 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Enderbury /*eras*/, }; @@ -8617,7 +8377,6 @@ const basic::ZoneInfo kZonePacific_Fiji ACE_TIME_PROGMEM = { kZoneNamePacific_Fiji /*name*/, 0x23383ba5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Fiji /*eras*/, }; @@ -8652,7 +8411,6 @@ const basic::ZoneInfo kZonePacific_Funafuti ACE_TIME_PROGMEM = { kZoneNamePacific_Funafuti /*name*/, 0xdb402d65 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Funafuti /*eras*/, }; @@ -8687,7 +8445,6 @@ const basic::ZoneInfo kZonePacific_Galapagos ACE_TIME_PROGMEM = { kZoneNamePacific_Galapagos /*name*/, 0xa952f752 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Galapagos /*eras*/, }; @@ -8722,7 +8479,6 @@ const basic::ZoneInfo kZonePacific_Gambier ACE_TIME_PROGMEM = { kZoneNamePacific_Gambier /*name*/, 0x53720c3a /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Gambier /*eras*/, }; @@ -8757,7 +8513,6 @@ const basic::ZoneInfo kZonePacific_Guadalcanal ACE_TIME_PROGMEM = { kZoneNamePacific_Guadalcanal /*name*/, 0xf4dd25f0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Guadalcanal /*eras*/, }; @@ -8792,7 +8547,6 @@ const basic::ZoneInfo kZonePacific_Honolulu ACE_TIME_PROGMEM = { kZoneNamePacific_Honolulu /*name*/, 0xe6e70af9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Honolulu /*eras*/, }; @@ -8827,7 +8581,6 @@ const basic::ZoneInfo kZonePacific_Kiritimati ACE_TIME_PROGMEM = { kZoneNamePacific_Kiritimati /*name*/, 0x8305073a /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Kiritimati /*eras*/, }; @@ -8874,7 +8627,6 @@ const basic::ZoneInfo kZonePacific_Kosrae ACE_TIME_PROGMEM = { kZoneNamePacific_Kosrae /*name*/, 0xde5139a8 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraPacific_Kosrae /*eras*/, }; @@ -8909,7 +8661,6 @@ const basic::ZoneInfo kZonePacific_Kwajalein ACE_TIME_PROGMEM = { kZoneNamePacific_Kwajalein /*name*/, 0x8e216759 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Kwajalein /*eras*/, }; @@ -8944,7 +8695,6 @@ const basic::ZoneInfo kZonePacific_Majuro ACE_TIME_PROGMEM = { kZoneNamePacific_Majuro /*name*/, 0xe1f95371 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Majuro /*eras*/, }; @@ -8979,7 +8729,6 @@ const basic::ZoneInfo kZonePacific_Marquesas ACE_TIME_PROGMEM = { kZoneNamePacific_Marquesas /*name*/, 0x57ca7135 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Marquesas /*eras*/, }; @@ -9014,7 +8763,6 @@ const basic::ZoneInfo kZonePacific_Nauru ACE_TIME_PROGMEM = { kZoneNamePacific_Nauru /*name*/, 0x8acc41ae /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Nauru /*eras*/, }; @@ -9049,7 +8797,6 @@ const basic::ZoneInfo kZonePacific_Niue ACE_TIME_PROGMEM = { kZoneNamePacific_Niue /*name*/, 0x233ca014 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Niue /*eras*/, }; @@ -9084,7 +8831,6 @@ const basic::ZoneInfo kZonePacific_Noumea ACE_TIME_PROGMEM = { kZoneNamePacific_Noumea /*name*/, 0xe551b788 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Noumea /*eras*/, }; @@ -9119,7 +8865,6 @@ const basic::ZoneInfo kZonePacific_Pago_Pago ACE_TIME_PROGMEM = { kZoneNamePacific_Pago_Pago /*name*/, 0x603aebd0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Pago_Pago /*eras*/, }; @@ -9154,7 +8899,6 @@ const basic::ZoneInfo kZonePacific_Palau ACE_TIME_PROGMEM = { kZoneNamePacific_Palau /*name*/, 0x8af04a36 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Palau /*eras*/, }; @@ -9189,7 +8933,6 @@ const basic::ZoneInfo kZonePacific_Pitcairn ACE_TIME_PROGMEM = { kZoneNamePacific_Pitcairn /*name*/, 0x8837d8bd /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Pitcairn /*eras*/, }; @@ -9224,7 +8967,6 @@ const basic::ZoneInfo kZonePacific_Pohnpei ACE_TIME_PROGMEM = { kZoneNamePacific_Pohnpei /*name*/, 0x28929f96 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Pohnpei /*eras*/, }; @@ -9259,7 +9001,6 @@ const basic::ZoneInfo kZonePacific_Port_Moresby ACE_TIME_PROGMEM = { kZoneNamePacific_Port_Moresby /*name*/, 0xa7ba7f68 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Port_Moresby /*eras*/, }; @@ -9294,7 +9035,6 @@ const basic::ZoneInfo kZonePacific_Rarotonga ACE_TIME_PROGMEM = { kZoneNamePacific_Rarotonga /*name*/, 0x9981a3b0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Rarotonga /*eras*/, }; @@ -9329,7 +9069,6 @@ const basic::ZoneInfo kZonePacific_Tahiti ACE_TIME_PROGMEM = { kZoneNamePacific_Tahiti /*name*/, 0xf24c2446 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Tahiti /*eras*/, }; @@ -9364,7 +9103,6 @@ const basic::ZoneInfo kZonePacific_Tarawa ACE_TIME_PROGMEM = { kZoneNamePacific_Tarawa /*name*/, 0xf2517e63 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Tarawa /*eras*/, }; @@ -9411,7 +9149,6 @@ const basic::ZoneInfo kZonePacific_Tongatapu ACE_TIME_PROGMEM = { kZoneNamePacific_Tongatapu /*name*/, 0x262ca836 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraPacific_Tongatapu /*eras*/, }; @@ -9446,7 +9183,6 @@ const basic::ZoneInfo kZonePacific_Wake ACE_TIME_PROGMEM = { kZoneNamePacific_Wake /*name*/, 0x23416c2b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Wake /*eras*/, }; @@ -9481,7 +9217,6 @@ const basic::ZoneInfo kZonePacific_Wallis ACE_TIME_PROGMEM = { kZoneNamePacific_Wallis /*name*/, 0xf94ddb0f /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Wallis /*eras*/, }; @@ -9516,7 +9251,6 @@ const basic::ZoneInfo kZoneWET ACE_TIME_PROGMEM = { kZoneNameWET /*name*/, 0x0b882e35 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraWET /*eras*/, }; diff --git a/src/ace_time/zonedb/zone_infos.h b/src/ace_time/zonedb/zone_infos.h index 9b1f0b91f..5b1100b97 100644 --- a/src/ace_time/zonedb/zone_infos.h +++ b/src/ace_time/zonedb/zone_infos.h @@ -775,6 +775,282 @@ extern const basic::ZoneInfo& kZoneZulu; // Zulu -> Etc/UTC +//--------------------------------------------------------------------------- +// Estimated size of the Transition buffer in ExtendedZoneProcessor for each +// zone. Used only in the tests/validation/Extended*Test tests for +// ExtendedZoneProcessor. This used to be included in the ZoneInfo data struct +// above, but it is used only for tests, so pulling them out to these constants +// means that they take up no permanent storage space. +//--------------------------------------------------------------------------- + +const uint8_t kZoneBufSizeAfrica_Abidjan = 2; // Africa/Abidjan +const uint8_t kZoneBufSizeAfrica_Algiers = 2; // Africa/Algiers +const uint8_t kZoneBufSizeAfrica_Bissau = 2; // Africa/Bissau +const uint8_t kZoneBufSizeAfrica_Ceuta = 5; // Africa/Ceuta +const uint8_t kZoneBufSizeAfrica_Johannesburg = 2; // Africa/Johannesburg +const uint8_t kZoneBufSizeAfrica_Lagos = 2; // Africa/Lagos +const uint8_t kZoneBufSizeAfrica_Maputo = 2; // Africa/Maputo +const uint8_t kZoneBufSizeAfrica_Monrovia = 2; // Africa/Monrovia +const uint8_t kZoneBufSizeAfrica_Nairobi = 2; // Africa/Nairobi +const uint8_t kZoneBufSizeAfrica_Ndjamena = 2; // Africa/Ndjamena +const uint8_t kZoneBufSizeAfrica_Tunis = 5; // Africa/Tunis +const uint8_t kZoneBufSizeAmerica_Adak = 6; // America/Adak +const uint8_t kZoneBufSizeAmerica_Anchorage = 6; // America/Anchorage +const uint8_t kZoneBufSizeAmerica_Asuncion = 5; // America/Asuncion +const uint8_t kZoneBufSizeAmerica_Atikokan = 2; // America/Atikokan +const uint8_t kZoneBufSizeAmerica_Barbados = 2; // America/Barbados +const uint8_t kZoneBufSizeAmerica_Belem = 2; // America/Belem +const uint8_t kZoneBufSizeAmerica_Blanc_Sablon = 2; // America/Blanc-Sablon +const uint8_t kZoneBufSizeAmerica_Bogota = 2; // America/Bogota +const uint8_t kZoneBufSizeAmerica_Boise = 6; // America/Boise +const uint8_t kZoneBufSizeAmerica_Campo_Grande = 6; // America/Campo_Grande +const uint8_t kZoneBufSizeAmerica_Cayenne = 2; // America/Cayenne +const uint8_t kZoneBufSizeAmerica_Chicago = 6; // America/Chicago +const uint8_t kZoneBufSizeAmerica_Chihuahua = 4; // America/Chihuahua +const uint8_t kZoneBufSizeAmerica_Costa_Rica = 2; // America/Costa_Rica +const uint8_t kZoneBufSizeAmerica_Creston = 2; // America/Creston +const uint8_t kZoneBufSizeAmerica_Curacao = 2; // America/Curacao +const uint8_t kZoneBufSizeAmerica_Danmarkshavn = 2; // America/Danmarkshavn +const uint8_t kZoneBufSizeAmerica_Dawson_Creek = 2; // America/Dawson_Creek +const uint8_t kZoneBufSizeAmerica_Denver = 6; // America/Denver +const uint8_t kZoneBufSizeAmerica_Detroit = 6; // America/Detroit +const uint8_t kZoneBufSizeAmerica_Edmonton = 6; // America/Edmonton +const uint8_t kZoneBufSizeAmerica_El_Salvador = 2; // America/El_Salvador +const uint8_t kZoneBufSizeAmerica_Glace_Bay = 6; // America/Glace_Bay +const uint8_t kZoneBufSizeAmerica_Guatemala = 4; // America/Guatemala +const uint8_t kZoneBufSizeAmerica_Guayaquil = 2; // America/Guayaquil +const uint8_t kZoneBufSizeAmerica_Guyana = 2; // America/Guyana +const uint8_t kZoneBufSizeAmerica_Halifax = 6; // America/Halifax +const uint8_t kZoneBufSizeAmerica_Havana = 6; // America/Havana +const uint8_t kZoneBufSizeAmerica_Hermosillo = 2; // America/Hermosillo +const uint8_t kZoneBufSizeAmerica_Indiana_Indianapolis = 6; // America/Indiana/Indianapolis +const uint8_t kZoneBufSizeAmerica_Indiana_Marengo = 6; // America/Indiana/Marengo +const uint8_t kZoneBufSizeAmerica_Indiana_Vevay = 6; // America/Indiana/Vevay +const uint8_t kZoneBufSizeAmerica_Inuvik = 6; // America/Inuvik +const uint8_t kZoneBufSizeAmerica_Jamaica = 2; // America/Jamaica +const uint8_t kZoneBufSizeAmerica_Juneau = 6; // America/Juneau +const uint8_t kZoneBufSizeAmerica_Kentucky_Louisville = 6; // America/Kentucky/Louisville +const uint8_t kZoneBufSizeAmerica_La_Paz = 2; // America/La_Paz +const uint8_t kZoneBufSizeAmerica_Lima = 2; // America/Lima +const uint8_t kZoneBufSizeAmerica_Los_Angeles = 6; // America/Los_Angeles +const uint8_t kZoneBufSizeAmerica_Managua = 4; // America/Managua +const uint8_t kZoneBufSizeAmerica_Manaus = 2; // America/Manaus +const uint8_t kZoneBufSizeAmerica_Martinique = 2; // America/Martinique +const uint8_t kZoneBufSizeAmerica_Matamoros = 6; // America/Matamoros +const uint8_t kZoneBufSizeAmerica_Mazatlan = 4; // America/Mazatlan +const uint8_t kZoneBufSizeAmerica_Menominee = 6; // America/Menominee +const uint8_t kZoneBufSizeAmerica_Merida = 4; // America/Merida +const uint8_t kZoneBufSizeAmerica_Miquelon = 6; // America/Miquelon +const uint8_t kZoneBufSizeAmerica_Moncton = 6; // America/Moncton +const uint8_t kZoneBufSizeAmerica_Monterrey = 4; // America/Monterrey +const uint8_t kZoneBufSizeAmerica_Montevideo = 5; // America/Montevideo +const uint8_t kZoneBufSizeAmerica_Nassau = 6; // America/Nassau +const uint8_t kZoneBufSizeAmerica_New_York = 6; // America/New_York +const uint8_t kZoneBufSizeAmerica_Nipigon = 6; // America/Nipigon +const uint8_t kZoneBufSizeAmerica_Nome = 6; // America/Nome +const uint8_t kZoneBufSizeAmerica_North_Dakota_Center = 6; // America/North_Dakota/Center +const uint8_t kZoneBufSizeAmerica_Nuuk = 5; // America/Nuuk +const uint8_t kZoneBufSizeAmerica_Ojinaga = 6; // America/Ojinaga +const uint8_t kZoneBufSizeAmerica_Panama = 2; // America/Panama +const uint8_t kZoneBufSizeAmerica_Paramaribo = 2; // America/Paramaribo +const uint8_t kZoneBufSizeAmerica_Phoenix = 2; // America/Phoenix +const uint8_t kZoneBufSizeAmerica_Port_au_Prince = 6; // America/Port-au-Prince +const uint8_t kZoneBufSizeAmerica_Port_of_Spain = 2; // America/Port_of_Spain +const uint8_t kZoneBufSizeAmerica_Porto_Velho = 2; // America/Porto_Velho +const uint8_t kZoneBufSizeAmerica_Puerto_Rico = 2; // America/Puerto_Rico +const uint8_t kZoneBufSizeAmerica_Rainy_River = 6; // America/Rainy_River +const uint8_t kZoneBufSizeAmerica_Regina = 2; // America/Regina +const uint8_t kZoneBufSizeAmerica_Santiago = 5; // America/Santiago +const uint8_t kZoneBufSizeAmerica_Sao_Paulo = 6; // America/Sao_Paulo +const uint8_t kZoneBufSizeAmerica_Scoresbysund = 5; // America/Scoresbysund +const uint8_t kZoneBufSizeAmerica_Sitka = 6; // America/Sitka +const uint8_t kZoneBufSizeAmerica_Swift_Current = 2; // America/Swift_Current +const uint8_t kZoneBufSizeAmerica_Tegucigalpa = 4; // America/Tegucigalpa +const uint8_t kZoneBufSizeAmerica_Thule = 6; // America/Thule +const uint8_t kZoneBufSizeAmerica_Thunder_Bay = 6; // America/Thunder_Bay +const uint8_t kZoneBufSizeAmerica_Toronto = 6; // America/Toronto +const uint8_t kZoneBufSizeAmerica_Vancouver = 6; // America/Vancouver +const uint8_t kZoneBufSizeAmerica_Winnipeg = 6; // America/Winnipeg +const uint8_t kZoneBufSizeAmerica_Yakutat = 6; // America/Yakutat +const uint8_t kZoneBufSizeAmerica_Yellowknife = 6; // America/Yellowknife +const uint8_t kZoneBufSizeAntarctica_DumontDUrville = 2; // Antarctica/DumontDUrville +const uint8_t kZoneBufSizeAntarctica_Rothera = 2; // Antarctica/Rothera +const uint8_t kZoneBufSizeAntarctica_Syowa = 2; // Antarctica/Syowa +const uint8_t kZoneBufSizeAntarctica_Vostok = 2; // Antarctica/Vostok +const uint8_t kZoneBufSizeAsia_Amman = 6; // Asia/Amman +const uint8_t kZoneBufSizeAsia_Ashgabat = 2; // Asia/Ashgabat +const uint8_t kZoneBufSizeAsia_Baghdad = 4; // Asia/Baghdad +const uint8_t kZoneBufSizeAsia_Baku = 5; // Asia/Baku +const uint8_t kZoneBufSizeAsia_Bangkok = 2; // Asia/Bangkok +const uint8_t kZoneBufSizeAsia_Beirut = 5; // Asia/Beirut +const uint8_t kZoneBufSizeAsia_Brunei = 2; // Asia/Brunei +const uint8_t kZoneBufSizeAsia_Damascus = 6; // Asia/Damascus +const uint8_t kZoneBufSizeAsia_Dhaka = 5; // Asia/Dhaka +const uint8_t kZoneBufSizeAsia_Dubai = 2; // Asia/Dubai +const uint8_t kZoneBufSizeAsia_Dushanbe = 2; // Asia/Dushanbe +const uint8_t kZoneBufSizeAsia_Ho_Chi_Minh = 2; // Asia/Ho_Chi_Minh +const uint8_t kZoneBufSizeAsia_Hong_Kong = 2; // Asia/Hong_Kong +const uint8_t kZoneBufSizeAsia_Hovd = 5; // Asia/Hovd +const uint8_t kZoneBufSizeAsia_Jakarta = 2; // Asia/Jakarta +const uint8_t kZoneBufSizeAsia_Jayapura = 2; // Asia/Jayapura +const uint8_t kZoneBufSizeAsia_Jerusalem = 5; // Asia/Jerusalem +const uint8_t kZoneBufSizeAsia_Kabul = 2; // Asia/Kabul +const uint8_t kZoneBufSizeAsia_Karachi = 5; // Asia/Karachi +const uint8_t kZoneBufSizeAsia_Kathmandu = 2; // Asia/Kathmandu +const uint8_t kZoneBufSizeAsia_Kolkata = 2; // Asia/Kolkata +const uint8_t kZoneBufSizeAsia_Kuala_Lumpur = 2; // Asia/Kuala_Lumpur +const uint8_t kZoneBufSizeAsia_Kuching = 2; // Asia/Kuching +const uint8_t kZoneBufSizeAsia_Macau = 2; // Asia/Macau +const uint8_t kZoneBufSizeAsia_Makassar = 2; // Asia/Makassar +const uint8_t kZoneBufSizeAsia_Manila = 2; // Asia/Manila +const uint8_t kZoneBufSizeAsia_Nicosia = 5; // Asia/Nicosia +const uint8_t kZoneBufSizeAsia_Pontianak = 2; // Asia/Pontianak +const uint8_t kZoneBufSizeAsia_Qatar = 2; // Asia/Qatar +const uint8_t kZoneBufSizeAsia_Riyadh = 2; // Asia/Riyadh +const uint8_t kZoneBufSizeAsia_Samarkand = 2; // Asia/Samarkand +const uint8_t kZoneBufSizeAsia_Seoul = 2; // Asia/Seoul +const uint8_t kZoneBufSizeAsia_Shanghai = 2; // Asia/Shanghai +const uint8_t kZoneBufSizeAsia_Singapore = 2; // Asia/Singapore +const uint8_t kZoneBufSizeAsia_Taipei = 2; // Asia/Taipei +const uint8_t kZoneBufSizeAsia_Tashkent = 2; // Asia/Tashkent +const uint8_t kZoneBufSizeAsia_Tehran = 5; // Asia/Tehran +const uint8_t kZoneBufSizeAsia_Thimphu = 2; // Asia/Thimphu +const uint8_t kZoneBufSizeAsia_Tokyo = 2; // Asia/Tokyo +const uint8_t kZoneBufSizeAsia_Ulaanbaatar = 5; // Asia/Ulaanbaatar +const uint8_t kZoneBufSizeAsia_Urumqi = 2; // Asia/Urumqi +const uint8_t kZoneBufSizeAsia_Yangon = 2; // Asia/Yangon +const uint8_t kZoneBufSizeAsia_Yerevan = 6; // Asia/Yerevan +const uint8_t kZoneBufSizeAtlantic_Azores = 5; // Atlantic/Azores +const uint8_t kZoneBufSizeAtlantic_Bermuda = 6; // Atlantic/Bermuda +const uint8_t kZoneBufSizeAtlantic_Canary = 5; // Atlantic/Canary +const uint8_t kZoneBufSizeAtlantic_Cape_Verde = 2; // Atlantic/Cape_Verde +const uint8_t kZoneBufSizeAtlantic_Faroe = 5; // Atlantic/Faroe +const uint8_t kZoneBufSizeAtlantic_Madeira = 5; // Atlantic/Madeira +const uint8_t kZoneBufSizeAtlantic_Reykjavik = 2; // Atlantic/Reykjavik +const uint8_t kZoneBufSizeAtlantic_South_Georgia = 2; // Atlantic/South_Georgia +const uint8_t kZoneBufSizeAustralia_Adelaide = 5; // Australia/Adelaide +const uint8_t kZoneBufSizeAustralia_Brisbane = 2; // Australia/Brisbane +const uint8_t kZoneBufSizeAustralia_Broken_Hill = 6; // Australia/Broken_Hill +const uint8_t kZoneBufSizeAustralia_Darwin = 2; // Australia/Darwin +const uint8_t kZoneBufSizeAustralia_Eucla = 6; // Australia/Eucla +const uint8_t kZoneBufSizeAustralia_Hobart = 5; // Australia/Hobart +const uint8_t kZoneBufSizeAustralia_Lindeman = 2; // Australia/Lindeman +const uint8_t kZoneBufSizeAustralia_Lord_Howe = 5; // Australia/Lord_Howe +const uint8_t kZoneBufSizeAustralia_Melbourne = 5; // Australia/Melbourne +const uint8_t kZoneBufSizeAustralia_Perth = 6; // Australia/Perth +const uint8_t kZoneBufSizeAustralia_Sydney = 5; // Australia/Sydney +const uint8_t kZoneBufSizeCET = 5; // CET +const uint8_t kZoneBufSizeCST6CDT = 6; // CST6CDT +const uint8_t kZoneBufSizeEET = 5; // EET +const uint8_t kZoneBufSizeEST = 2; // EST +const uint8_t kZoneBufSizeEST5EDT = 6; // EST5EDT +const uint8_t kZoneBufSizeEtc_GMT = 2; // Etc/GMT +const uint8_t kZoneBufSizeEtc_GMT_PLUS_1 = 2; // Etc/GMT+1 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_10 = 2; // Etc/GMT+10 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_11 = 2; // Etc/GMT+11 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_12 = 2; // Etc/GMT+12 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_2 = 2; // Etc/GMT+2 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_3 = 2; // Etc/GMT+3 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_4 = 2; // Etc/GMT+4 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_5 = 2; // Etc/GMT+5 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_6 = 2; // Etc/GMT+6 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_7 = 2; // Etc/GMT+7 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_8 = 2; // Etc/GMT+8 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_9 = 2; // Etc/GMT+9 +const uint8_t kZoneBufSizeEtc_GMT_1 = 2; // Etc/GMT-1 +const uint8_t kZoneBufSizeEtc_GMT_10 = 2; // Etc/GMT-10 +const uint8_t kZoneBufSizeEtc_GMT_11 = 2; // Etc/GMT-11 +const uint8_t kZoneBufSizeEtc_GMT_12 = 2; // Etc/GMT-12 +const uint8_t kZoneBufSizeEtc_GMT_13 = 2; // Etc/GMT-13 +const uint8_t kZoneBufSizeEtc_GMT_14 = 2; // Etc/GMT-14 +const uint8_t kZoneBufSizeEtc_GMT_2 = 2; // Etc/GMT-2 +const uint8_t kZoneBufSizeEtc_GMT_3 = 2; // Etc/GMT-3 +const uint8_t kZoneBufSizeEtc_GMT_4 = 2; // Etc/GMT-4 +const uint8_t kZoneBufSizeEtc_GMT_5 = 2; // Etc/GMT-5 +const uint8_t kZoneBufSizeEtc_GMT_6 = 2; // Etc/GMT-6 +const uint8_t kZoneBufSizeEtc_GMT_7 = 2; // Etc/GMT-7 +const uint8_t kZoneBufSizeEtc_GMT_8 = 2; // Etc/GMT-8 +const uint8_t kZoneBufSizeEtc_GMT_9 = 2; // Etc/GMT-9 +const uint8_t kZoneBufSizeEtc_UTC = 2; // Etc/UTC +const uint8_t kZoneBufSizeEurope_Amsterdam = 5; // Europe/Amsterdam +const uint8_t kZoneBufSizeEurope_Andorra = 5; // Europe/Andorra +const uint8_t kZoneBufSizeEurope_Athens = 5; // Europe/Athens +const uint8_t kZoneBufSizeEurope_Belgrade = 5; // Europe/Belgrade +const uint8_t kZoneBufSizeEurope_Berlin = 5; // Europe/Berlin +const uint8_t kZoneBufSizeEurope_Brussels = 5; // Europe/Brussels +const uint8_t kZoneBufSizeEurope_Bucharest = 5; // Europe/Bucharest +const uint8_t kZoneBufSizeEurope_Budapest = 5; // Europe/Budapest +const uint8_t kZoneBufSizeEurope_Chisinau = 5; // Europe/Chisinau +const uint8_t kZoneBufSizeEurope_Copenhagen = 5; // Europe/Copenhagen +const uint8_t kZoneBufSizeEurope_Dublin = 5; // Europe/Dublin +const uint8_t kZoneBufSizeEurope_Gibraltar = 5; // Europe/Gibraltar +const uint8_t kZoneBufSizeEurope_Helsinki = 5; // Europe/Helsinki +const uint8_t kZoneBufSizeEurope_Kiev = 5; // Europe/Kiev +const uint8_t kZoneBufSizeEurope_Lisbon = 5; // Europe/Lisbon +const uint8_t kZoneBufSizeEurope_London = 5; // Europe/London +const uint8_t kZoneBufSizeEurope_Luxembourg = 5; // Europe/Luxembourg +const uint8_t kZoneBufSizeEurope_Madrid = 5; // Europe/Madrid +const uint8_t kZoneBufSizeEurope_Malta = 5; // Europe/Malta +const uint8_t kZoneBufSizeEurope_Monaco = 5; // Europe/Monaco +const uint8_t kZoneBufSizeEurope_Oslo = 5; // Europe/Oslo +const uint8_t kZoneBufSizeEurope_Paris = 5; // Europe/Paris +const uint8_t kZoneBufSizeEurope_Prague = 5; // Europe/Prague +const uint8_t kZoneBufSizeEurope_Rome = 5; // Europe/Rome +const uint8_t kZoneBufSizeEurope_Sofia = 5; // Europe/Sofia +const uint8_t kZoneBufSizeEurope_Stockholm = 5; // Europe/Stockholm +const uint8_t kZoneBufSizeEurope_Tirane = 5; // Europe/Tirane +const uint8_t kZoneBufSizeEurope_Uzhgorod = 5; // Europe/Uzhgorod +const uint8_t kZoneBufSizeEurope_Vienna = 5; // Europe/Vienna +const uint8_t kZoneBufSizeEurope_Warsaw = 5; // Europe/Warsaw +const uint8_t kZoneBufSizeEurope_Zaporozhye = 5; // Europe/Zaporozhye +const uint8_t kZoneBufSizeEurope_Zurich = 5; // Europe/Zurich +const uint8_t kZoneBufSizeHST = 2; // HST +const uint8_t kZoneBufSizeIndian_Chagos = 2; // Indian/Chagos +const uint8_t kZoneBufSizeIndian_Christmas = 2; // Indian/Christmas +const uint8_t kZoneBufSizeIndian_Cocos = 2; // Indian/Cocos +const uint8_t kZoneBufSizeIndian_Kerguelen = 2; // Indian/Kerguelen +const uint8_t kZoneBufSizeIndian_Mahe = 2; // Indian/Mahe +const uint8_t kZoneBufSizeIndian_Maldives = 2; // Indian/Maldives +const uint8_t kZoneBufSizeIndian_Mauritius = 4; // Indian/Mauritius +const uint8_t kZoneBufSizeIndian_Reunion = 2; // Indian/Reunion +const uint8_t kZoneBufSizeMET = 5; // MET +const uint8_t kZoneBufSizeMST = 2; // MST +const uint8_t kZoneBufSizeMST7MDT = 6; // MST7MDT +const uint8_t kZoneBufSizePST8PDT = 6; // PST8PDT +const uint8_t kZoneBufSizePacific_Auckland = 5; // Pacific/Auckland +const uint8_t kZoneBufSizePacific_Chatham = 5; // Pacific/Chatham +const uint8_t kZoneBufSizePacific_Chuuk = 2; // Pacific/Chuuk +const uint8_t kZoneBufSizePacific_Easter = 5; // Pacific/Easter +const uint8_t kZoneBufSizePacific_Efate = 2; // Pacific/Efate +const uint8_t kZoneBufSizePacific_Enderbury = 2; // Pacific/Enderbury +const uint8_t kZoneBufSizePacific_Fiji = 6; // Pacific/Fiji +const uint8_t kZoneBufSizePacific_Funafuti = 2; // Pacific/Funafuti +const uint8_t kZoneBufSizePacific_Galapagos = 2; // Pacific/Galapagos +const uint8_t kZoneBufSizePacific_Gambier = 2; // Pacific/Gambier +const uint8_t kZoneBufSizePacific_Guadalcanal = 2; // Pacific/Guadalcanal +const uint8_t kZoneBufSizePacific_Honolulu = 2; // Pacific/Honolulu +const uint8_t kZoneBufSizePacific_Kiritimati = 2; // Pacific/Kiritimati +const uint8_t kZoneBufSizePacific_Kosrae = 2; // Pacific/Kosrae +const uint8_t kZoneBufSizePacific_Kwajalein = 2; // Pacific/Kwajalein +const uint8_t kZoneBufSizePacific_Majuro = 2; // Pacific/Majuro +const uint8_t kZoneBufSizePacific_Marquesas = 2; // Pacific/Marquesas +const uint8_t kZoneBufSizePacific_Nauru = 2; // Pacific/Nauru +const uint8_t kZoneBufSizePacific_Niue = 2; // Pacific/Niue +const uint8_t kZoneBufSizePacific_Noumea = 2; // Pacific/Noumea +const uint8_t kZoneBufSizePacific_Pago_Pago = 2; // Pacific/Pago_Pago +const uint8_t kZoneBufSizePacific_Palau = 2; // Pacific/Palau +const uint8_t kZoneBufSizePacific_Pitcairn = 2; // Pacific/Pitcairn +const uint8_t kZoneBufSizePacific_Pohnpei = 2; // Pacific/Pohnpei +const uint8_t kZoneBufSizePacific_Port_Moresby = 2; // Pacific/Port_Moresby +const uint8_t kZoneBufSizePacific_Rarotonga = 2; // Pacific/Rarotonga +const uint8_t kZoneBufSizePacific_Tahiti = 2; // Pacific/Tahiti +const uint8_t kZoneBufSizePacific_Tarawa = 2; // Pacific/Tarawa +const uint8_t kZoneBufSizePacific_Tongatapu = 6; // Pacific/Tongatapu +const uint8_t kZoneBufSizePacific_Wake = 2; // Pacific/Wake +const uint8_t kZoneBufSizePacific_Wallis = 2; // Pacific/Wallis +const uint8_t kZoneBufSizeWET = 5; // WET + + //--------------------------------------------------------------------------- // Unsupported zones: 120 //--------------------------------------------------------------------------- diff --git a/src/ace_time/zonedbx/zone_infos.cpp b/src/ace_time/zonedbx/zone_infos.cpp index dbe31e1ce..bdec4cf2a 100644 --- a/src/ace_time/zonedbx/zone_infos.cpp +++ b/src/ace_time/zonedbx/zone_infos.cpp @@ -85,7 +85,6 @@ const extended::ZoneInfo kZoneAfrica_Abidjan ACE_TIME_PROGMEM = { kZoneNameAfrica_Abidjan /*name*/, 0xc21305a3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Abidjan /*eras*/, }; @@ -120,7 +119,6 @@ const extended::ZoneInfo kZoneAfrica_Accra ACE_TIME_PROGMEM = { kZoneNameAfrica_Accra /*name*/, 0x77d5b054 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Accra /*eras*/, }; @@ -155,7 +153,6 @@ const extended::ZoneInfo kZoneAfrica_Algiers ACE_TIME_PROGMEM = { kZoneNameAfrica_Algiers /*name*/, 0xd94515c1 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Algiers /*eras*/, }; @@ -190,7 +187,6 @@ const extended::ZoneInfo kZoneAfrica_Bissau ACE_TIME_PROGMEM = { kZoneNameAfrica_Bissau /*name*/, 0x75564141 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Bissau /*eras*/, }; @@ -225,7 +221,6 @@ const extended::ZoneInfo kZoneAfrica_Cairo ACE_TIME_PROGMEM = { kZoneNameAfrica_Cairo /*name*/, 0x77f8e228 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Cairo /*eras*/, }; @@ -272,7 +267,6 @@ const extended::ZoneInfo kZoneAfrica_Casablanca ACE_TIME_PROGMEM = { kZoneNameAfrica_Casablanca /*name*/, 0xc59f1b33 /*zoneId*/, &kZoneContext /*zoneContext*/, - 7 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAfrica_Casablanca /*eras*/, }; @@ -307,7 +301,6 @@ const extended::ZoneInfo kZoneAfrica_Ceuta ACE_TIME_PROGMEM = { kZoneNameAfrica_Ceuta /*name*/, 0x77fb46ec /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Ceuta /*eras*/, }; @@ -354,7 +347,6 @@ const extended::ZoneInfo kZoneAfrica_El_Aaiun ACE_TIME_PROGMEM = { kZoneNameAfrica_El_Aaiun /*name*/, 0x9d6fb118 /*zoneId*/, &kZoneContext /*zoneContext*/, - 7 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAfrica_El_Aaiun /*eras*/, }; @@ -389,7 +381,6 @@ const extended::ZoneInfo kZoneAfrica_Johannesburg ACE_TIME_PROGMEM = { kZoneNameAfrica_Johannesburg /*name*/, 0xd5d157a0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Johannesburg /*eras*/, }; @@ -436,7 +427,6 @@ const extended::ZoneInfo kZoneAfrica_Juba ACE_TIME_PROGMEM = { kZoneNameAfrica_Juba /*name*/, 0xd51b395c /*zoneId*/, &kZoneContext /*zoneContext*/, - 3 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAfrica_Juba /*eras*/, }; @@ -495,7 +485,6 @@ const extended::ZoneInfo kZoneAfrica_Khartoum ACE_TIME_PROGMEM = { kZoneNameAfrica_Khartoum /*name*/, 0xfb3d4205 /*zoneId*/, &kZoneContext /*zoneContext*/, - 3 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAfrica_Khartoum /*eras*/, }; @@ -530,7 +519,6 @@ const extended::ZoneInfo kZoneAfrica_Lagos ACE_TIME_PROGMEM = { kZoneNameAfrica_Lagos /*name*/, 0x789bb5d0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Lagos /*eras*/, }; @@ -565,7 +553,6 @@ const extended::ZoneInfo kZoneAfrica_Maputo ACE_TIME_PROGMEM = { kZoneNameAfrica_Maputo /*name*/, 0x8e6ca1f0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Maputo /*eras*/, }; @@ -600,7 +587,6 @@ const extended::ZoneInfo kZoneAfrica_Monrovia ACE_TIME_PROGMEM = { kZoneNameAfrica_Monrovia /*name*/, 0x0ce90385 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Monrovia /*eras*/, }; @@ -635,7 +621,6 @@ const extended::ZoneInfo kZoneAfrica_Nairobi ACE_TIME_PROGMEM = { kZoneNameAfrica_Nairobi /*name*/, 0xa87ab57e /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Nairobi /*eras*/, }; @@ -670,7 +655,6 @@ const extended::ZoneInfo kZoneAfrica_Ndjamena ACE_TIME_PROGMEM = { kZoneNameAfrica_Ndjamena /*name*/, 0x9fe09898 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Ndjamena /*eras*/, }; @@ -729,7 +713,6 @@ const extended::ZoneInfo kZoneAfrica_Sao_Tome ACE_TIME_PROGMEM = { kZoneNameAfrica_Sao_Tome /*name*/, 0x61b319d1 /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAfrica_Sao_Tome /*eras*/, }; @@ -788,7 +771,6 @@ const extended::ZoneInfo kZoneAfrica_Tripoli ACE_TIME_PROGMEM = { kZoneNameAfrica_Tripoli /*name*/, 0x9dfebd3d /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAfrica_Tripoli /*eras*/, }; @@ -823,7 +805,6 @@ const extended::ZoneInfo kZoneAfrica_Tunis ACE_TIME_PROGMEM = { kZoneNameAfrica_Tunis /*name*/, 0x79378e6d /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Tunis /*eras*/, }; @@ -858,7 +839,6 @@ const extended::ZoneInfo kZoneAfrica_Windhoek ACE_TIME_PROGMEM = { kZoneNameAfrica_Windhoek /*name*/, 0x789c9bd3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAfrica_Windhoek /*eras*/, }; @@ -893,7 +873,6 @@ const extended::ZoneInfo kZoneAmerica_Adak ACE_TIME_PROGMEM = { kZoneNameAmerica_Adak /*name*/, 0x97fe49d7 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Adak /*eras*/, }; @@ -928,7 +907,6 @@ const extended::ZoneInfo kZoneAmerica_Anchorage ACE_TIME_PROGMEM = { kZoneNameAmerica_Anchorage /*name*/, 0x5a79260e /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Anchorage /*eras*/, }; @@ -999,7 +977,6 @@ const extended::ZoneInfo kZoneAmerica_Araguaina ACE_TIME_PROGMEM = { kZoneNameAmerica_Araguaina /*name*/, 0x6f9a3aef /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 4 /*numEras*/, kZoneEraAmerica_Araguaina /*eras*/, }; @@ -1058,7 +1035,6 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Buenos_Aires ACE_TIME_PROGMEM = kZoneNameAmerica_Argentina_Buenos_Aires /*name*/, 0xd43b4c0d /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Argentina_Buenos_Aires /*eras*/, }; @@ -1153,7 +1129,6 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Catamarca ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Catamarca /*name*/, 0x8d40986b /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 6 /*numEras*/, kZoneEraAmerica_Argentina_Catamarca /*eras*/, }; @@ -1212,7 +1187,6 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Cordoba ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Cordoba /*name*/, 0xbfccc308 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Argentina_Cordoba /*eras*/, }; @@ -1283,7 +1257,6 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Jujuy ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Jujuy /*name*/, 0x5f2f46c5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 4 /*numEras*/, kZoneEraAmerica_Argentina_Jujuy /*eras*/, }; @@ -1378,7 +1351,6 @@ const extended::ZoneInfo kZoneAmerica_Argentina_La_Rioja ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_La_Rioja /*name*/, 0xa46b7eef /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 6 /*numEras*/, kZoneEraAmerica_Argentina_La_Rioja /*eras*/, }; @@ -1473,7 +1445,6 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Mendoza ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Mendoza /*name*/, 0xa9f72d5c /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 6 /*numEras*/, kZoneEraAmerica_Argentina_Mendoza /*eras*/, }; @@ -1568,7 +1539,6 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Rio_Gallegos ACE_TIME_PROGMEM = kZoneNameAmerica_Argentina_Rio_Gallegos /*name*/, 0xc5b0f565 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 6 /*numEras*/, kZoneEraAmerica_Argentina_Rio_Gallegos /*eras*/, }; @@ -1639,7 +1609,6 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Salta ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Salta /*name*/, 0x5fc73403 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 4 /*numEras*/, kZoneEraAmerica_Argentina_Salta /*eras*/, }; @@ -1734,7 +1703,6 @@ const extended::ZoneInfo kZoneAmerica_Argentina_San_Juan ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_San_Juan /*name*/, 0x3e1009bd /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 6 /*numEras*/, kZoneEraAmerica_Argentina_San_Juan /*eras*/, }; @@ -1841,7 +1809,6 @@ const extended::ZoneInfo kZoneAmerica_Argentina_San_Luis ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_San_Luis /*name*/, 0x3e11238c /*zoneId*/, &kZoneContext /*zoneContext*/, - 7 /*transitionBufSize*/, 7 /*numEras*/, kZoneEraAmerica_Argentina_San_Luis /*eras*/, }; @@ -1924,7 +1891,6 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Tucuman ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Tucuman /*name*/, 0xe96399eb /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 5 /*numEras*/, kZoneEraAmerica_Argentina_Tucuman /*eras*/, }; @@ -2019,7 +1985,6 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Ushuaia ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Ushuaia /*name*/, 0x320dcdde /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 6 /*numEras*/, kZoneEraAmerica_Argentina_Ushuaia /*eras*/, }; @@ -2054,7 +2019,6 @@ const extended::ZoneInfo kZoneAmerica_Asuncion ACE_TIME_PROGMEM = { kZoneNameAmerica_Asuncion /*name*/, 0x50ec79a6 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Asuncion /*eras*/, }; @@ -2089,7 +2053,6 @@ const extended::ZoneInfo kZoneAmerica_Atikokan ACE_TIME_PROGMEM = { kZoneNameAmerica_Atikokan /*name*/, 0x81b92098 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Atikokan /*eras*/, }; @@ -2160,7 +2123,6 @@ const extended::ZoneInfo kZoneAmerica_Bahia ACE_TIME_PROGMEM = { kZoneNameAmerica_Bahia /*name*/, 0x97d815fb /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 4 /*numEras*/, kZoneEraAmerica_Bahia /*eras*/, }; @@ -2207,7 +2169,6 @@ const extended::ZoneInfo kZoneAmerica_Bahia_Banderas ACE_TIME_PROGMEM = { kZoneNameAmerica_Bahia_Banderas /*name*/, 0x14f6329a /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Bahia_Banderas /*eras*/, }; @@ -2242,7 +2203,6 @@ const extended::ZoneInfo kZoneAmerica_Barbados ACE_TIME_PROGMEM = { kZoneNameAmerica_Barbados /*name*/, 0xcbbc3b04 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Barbados /*eras*/, }; @@ -2277,7 +2237,6 @@ const extended::ZoneInfo kZoneAmerica_Belem ACE_TIME_PROGMEM = { kZoneNameAmerica_Belem /*name*/, 0x97da580b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Belem /*eras*/, }; @@ -2312,7 +2271,6 @@ const extended::ZoneInfo kZoneAmerica_Belize ACE_TIME_PROGMEM = { kZoneNameAmerica_Belize /*name*/, 0x93256c81 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Belize /*eras*/, }; @@ -2347,7 +2305,6 @@ const extended::ZoneInfo kZoneAmerica_Blanc_Sablon ACE_TIME_PROGMEM = { kZoneNameAmerica_Blanc_Sablon /*name*/, 0x6e299892 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Blanc_Sablon /*eras*/, }; @@ -2406,7 +2363,6 @@ const extended::ZoneInfo kZoneAmerica_Boa_Vista ACE_TIME_PROGMEM = { kZoneNameAmerica_Boa_Vista /*name*/, 0x0a7b7efe /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Boa_Vista /*eras*/, }; @@ -2441,7 +2397,6 @@ const extended::ZoneInfo kZoneAmerica_Bogota ACE_TIME_PROGMEM = { kZoneNameAmerica_Bogota /*name*/, 0x93d7bc62 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Bogota /*eras*/, }; @@ -2476,7 +2431,6 @@ const extended::ZoneInfo kZoneAmerica_Boise ACE_TIME_PROGMEM = { kZoneNameAmerica_Boise /*name*/, 0x97dfc8d8 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Boise /*eras*/, }; @@ -2559,7 +2513,6 @@ const extended::ZoneInfo kZoneAmerica_Cambridge_Bay ACE_TIME_PROGMEM = { kZoneNameAmerica_Cambridge_Bay /*name*/, 0xd5a44aff /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 5 /*numEras*/, kZoneEraAmerica_Cambridge_Bay /*eras*/, }; @@ -2594,7 +2547,6 @@ const extended::ZoneInfo kZoneAmerica_Campo_Grande ACE_TIME_PROGMEM = { kZoneNameAmerica_Campo_Grande /*name*/, 0xfec3e7a6 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Campo_Grande /*eras*/, }; @@ -2641,7 +2593,6 @@ const extended::ZoneInfo kZoneAmerica_Cancun ACE_TIME_PROGMEM = { kZoneNameAmerica_Cancun /*name*/, 0x953331be /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Cancun /*eras*/, }; @@ -2700,7 +2651,6 @@ const extended::ZoneInfo kZoneAmerica_Caracas ACE_TIME_PROGMEM = { kZoneNameAmerica_Caracas /*name*/, 0x3be064f4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 3 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Caracas /*eras*/, }; @@ -2735,7 +2685,6 @@ const extended::ZoneInfo kZoneAmerica_Cayenne ACE_TIME_PROGMEM = { kZoneNameAmerica_Cayenne /*name*/, 0x3c617269 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Cayenne /*eras*/, }; @@ -2770,7 +2719,6 @@ const extended::ZoneInfo kZoneAmerica_Chicago ACE_TIME_PROGMEM = { kZoneNameAmerica_Chicago /*name*/, 0x4b92b5d4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Chicago /*eras*/, }; @@ -2805,7 +2753,6 @@ const extended::ZoneInfo kZoneAmerica_Chihuahua ACE_TIME_PROGMEM = { kZoneNameAmerica_Chihuahua /*name*/, 0x8827d776 /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Chihuahua /*eras*/, }; @@ -2840,7 +2787,6 @@ const extended::ZoneInfo kZoneAmerica_Costa_Rica ACE_TIME_PROGMEM = { kZoneNameAmerica_Costa_Rica /*name*/, 0x63ff66be /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Costa_Rica /*eras*/, }; @@ -2875,7 +2821,6 @@ const extended::ZoneInfo kZoneAmerica_Creston ACE_TIME_PROGMEM = { kZoneNameAmerica_Creston /*name*/, 0x62a70204 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Creston /*eras*/, }; @@ -2934,7 +2879,6 @@ const extended::ZoneInfo kZoneAmerica_Cuiaba ACE_TIME_PROGMEM = { kZoneNameAmerica_Cuiaba /*name*/, 0x969a52eb /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Cuiaba /*eras*/, }; @@ -2969,7 +2913,6 @@ const extended::ZoneInfo kZoneAmerica_Curacao ACE_TIME_PROGMEM = { kZoneNameAmerica_Curacao /*name*/, 0x6a879184 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Curacao /*eras*/, }; @@ -3004,7 +2947,6 @@ const extended::ZoneInfo kZoneAmerica_Danmarkshavn ACE_TIME_PROGMEM = { kZoneNameAmerica_Danmarkshavn /*name*/, 0xf554d204 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Danmarkshavn /*eras*/, }; @@ -3051,7 +2993,6 @@ const extended::ZoneInfo kZoneAmerica_Dawson ACE_TIME_PROGMEM = { kZoneNameAmerica_Dawson /*name*/, 0x978d8d12 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Dawson /*eras*/, }; @@ -3086,7 +3027,6 @@ const extended::ZoneInfo kZoneAmerica_Dawson_Creek ACE_TIME_PROGMEM = { kZoneNameAmerica_Dawson_Creek /*name*/, 0x6cf24e5b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Dawson_Creek /*eras*/, }; @@ -3121,7 +3061,6 @@ const extended::ZoneInfo kZoneAmerica_Denver ACE_TIME_PROGMEM = { kZoneNameAmerica_Denver /*name*/, 0x97d10b2a /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Denver /*eras*/, }; @@ -3156,7 +3095,6 @@ const extended::ZoneInfo kZoneAmerica_Detroit ACE_TIME_PROGMEM = { kZoneNameAmerica_Detroit /*name*/, 0x925cfbc1 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Detroit /*eras*/, }; @@ -3191,7 +3129,6 @@ const extended::ZoneInfo kZoneAmerica_Edmonton ACE_TIME_PROGMEM = { kZoneNameAmerica_Edmonton /*name*/, 0x6cb9484a /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Edmonton /*eras*/, }; @@ -3250,7 +3187,6 @@ const extended::ZoneInfo kZoneAmerica_Eirunepe ACE_TIME_PROGMEM = { kZoneNameAmerica_Eirunepe /*name*/, 0xf9b29683 /*zoneId*/, &kZoneContext /*zoneContext*/, - 3 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Eirunepe /*eras*/, }; @@ -3285,7 +3221,6 @@ const extended::ZoneInfo kZoneAmerica_El_Salvador ACE_TIME_PROGMEM = { kZoneNameAmerica_El_Salvador /*name*/, 0x752ad652 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_El_Salvador /*eras*/, }; @@ -3332,7 +3267,6 @@ const extended::ZoneInfo kZoneAmerica_Fort_Nelson ACE_TIME_PROGMEM = { kZoneNameAmerica_Fort_Nelson /*name*/, 0x3f437e0f /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Fort_Nelson /*eras*/, }; @@ -3415,7 +3349,6 @@ const extended::ZoneInfo kZoneAmerica_Fortaleza ACE_TIME_PROGMEM = { kZoneNameAmerica_Fortaleza /*name*/, 0x2ad018ee /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 5 /*numEras*/, kZoneEraAmerica_Fortaleza /*eras*/, }; @@ -3450,7 +3383,6 @@ const extended::ZoneInfo kZoneAmerica_Glace_Bay ACE_TIME_PROGMEM = { kZoneNameAmerica_Glace_Bay /*name*/, 0x9681f8dd /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Glace_Bay /*eras*/, }; @@ -3497,7 +3429,6 @@ const extended::ZoneInfo kZoneAmerica_Goose_Bay ACE_TIME_PROGMEM = { kZoneNameAmerica_Goose_Bay /*name*/, 0xb649541e /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Goose_Bay /*eras*/, }; @@ -3556,7 +3487,6 @@ const extended::ZoneInfo kZoneAmerica_Grand_Turk ACE_TIME_PROGMEM = { kZoneNameAmerica_Grand_Turk /*name*/, 0x6e216197 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Grand_Turk /*eras*/, }; @@ -3591,7 +3521,6 @@ const extended::ZoneInfo kZoneAmerica_Guatemala ACE_TIME_PROGMEM = { kZoneNameAmerica_Guatemala /*name*/, 0x0c8259f7 /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Guatemala /*eras*/, }; @@ -3626,7 +3555,6 @@ const extended::ZoneInfo kZoneAmerica_Guayaquil ACE_TIME_PROGMEM = { kZoneNameAmerica_Guayaquil /*name*/, 0x17e64958 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Guayaquil /*eras*/, }; @@ -3661,7 +3589,6 @@ const extended::ZoneInfo kZoneAmerica_Guyana ACE_TIME_PROGMEM = { kZoneNameAmerica_Guyana /*name*/, 0x9ff7bd0b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Guyana /*eras*/, }; @@ -3696,7 +3623,6 @@ const extended::ZoneInfo kZoneAmerica_Halifax ACE_TIME_PROGMEM = { kZoneNameAmerica_Halifax /*name*/, 0xbc5b7183 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Halifax /*eras*/, }; @@ -3731,7 +3657,6 @@ const extended::ZoneInfo kZoneAmerica_Havana ACE_TIME_PROGMEM = { kZoneNameAmerica_Havana /*name*/, 0xa0e15675 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Havana /*eras*/, }; @@ -3778,7 +3703,6 @@ const extended::ZoneInfo kZoneAmerica_Hermosillo ACE_TIME_PROGMEM = { kZoneNameAmerica_Hermosillo /*name*/, 0x065d21c4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Hermosillo /*eras*/, }; @@ -3825,7 +3749,6 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Indianapolis ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Indianapolis /*name*/, 0x28a669a4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Indiana_Indianapolis /*eras*/, }; @@ -3872,7 +3795,6 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Knox ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Knox /*name*/, 0x6554adc9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Indiana_Knox /*eras*/, }; @@ -3919,7 +3841,6 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Marengo ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Marengo /*name*/, 0x2feeee72 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Indiana_Marengo /*eras*/, }; @@ -3978,7 +3899,6 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Petersburg ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Petersburg /*name*/, 0x94ac7acc /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Indiana_Petersburg /*eras*/, }; @@ -4025,7 +3945,6 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Tell_City ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Tell_City /*name*/, 0x09263612 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Indiana_Tell_City /*eras*/, }; @@ -4072,7 +3991,6 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Vevay ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Vevay /*name*/, 0x10aca054 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Indiana_Vevay /*eras*/, }; @@ -4131,7 +4049,6 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Vincennes ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Vincennes /*name*/, 0x28a0b212 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Indiana_Vincennes /*eras*/, }; @@ -4190,7 +4107,6 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Winamac ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Winamac /*name*/, 0x4413fa69 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Indiana_Winamac /*eras*/, }; @@ -4225,7 +4141,6 @@ const extended::ZoneInfo kZoneAmerica_Inuvik ACE_TIME_PROGMEM = { kZoneNameAmerica_Inuvik /*name*/, 0xa42189fc /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Inuvik /*eras*/, }; @@ -4284,7 +4199,6 @@ const extended::ZoneInfo kZoneAmerica_Iqaluit ACE_TIME_PROGMEM = { kZoneNameAmerica_Iqaluit /*name*/, 0x2de310bf /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Iqaluit /*eras*/, }; @@ -4319,7 +4233,6 @@ const extended::ZoneInfo kZoneAmerica_Jamaica ACE_TIME_PROGMEM = { kZoneNameAmerica_Jamaica /*name*/, 0x565dad6c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Jamaica /*eras*/, }; @@ -4354,7 +4267,6 @@ const extended::ZoneInfo kZoneAmerica_Juneau ACE_TIME_PROGMEM = { kZoneNameAmerica_Juneau /*name*/, 0xa6f13e2e /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Juneau /*eras*/, }; @@ -4389,7 +4301,6 @@ const extended::ZoneInfo kZoneAmerica_Kentucky_Louisville ACE_TIME_PROGMEM = { kZoneNameAmerica_Kentucky_Louisville /*name*/, 0x1a21024b /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Kentucky_Louisville /*eras*/, }; @@ -4436,7 +4347,6 @@ const extended::ZoneInfo kZoneAmerica_Kentucky_Monticello ACE_TIME_PROGMEM = { kZoneNameAmerica_Kentucky_Monticello /*name*/, 0xde71c439 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Kentucky_Monticello /*eras*/, }; @@ -4471,7 +4381,6 @@ const extended::ZoneInfo kZoneAmerica_La_Paz ACE_TIME_PROGMEM = { kZoneNameAmerica_La_Paz /*name*/, 0xaa29125d /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_La_Paz /*eras*/, }; @@ -4506,7 +4415,6 @@ const extended::ZoneInfo kZoneAmerica_Lima ACE_TIME_PROGMEM = { kZoneNameAmerica_Lima /*name*/, 0x980468c9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Lima /*eras*/, }; @@ -4541,7 +4449,6 @@ const extended::ZoneInfo kZoneAmerica_Los_Angeles ACE_TIME_PROGMEM = { kZoneNameAmerica_Los_Angeles /*name*/, 0xb7f7e8f2 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Los_Angeles /*eras*/, }; @@ -4624,7 +4531,6 @@ const extended::ZoneInfo kZoneAmerica_Maceio ACE_TIME_PROGMEM = { kZoneNameAmerica_Maceio /*name*/, 0xac80c6d4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 5 /*numEras*/, kZoneEraAmerica_Maceio /*eras*/, }; @@ -4659,7 +4565,6 @@ const extended::ZoneInfo kZoneAmerica_Managua ACE_TIME_PROGMEM = { kZoneNameAmerica_Managua /*name*/, 0x3d5e7600 /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Managua /*eras*/, }; @@ -4694,7 +4599,6 @@ const extended::ZoneInfo kZoneAmerica_Manaus ACE_TIME_PROGMEM = { kZoneNameAmerica_Manaus /*name*/, 0xac86bf8b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Manaus /*eras*/, }; @@ -4729,7 +4633,6 @@ const extended::ZoneInfo kZoneAmerica_Martinique ACE_TIME_PROGMEM = { kZoneNameAmerica_Martinique /*name*/, 0x551e84c5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Martinique /*eras*/, }; @@ -4776,7 +4679,6 @@ const extended::ZoneInfo kZoneAmerica_Matamoros ACE_TIME_PROGMEM = { kZoneNameAmerica_Matamoros /*name*/, 0xdd1b0259 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Matamoros /*eras*/, }; @@ -4811,7 +4713,6 @@ const extended::ZoneInfo kZoneAmerica_Mazatlan ACE_TIME_PROGMEM = { kZoneNameAmerica_Mazatlan /*name*/, 0x0532189e /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Mazatlan /*eras*/, }; @@ -4846,7 +4747,6 @@ const extended::ZoneInfo kZoneAmerica_Menominee ACE_TIME_PROGMEM = { kZoneNameAmerica_Menominee /*name*/, 0xe0e9c583 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Menominee /*eras*/, }; @@ -4881,7 +4781,6 @@ const extended::ZoneInfo kZoneAmerica_Merida ACE_TIME_PROGMEM = { kZoneNameAmerica_Merida /*name*/, 0xacd172d8 /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Merida /*eras*/, }; @@ -4952,7 +4851,6 @@ const extended::ZoneInfo kZoneAmerica_Metlakatla ACE_TIME_PROGMEM = { kZoneNameAmerica_Metlakatla /*name*/, 0x84de2686 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 4 /*numEras*/, kZoneEraAmerica_Metlakatla /*eras*/, }; @@ -5011,7 +4909,6 @@ const extended::ZoneInfo kZoneAmerica_Mexico_City ACE_TIME_PROGMEM = { kZoneNameAmerica_Mexico_City /*name*/, 0xd0d93f43 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Mexico_City /*eras*/, }; @@ -5046,7 +4943,6 @@ const extended::ZoneInfo kZoneAmerica_Miquelon ACE_TIME_PROGMEM = { kZoneNameAmerica_Miquelon /*name*/, 0x59674330 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Miquelon /*eras*/, }; @@ -5093,7 +4989,6 @@ const extended::ZoneInfo kZoneAmerica_Moncton ACE_TIME_PROGMEM = { kZoneNameAmerica_Moncton /*name*/, 0x5e07fe24 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Moncton /*eras*/, }; @@ -5128,7 +5023,6 @@ const extended::ZoneInfo kZoneAmerica_Monterrey ACE_TIME_PROGMEM = { kZoneNameAmerica_Monterrey /*name*/, 0x269a1deb /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Monterrey /*eras*/, }; @@ -5163,7 +5057,6 @@ const extended::ZoneInfo kZoneAmerica_Montevideo ACE_TIME_PROGMEM = { kZoneNameAmerica_Montevideo /*name*/, 0xfa214780 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Montevideo /*eras*/, }; @@ -5198,7 +5091,6 @@ const extended::ZoneInfo kZoneAmerica_Nassau ACE_TIME_PROGMEM = { kZoneNameAmerica_Nassau /*name*/, 0xaedef011 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Nassau /*eras*/, }; @@ -5233,7 +5125,6 @@ const extended::ZoneInfo kZoneAmerica_New_York ACE_TIME_PROGMEM = { kZoneNameAmerica_New_York /*name*/, 0x1e2a7654 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_New_York /*eras*/, }; @@ -5268,7 +5159,6 @@ const extended::ZoneInfo kZoneAmerica_Nipigon ACE_TIME_PROGMEM = { kZoneNameAmerica_Nipigon /*name*/, 0x9d2a8b1a /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Nipigon /*eras*/, }; @@ -5303,7 +5193,6 @@ const extended::ZoneInfo kZoneAmerica_Nome ACE_TIME_PROGMEM = { kZoneNameAmerica_Nome /*name*/, 0x98059b15 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Nome /*eras*/, }; @@ -5386,7 +5275,6 @@ const extended::ZoneInfo kZoneAmerica_Noronha ACE_TIME_PROGMEM = { kZoneNameAmerica_Noronha /*name*/, 0xab5116fb /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 5 /*numEras*/, kZoneEraAmerica_Noronha /*eras*/, }; @@ -5433,7 +5321,6 @@ const extended::ZoneInfo kZoneAmerica_North_Dakota_Beulah ACE_TIME_PROGMEM = { kZoneNameAmerica_North_Dakota_Beulah /*name*/, 0x9b52b384 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_North_Dakota_Beulah /*eras*/, }; @@ -5468,7 +5355,6 @@ const extended::ZoneInfo kZoneAmerica_North_Dakota_Center ACE_TIME_PROGMEM = { kZoneNameAmerica_North_Dakota_Center /*name*/, 0x9da42814 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_North_Dakota_Center /*eras*/, }; @@ -5515,7 +5401,6 @@ const extended::ZoneInfo kZoneAmerica_North_Dakota_New_Salem ACE_TIME_PROGMEM = kZoneNameAmerica_North_Dakota_New_Salem /*name*/, 0x04f9958e /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_North_Dakota_New_Salem /*eras*/, }; @@ -5550,7 +5435,6 @@ const extended::ZoneInfo kZoneAmerica_Nuuk ACE_TIME_PROGMEM = { kZoneNameAmerica_Nuuk /*name*/, 0x9805b5a9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Nuuk /*eras*/, }; @@ -5597,7 +5481,6 @@ const extended::ZoneInfo kZoneAmerica_Ojinaga ACE_TIME_PROGMEM = { kZoneNameAmerica_Ojinaga /*name*/, 0xebfde83f /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Ojinaga /*eras*/, }; @@ -5632,7 +5515,6 @@ const extended::ZoneInfo kZoneAmerica_Panama ACE_TIME_PROGMEM = { kZoneNameAmerica_Panama /*name*/, 0xb3863854 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Panama /*eras*/, }; @@ -5691,7 +5573,6 @@ const extended::ZoneInfo kZoneAmerica_Pangnirtung ACE_TIME_PROGMEM = { kZoneNameAmerica_Pangnirtung /*name*/, 0x2d999193 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Pangnirtung /*eras*/, }; @@ -5726,7 +5607,6 @@ const extended::ZoneInfo kZoneAmerica_Paramaribo ACE_TIME_PROGMEM = { kZoneNameAmerica_Paramaribo /*name*/, 0xb319e4c4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Paramaribo /*eras*/, }; @@ -5761,7 +5641,6 @@ const extended::ZoneInfo kZoneAmerica_Phoenix ACE_TIME_PROGMEM = { kZoneNameAmerica_Phoenix /*name*/, 0x34b5af01 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Phoenix /*eras*/, }; @@ -5796,7 +5675,6 @@ const extended::ZoneInfo kZoneAmerica_Port_au_Prince ACE_TIME_PROGMEM = { kZoneNameAmerica_Port_au_Prince /*name*/, 0x8e4a7bdc /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Port_au_Prince /*eras*/, }; @@ -5831,7 +5709,6 @@ const extended::ZoneInfo kZoneAmerica_Port_of_Spain ACE_TIME_PROGMEM = { kZoneNameAmerica_Port_of_Spain /*name*/, 0xd8b28d59 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Port_of_Spain /*eras*/, }; @@ -5866,7 +5743,6 @@ const extended::ZoneInfo kZoneAmerica_Porto_Velho ACE_TIME_PROGMEM = { kZoneNameAmerica_Porto_Velho /*name*/, 0x6b1aac77 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Porto_Velho /*eras*/, }; @@ -5901,7 +5777,6 @@ const extended::ZoneInfo kZoneAmerica_Puerto_Rico ACE_TIME_PROGMEM = { kZoneNameAmerica_Puerto_Rico /*name*/, 0x6752ca31 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Puerto_Rico /*eras*/, }; @@ -5948,7 +5823,6 @@ const extended::ZoneInfo kZoneAmerica_Punta_Arenas ACE_TIME_PROGMEM = { kZoneNameAmerica_Punta_Arenas /*name*/, 0xc2c3bce7 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Punta_Arenas /*eras*/, }; @@ -5983,7 +5857,6 @@ const extended::ZoneInfo kZoneAmerica_Rainy_River ACE_TIME_PROGMEM = { kZoneNameAmerica_Rainy_River /*name*/, 0x9cd58a10 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Rainy_River /*eras*/, }; @@ -6042,7 +5915,6 @@ const extended::ZoneInfo kZoneAmerica_Rankin_Inlet ACE_TIME_PROGMEM = { kZoneNameAmerica_Rankin_Inlet /*name*/, 0xc8de4984 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Rankin_Inlet /*eras*/, }; @@ -6125,7 +5997,6 @@ const extended::ZoneInfo kZoneAmerica_Recife ACE_TIME_PROGMEM = { kZoneNameAmerica_Recife /*name*/, 0xb8730494 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 5 /*numEras*/, kZoneEraAmerica_Recife /*eras*/, }; @@ -6160,7 +6031,6 @@ const extended::ZoneInfo kZoneAmerica_Regina ACE_TIME_PROGMEM = { kZoneNameAmerica_Regina /*name*/, 0xb875371c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Regina /*eras*/, }; @@ -6243,7 +6113,6 @@ const extended::ZoneInfo kZoneAmerica_Resolute ACE_TIME_PROGMEM = { kZoneNameAmerica_Resolute /*name*/, 0xc7093459 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 5 /*numEras*/, kZoneEraAmerica_Resolute /*eras*/, }; @@ -6302,7 +6171,6 @@ const extended::ZoneInfo kZoneAmerica_Rio_Branco ACE_TIME_PROGMEM = { kZoneNameAmerica_Rio_Branco /*name*/, 0x9d352764 /*zoneId*/, &kZoneContext /*zoneContext*/, - 3 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Rio_Branco /*eras*/, }; @@ -6349,7 +6217,6 @@ const extended::ZoneInfo kZoneAmerica_Santarem ACE_TIME_PROGMEM = { kZoneNameAmerica_Santarem /*name*/, 0x740caec1 /*zoneId*/, &kZoneContext /*zoneContext*/, - 3 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Santarem /*eras*/, }; @@ -6384,7 +6251,6 @@ const extended::ZoneInfo kZoneAmerica_Santiago ACE_TIME_PROGMEM = { kZoneNameAmerica_Santiago /*name*/, 0x7410c9bc /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Santiago /*eras*/, }; @@ -6443,7 +6309,6 @@ const extended::ZoneInfo kZoneAmerica_Santo_Domingo ACE_TIME_PROGMEM = { kZoneNameAmerica_Santo_Domingo /*name*/, 0x75a0d177 /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAmerica_Santo_Domingo /*eras*/, }; @@ -6478,7 +6343,6 @@ const extended::ZoneInfo kZoneAmerica_Sao_Paulo ACE_TIME_PROGMEM = { kZoneNameAmerica_Sao_Paulo /*name*/, 0x1063bfc9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Sao_Paulo /*eras*/, }; @@ -6513,7 +6377,6 @@ const extended::ZoneInfo kZoneAmerica_Scoresbysund ACE_TIME_PROGMEM = { kZoneNameAmerica_Scoresbysund /*name*/, 0x123f8d2a /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Scoresbysund /*eras*/, }; @@ -6548,7 +6411,6 @@ const extended::ZoneInfo kZoneAmerica_Sitka ACE_TIME_PROGMEM = { kZoneNameAmerica_Sitka /*name*/, 0x99104ce2 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Sitka /*eras*/, }; @@ -6595,7 +6457,6 @@ const extended::ZoneInfo kZoneAmerica_St_Johns ACE_TIME_PROGMEM = { kZoneNameAmerica_St_Johns /*name*/, 0x04b14e6e /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_St_Johns /*eras*/, }; @@ -6630,7 +6491,6 @@ const extended::ZoneInfo kZoneAmerica_Swift_Current ACE_TIME_PROGMEM = { kZoneNameAmerica_Swift_Current /*name*/, 0xdef98e55 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Swift_Current /*eras*/, }; @@ -6665,7 +6525,6 @@ const extended::ZoneInfo kZoneAmerica_Tegucigalpa ACE_TIME_PROGMEM = { kZoneNameAmerica_Tegucigalpa /*name*/, 0xbfd6fd4c /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Tegucigalpa /*eras*/, }; @@ -6700,7 +6559,6 @@ const extended::ZoneInfo kZoneAmerica_Thule ACE_TIME_PROGMEM = { kZoneNameAmerica_Thule /*name*/, 0x9921dd68 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Thule /*eras*/, }; @@ -6735,7 +6593,6 @@ const extended::ZoneInfo kZoneAmerica_Thunder_Bay ACE_TIME_PROGMEM = { kZoneNameAmerica_Thunder_Bay /*name*/, 0xf962e71b /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Thunder_Bay /*eras*/, }; @@ -6806,7 +6663,6 @@ const extended::ZoneInfo kZoneAmerica_Tijuana ACE_TIME_PROGMEM = { kZoneNameAmerica_Tijuana /*name*/, 0x6aa1df72 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 4 /*numEras*/, kZoneEraAmerica_Tijuana /*eras*/, }; @@ -6841,7 +6697,6 @@ const extended::ZoneInfo kZoneAmerica_Toronto ACE_TIME_PROGMEM = { kZoneNameAmerica_Toronto /*name*/, 0x792e851b /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Toronto /*eras*/, }; @@ -6876,7 +6731,6 @@ const extended::ZoneInfo kZoneAmerica_Vancouver ACE_TIME_PROGMEM = { kZoneNameAmerica_Vancouver /*name*/, 0x2c6f6b1f /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Vancouver /*eras*/, }; @@ -6923,7 +6777,6 @@ const extended::ZoneInfo kZoneAmerica_Whitehorse ACE_TIME_PROGMEM = { kZoneNameAmerica_Whitehorse /*name*/, 0x54e0e3e8 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Whitehorse /*eras*/, }; @@ -6970,7 +6823,6 @@ const extended::ZoneInfo kZoneAmerica_Winnipeg ACE_TIME_PROGMEM = { kZoneNameAmerica_Winnipeg /*name*/, 0x8c7dafc7 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAmerica_Winnipeg /*eras*/, }; @@ -7005,7 +6857,6 @@ const extended::ZoneInfo kZoneAmerica_Yakutat ACE_TIME_PROGMEM = { kZoneNameAmerica_Yakutat /*name*/, 0xd8ee31e9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Yakutat /*eras*/, }; @@ -7040,7 +6891,6 @@ const extended::ZoneInfo kZoneAmerica_Yellowknife ACE_TIME_PROGMEM = { kZoneNameAmerica_Yellowknife /*name*/, 0x0f76c76f /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAmerica_Yellowknife /*eras*/, }; @@ -7207,7 +7057,6 @@ const extended::ZoneInfo kZoneAntarctica_Casey ACE_TIME_PROGMEM = { kZoneNameAntarctica_Casey /*name*/, 0xe2022583 /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 12 /*numEras*/, kZoneEraAntarctica_Casey /*eras*/, }; @@ -7290,7 +7139,6 @@ const extended::ZoneInfo kZoneAntarctica_Davis ACE_TIME_PROGMEM = { kZoneNameAntarctica_Davis /*name*/, 0xe2144b45 /*zoneId*/, &kZoneContext /*zoneContext*/, - 3 /*transitionBufSize*/, 5 /*numEras*/, kZoneEraAntarctica_Davis /*eras*/, }; @@ -7325,7 +7173,6 @@ const extended::ZoneInfo kZoneAntarctica_DumontDUrville ACE_TIME_PROGMEM = { kZoneNameAntarctica_DumontDUrville /*name*/, 0x5a3c656c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAntarctica_DumontDUrville /*eras*/, }; @@ -7384,7 +7231,6 @@ const extended::ZoneInfo kZoneAntarctica_Macquarie ACE_TIME_PROGMEM = { kZoneNameAntarctica_Macquarie /*name*/, 0x92f47626 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAntarctica_Macquarie /*eras*/, }; @@ -7431,7 +7277,6 @@ const extended::ZoneInfo kZoneAntarctica_Mawson ACE_TIME_PROGMEM = { kZoneNameAntarctica_Mawson /*name*/, 0x399cd863 /*zoneId*/, &kZoneContext /*zoneContext*/, - 3 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAntarctica_Mawson /*eras*/, }; @@ -7478,7 +7323,6 @@ const extended::ZoneInfo kZoneAntarctica_Palmer ACE_TIME_PROGMEM = { kZoneNameAntarctica_Palmer /*name*/, 0x40962f4f /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAntarctica_Palmer /*eras*/, }; @@ -7513,7 +7357,6 @@ const extended::ZoneInfo kZoneAntarctica_Rothera ACE_TIME_PROGMEM = { kZoneNameAntarctica_Rothera /*name*/, 0x0e86d203 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAntarctica_Rothera /*eras*/, }; @@ -7548,7 +7391,6 @@ const extended::ZoneInfo kZoneAntarctica_Syowa ACE_TIME_PROGMEM = { kZoneNameAntarctica_Syowa /*name*/, 0xe330c7e1 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAntarctica_Syowa /*eras*/, }; @@ -7595,7 +7437,6 @@ const extended::ZoneInfo kZoneAntarctica_Troll ACE_TIME_PROGMEM = { kZoneNameAntarctica_Troll /*name*/, 0xe33f085b /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAntarctica_Troll /*eras*/, }; @@ -7630,7 +7471,6 @@ const extended::ZoneInfo kZoneAntarctica_Vostok ACE_TIME_PROGMEM = { kZoneNameAntarctica_Vostok /*name*/, 0x4f966fd4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAntarctica_Vostok /*eras*/, }; @@ -7677,7 +7517,6 @@ const extended::ZoneInfo kZoneAsia_Almaty ACE_TIME_PROGMEM = { kZoneNameAsia_Almaty /*name*/, 0xa61f41fa /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAsia_Almaty /*eras*/, }; @@ -7712,7 +7551,6 @@ const extended::ZoneInfo kZoneAsia_Amman ACE_TIME_PROGMEM = { kZoneNameAsia_Amman /*name*/, 0x148d21bc /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Amman /*eras*/, }; @@ -7771,7 +7609,6 @@ const extended::ZoneInfo kZoneAsia_Anadyr ACE_TIME_PROGMEM = { kZoneNameAsia_Anadyr /*name*/, 0xa63cebd1 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAsia_Anadyr /*eras*/, }; @@ -7818,7 +7655,6 @@ const extended::ZoneInfo kZoneAsia_Aqtau ACE_TIME_PROGMEM = { kZoneNameAsia_Aqtau /*name*/, 0x148f710e /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAsia_Aqtau /*eras*/, }; @@ -7865,7 +7701,6 @@ const extended::ZoneInfo kZoneAsia_Aqtobe ACE_TIME_PROGMEM = { kZoneNameAsia_Aqtobe /*name*/, 0xa67dcc4e /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAsia_Aqtobe /*eras*/, }; @@ -7900,7 +7735,6 @@ const extended::ZoneInfo kZoneAsia_Ashgabat ACE_TIME_PROGMEM = { kZoneNameAsia_Ashgabat /*name*/, 0xba87598d /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Ashgabat /*eras*/, }; @@ -7959,7 +7793,6 @@ const extended::ZoneInfo kZoneAsia_Atyrau ACE_TIME_PROGMEM = { kZoneNameAsia_Atyrau /*name*/, 0xa6b6e068 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAsia_Atyrau /*eras*/, }; @@ -7994,7 +7827,6 @@ const extended::ZoneInfo kZoneAsia_Baghdad ACE_TIME_PROGMEM = { kZoneNameAsia_Baghdad /*name*/, 0x9ceffbed /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Baghdad /*eras*/, }; @@ -8029,7 +7861,6 @@ const extended::ZoneInfo kZoneAsia_Baku ACE_TIME_PROGMEM = { kZoneNameAsia_Baku /*name*/, 0x1fa788b5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Baku /*eras*/, }; @@ -8064,7 +7895,6 @@ const extended::ZoneInfo kZoneAsia_Bangkok ACE_TIME_PROGMEM = { kZoneNameAsia_Bangkok /*name*/, 0x9d6e3aaf /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Bangkok /*eras*/, }; @@ -8135,7 +7965,6 @@ const extended::ZoneInfo kZoneAsia_Barnaul ACE_TIME_PROGMEM = { kZoneNameAsia_Barnaul /*name*/, 0x9dba4997 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 4 /*numEras*/, kZoneEraAsia_Barnaul /*eras*/, }; @@ -8170,7 +7999,6 @@ const extended::ZoneInfo kZoneAsia_Beirut ACE_TIME_PROGMEM = { kZoneNameAsia_Beirut /*name*/, 0xa7f3d5fd /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Beirut /*eras*/, }; @@ -8217,7 +8045,6 @@ const extended::ZoneInfo kZoneAsia_Bishkek ACE_TIME_PROGMEM = { kZoneNameAsia_Bishkek /*name*/, 0xb0728553 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAsia_Bishkek /*eras*/, }; @@ -8252,7 +8079,6 @@ const extended::ZoneInfo kZoneAsia_Brunei ACE_TIME_PROGMEM = { kZoneNameAsia_Brunei /*name*/, 0xa8e595f7 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Brunei /*eras*/, }; @@ -8323,7 +8149,6 @@ const extended::ZoneInfo kZoneAsia_Chita ACE_TIME_PROGMEM = { kZoneNameAsia_Chita /*name*/, 0x14ae863b /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 4 /*numEras*/, kZoneEraAsia_Chita /*eras*/, }; @@ -8370,7 +8195,6 @@ const extended::ZoneInfo kZoneAsia_Choibalsan ACE_TIME_PROGMEM = { kZoneNameAsia_Choibalsan /*name*/, 0x928aa4a6 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAsia_Choibalsan /*eras*/, }; @@ -8417,7 +8241,6 @@ const extended::ZoneInfo kZoneAsia_Colombo ACE_TIME_PROGMEM = { kZoneNameAsia_Colombo /*name*/, 0x0af0e91d /*zoneId*/, &kZoneContext /*zoneContext*/, - 3 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAsia_Colombo /*eras*/, }; @@ -8452,7 +8275,6 @@ const extended::ZoneInfo kZoneAsia_Damascus ACE_TIME_PROGMEM = { kZoneNameAsia_Damascus /*name*/, 0x20fbb063 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Damascus /*eras*/, }; @@ -8499,7 +8321,6 @@ const extended::ZoneInfo kZoneAsia_Dhaka ACE_TIME_PROGMEM = { kZoneNameAsia_Dhaka /*name*/, 0x14c07b8b /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAsia_Dhaka /*eras*/, }; @@ -8546,7 +8367,6 @@ const extended::ZoneInfo kZoneAsia_Dili ACE_TIME_PROGMEM = { kZoneNameAsia_Dili /*name*/, 0x1fa8c394 /*zoneId*/, &kZoneContext /*zoneContext*/, - 3 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAsia_Dili /*eras*/, }; @@ -8581,7 +8401,6 @@ const extended::ZoneInfo kZoneAsia_Dubai ACE_TIME_PROGMEM = { kZoneNameAsia_Dubai /*name*/, 0x14c79f77 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Dubai /*eras*/, }; @@ -8616,7 +8435,6 @@ const extended::ZoneInfo kZoneAsia_Dushanbe ACE_TIME_PROGMEM = { kZoneNameAsia_Dushanbe /*name*/, 0x32fc5c3c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Dushanbe /*eras*/, }; @@ -8675,7 +8493,6 @@ const extended::ZoneInfo kZoneAsia_Famagusta ACE_TIME_PROGMEM = { kZoneNameAsia_Famagusta /*name*/, 0x289b4f8b /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAsia_Famagusta /*eras*/, }; @@ -8794,7 +8611,6 @@ const extended::ZoneInfo kZoneAsia_Gaza ACE_TIME_PROGMEM = { kZoneNameAsia_Gaza /*name*/, 0x1faa4875 /*zoneId*/, &kZoneContext /*zoneContext*/, - 7 /*transitionBufSize*/, 8 /*numEras*/, kZoneEraAsia_Gaza /*eras*/, }; @@ -8841,7 +8657,6 @@ const extended::ZoneInfo kZoneAsia_Hebron ACE_TIME_PROGMEM = { kZoneNameAsia_Hebron /*name*/, 0xb5eef250 /*zoneId*/, &kZoneContext /*zoneContext*/, - 7 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAsia_Hebron /*eras*/, }; @@ -8876,7 +8691,6 @@ const extended::ZoneInfo kZoneAsia_Ho_Chi_Minh ACE_TIME_PROGMEM = { kZoneNameAsia_Ho_Chi_Minh /*name*/, 0x20f2d127 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Ho_Chi_Minh /*eras*/, }; @@ -8911,7 +8725,6 @@ const extended::ZoneInfo kZoneAsia_Hong_Kong ACE_TIME_PROGMEM = { kZoneNameAsia_Hong_Kong /*name*/, 0x577f28ac /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Hong_Kong /*eras*/, }; @@ -8946,7 +8759,6 @@ const extended::ZoneInfo kZoneAsia_Hovd ACE_TIME_PROGMEM = { kZoneNameAsia_Hovd /*name*/, 0x1fab0fe3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Hovd /*eras*/, }; @@ -9005,7 +8817,6 @@ const extended::ZoneInfo kZoneAsia_Irkutsk ACE_TIME_PROGMEM = { kZoneNameAsia_Irkutsk /*name*/, 0xdfbf213f /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAsia_Irkutsk /*eras*/, }; @@ -9040,7 +8851,6 @@ const extended::ZoneInfo kZoneAsia_Jakarta ACE_TIME_PROGMEM = { kZoneNameAsia_Jakarta /*name*/, 0x0506ab50 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Jakarta /*eras*/, }; @@ -9075,7 +8885,6 @@ const extended::ZoneInfo kZoneAsia_Jayapura ACE_TIME_PROGMEM = { kZoneNameAsia_Jayapura /*name*/, 0xc6833c2f /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Jayapura /*eras*/, }; @@ -9110,7 +8919,6 @@ const extended::ZoneInfo kZoneAsia_Jerusalem ACE_TIME_PROGMEM = { kZoneNameAsia_Jerusalem /*name*/, 0x5becd23a /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Jerusalem /*eras*/, }; @@ -9145,7 +8953,6 @@ const extended::ZoneInfo kZoneAsia_Kabul ACE_TIME_PROGMEM = { kZoneNameAsia_Kabul /*name*/, 0x153b5601 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Kabul /*eras*/, }; @@ -9204,7 +9011,6 @@ const extended::ZoneInfo kZoneAsia_Kamchatka ACE_TIME_PROGMEM = { kZoneNameAsia_Kamchatka /*name*/, 0x73baf9d7 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAsia_Kamchatka /*eras*/, }; @@ -9239,7 +9045,6 @@ const extended::ZoneInfo kZoneAsia_Karachi ACE_TIME_PROGMEM = { kZoneNameAsia_Karachi /*name*/, 0x527f5245 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Karachi /*eras*/, }; @@ -9274,7 +9079,6 @@ const extended::ZoneInfo kZoneAsia_Kathmandu ACE_TIME_PROGMEM = { kZoneNameAsia_Kathmandu /*name*/, 0x9a96ce6f /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Kathmandu /*eras*/, }; @@ -9357,7 +9161,6 @@ const extended::ZoneInfo kZoneAsia_Khandyga ACE_TIME_PROGMEM = { kZoneNameAsia_Khandyga /*name*/, 0x9685a4d9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 5 /*numEras*/, kZoneEraAsia_Khandyga /*eras*/, }; @@ -9392,7 +9195,6 @@ const extended::ZoneInfo kZoneAsia_Kolkata ACE_TIME_PROGMEM = { kZoneNameAsia_Kolkata /*name*/, 0x72c06cd9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Kolkata /*eras*/, }; @@ -9451,7 +9253,6 @@ const extended::ZoneInfo kZoneAsia_Krasnoyarsk ACE_TIME_PROGMEM = { kZoneNameAsia_Krasnoyarsk /*name*/, 0xd0376c6a /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAsia_Krasnoyarsk /*eras*/, }; @@ -9486,7 +9287,6 @@ const extended::ZoneInfo kZoneAsia_Kuala_Lumpur ACE_TIME_PROGMEM = { kZoneNameAsia_Kuala_Lumpur /*name*/, 0x014763c4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Kuala_Lumpur /*eras*/, }; @@ -9521,7 +9321,6 @@ const extended::ZoneInfo kZoneAsia_Kuching ACE_TIME_PROGMEM = { kZoneNameAsia_Kuching /*name*/, 0x801b003b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Kuching /*eras*/, }; @@ -9556,7 +9355,6 @@ const extended::ZoneInfo kZoneAsia_Macau ACE_TIME_PROGMEM = { kZoneNameAsia_Macau /*name*/, 0x155f88b9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Macau /*eras*/, }; @@ -9627,7 +9425,6 @@ const extended::ZoneInfo kZoneAsia_Magadan ACE_TIME_PROGMEM = { kZoneNameAsia_Magadan /*name*/, 0xebacc19b /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 4 /*numEras*/, kZoneEraAsia_Magadan /*eras*/, }; @@ -9662,7 +9459,6 @@ const extended::ZoneInfo kZoneAsia_Makassar ACE_TIME_PROGMEM = { kZoneNameAsia_Makassar /*name*/, 0x6aa21c85 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Makassar /*eras*/, }; @@ -9697,7 +9493,6 @@ const extended::ZoneInfo kZoneAsia_Manila ACE_TIME_PROGMEM = { kZoneNameAsia_Manila /*name*/, 0xc156c944 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Manila /*eras*/, }; @@ -9732,7 +9527,6 @@ const extended::ZoneInfo kZoneAsia_Nicosia ACE_TIME_PROGMEM = { kZoneNameAsia_Nicosia /*name*/, 0x4b0fcf78 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Nicosia /*eras*/, }; @@ -9791,7 +9585,6 @@ const extended::ZoneInfo kZoneAsia_Novokuznetsk ACE_TIME_PROGMEM = { kZoneNameAsia_Novokuznetsk /*name*/, 0x69264f93 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAsia_Novokuznetsk /*eras*/, }; @@ -9862,7 +9655,6 @@ const extended::ZoneInfo kZoneAsia_Novosibirsk ACE_TIME_PROGMEM = { kZoneNameAsia_Novosibirsk /*name*/, 0xa2a435cb /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 4 /*numEras*/, kZoneEraAsia_Novosibirsk /*eras*/, }; @@ -9921,7 +9713,6 @@ const extended::ZoneInfo kZoneAsia_Omsk ACE_TIME_PROGMEM = { kZoneNameAsia_Omsk /*name*/, 0x1faeddac /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAsia_Omsk /*eras*/, }; @@ -9968,7 +9759,6 @@ const extended::ZoneInfo kZoneAsia_Oral ACE_TIME_PROGMEM = { kZoneNameAsia_Oral /*name*/, 0x1faef0a0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAsia_Oral /*eras*/, }; @@ -10003,7 +9793,6 @@ const extended::ZoneInfo kZoneAsia_Pontianak ACE_TIME_PROGMEM = { kZoneNameAsia_Pontianak /*name*/, 0x1a76c057 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Pontianak /*eras*/, }; @@ -10062,7 +9851,6 @@ const extended::ZoneInfo kZoneAsia_Pyongyang ACE_TIME_PROGMEM = { kZoneNameAsia_Pyongyang /*name*/, 0x93ed1c8e /*zoneId*/, &kZoneContext /*zoneContext*/, - 3 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAsia_Pyongyang /*eras*/, }; @@ -10097,7 +9885,6 @@ const extended::ZoneInfo kZoneAsia_Qatar ACE_TIME_PROGMEM = { kZoneNameAsia_Qatar /*name*/, 0x15a8330b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Qatar /*eras*/, }; @@ -10144,7 +9931,6 @@ const extended::ZoneInfo kZoneAsia_Qostanay ACE_TIME_PROGMEM = { kZoneNameAsia_Qostanay /*name*/, 0x654fe522 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAsia_Qostanay /*eras*/, }; @@ -10203,7 +9989,6 @@ const extended::ZoneInfo kZoneAsia_Qyzylorda ACE_TIME_PROGMEM = { kZoneNameAsia_Qyzylorda /*name*/, 0x71282e81 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAsia_Qyzylorda /*eras*/, }; @@ -10238,7 +10023,6 @@ const extended::ZoneInfo kZoneAsia_Riyadh ACE_TIME_PROGMEM = { kZoneNameAsia_Riyadh /*name*/, 0xcd973d93 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Riyadh /*eras*/, }; @@ -10309,7 +10093,6 @@ const extended::ZoneInfo kZoneAsia_Sakhalin ACE_TIME_PROGMEM = { kZoneNameAsia_Sakhalin /*name*/, 0xf4a1c9bd /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 4 /*numEras*/, kZoneEraAsia_Sakhalin /*eras*/, }; @@ -10344,7 +10127,6 @@ const extended::ZoneInfo kZoneAsia_Samarkand ACE_TIME_PROGMEM = { kZoneNameAsia_Samarkand /*name*/, 0x13ae5104 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Samarkand /*eras*/, }; @@ -10379,7 +10161,6 @@ const extended::ZoneInfo kZoneAsia_Seoul ACE_TIME_PROGMEM = { kZoneNameAsia_Seoul /*name*/, 0x15ce82da /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Seoul /*eras*/, }; @@ -10414,7 +10195,6 @@ const extended::ZoneInfo kZoneAsia_Shanghai ACE_TIME_PROGMEM = { kZoneNameAsia_Shanghai /*name*/, 0xf895a7f5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Shanghai /*eras*/, }; @@ -10449,7 +10229,6 @@ const extended::ZoneInfo kZoneAsia_Singapore ACE_TIME_PROGMEM = { kZoneNameAsia_Singapore /*name*/, 0xcf8581fa /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Singapore /*eras*/, }; @@ -10508,7 +10287,6 @@ const extended::ZoneInfo kZoneAsia_Srednekolymsk ACE_TIME_PROGMEM = { kZoneNameAsia_Srednekolymsk /*name*/, 0xbf8e337d /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAsia_Srednekolymsk /*eras*/, }; @@ -10543,7 +10321,6 @@ const extended::ZoneInfo kZoneAsia_Taipei ACE_TIME_PROGMEM = { kZoneNameAsia_Taipei /*name*/, 0xd1a844ae /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Taipei /*eras*/, }; @@ -10578,7 +10355,6 @@ const extended::ZoneInfo kZoneAsia_Tashkent ACE_TIME_PROGMEM = { kZoneNameAsia_Tashkent /*name*/, 0xf3924254 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Tashkent /*eras*/, }; @@ -10637,7 +10413,6 @@ const extended::ZoneInfo kZoneAsia_Tbilisi ACE_TIME_PROGMEM = { kZoneNameAsia_Tbilisi /*name*/, 0x0903e442 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAsia_Tbilisi /*eras*/, }; @@ -10672,7 +10447,6 @@ const extended::ZoneInfo kZoneAsia_Tehran ACE_TIME_PROGMEM = { kZoneNameAsia_Tehran /*name*/, 0xd1f02254 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Tehran /*eras*/, }; @@ -10707,7 +10481,6 @@ const extended::ZoneInfo kZoneAsia_Thimphu ACE_TIME_PROGMEM = { kZoneNameAsia_Thimphu /*name*/, 0x170380d1 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Thimphu /*eras*/, }; @@ -10742,7 +10515,6 @@ const extended::ZoneInfo kZoneAsia_Tokyo ACE_TIME_PROGMEM = { kZoneNameAsia_Tokyo /*name*/, 0x15e606a8 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Tokyo /*eras*/, }; @@ -10825,7 +10597,6 @@ const extended::ZoneInfo kZoneAsia_Tomsk ACE_TIME_PROGMEM = { kZoneNameAsia_Tomsk /*name*/, 0x15e60e60 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 5 /*numEras*/, kZoneEraAsia_Tomsk /*eras*/, }; @@ -10860,7 +10631,6 @@ const extended::ZoneInfo kZoneAsia_Ulaanbaatar ACE_TIME_PROGMEM = { kZoneNameAsia_Ulaanbaatar /*name*/, 0x30f0cc4e /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Ulaanbaatar /*eras*/, }; @@ -10895,7 +10665,6 @@ const extended::ZoneInfo kZoneAsia_Urumqi ACE_TIME_PROGMEM = { kZoneNameAsia_Urumqi /*name*/, 0xd5379735 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Urumqi /*eras*/, }; @@ -10966,7 +10735,6 @@ const extended::ZoneInfo kZoneAsia_Ust_Nera ACE_TIME_PROGMEM = { kZoneNameAsia_Ust_Nera /*name*/, 0x4785f921 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 4 /*numEras*/, kZoneEraAsia_Ust_Nera /*eras*/, }; @@ -11025,7 +10793,6 @@ const extended::ZoneInfo kZoneAsia_Vladivostok ACE_TIME_PROGMEM = { kZoneNameAsia_Vladivostok /*name*/, 0x29de34a8 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAsia_Vladivostok /*eras*/, }; @@ -11084,7 +10851,6 @@ const extended::ZoneInfo kZoneAsia_Yakutsk ACE_TIME_PROGMEM = { kZoneNameAsia_Yakutsk /*name*/, 0x87bb3a9e /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAsia_Yakutsk /*eras*/, }; @@ -11119,7 +10885,6 @@ const extended::ZoneInfo kZoneAsia_Yangon ACE_TIME_PROGMEM = { kZoneNameAsia_Yangon /*name*/, 0xdd54a8be /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAsia_Yangon /*eras*/, }; @@ -11178,7 +10943,6 @@ const extended::ZoneInfo kZoneAsia_Yekaterinburg ACE_TIME_PROGMEM = { kZoneNameAsia_Yekaterinburg /*name*/, 0xfb544c6e /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraAsia_Yekaterinburg /*eras*/, }; @@ -11225,7 +10989,6 @@ const extended::ZoneInfo kZoneAsia_Yerevan ACE_TIME_PROGMEM = { kZoneNameAsia_Yerevan /*name*/, 0x9185c8cc /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAsia_Yerevan /*eras*/, }; @@ -11260,7 +11023,6 @@ const extended::ZoneInfo kZoneAtlantic_Azores ACE_TIME_PROGMEM = { kZoneNameAtlantic_Azores /*name*/, 0xf93ed918 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_Azores /*eras*/, }; @@ -11295,7 +11057,6 @@ const extended::ZoneInfo kZoneAtlantic_Bermuda ACE_TIME_PROGMEM = { kZoneNameAtlantic_Bermuda /*name*/, 0x3d4bb1c4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_Bermuda /*eras*/, }; @@ -11330,7 +11091,6 @@ const extended::ZoneInfo kZoneAtlantic_Canary ACE_TIME_PROGMEM = { kZoneNameAtlantic_Canary /*name*/, 0xfc23f2c2 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_Canary /*eras*/, }; @@ -11365,7 +11125,6 @@ const extended::ZoneInfo kZoneAtlantic_Cape_Verde ACE_TIME_PROGMEM = { kZoneNameAtlantic_Cape_Verde /*name*/, 0x5c5e1772 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_Cape_Verde /*eras*/, }; @@ -11400,7 +11159,6 @@ const extended::ZoneInfo kZoneAtlantic_Faroe ACE_TIME_PROGMEM = { kZoneNameAtlantic_Faroe /*name*/, 0xe110a971 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_Faroe /*eras*/, }; @@ -11435,7 +11193,6 @@ const extended::ZoneInfo kZoneAtlantic_Madeira ACE_TIME_PROGMEM = { kZoneNameAtlantic_Madeira /*name*/, 0x81b5c037 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_Madeira /*eras*/, }; @@ -11470,7 +11227,6 @@ const extended::ZoneInfo kZoneAtlantic_Reykjavik ACE_TIME_PROGMEM = { kZoneNameAtlantic_Reykjavik /*name*/, 0x1c2b4f74 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_Reykjavik /*eras*/, }; @@ -11505,7 +11261,6 @@ const extended::ZoneInfo kZoneAtlantic_South_Georgia ACE_TIME_PROGMEM = { kZoneNameAtlantic_South_Georgia /*name*/, 0x33013174 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAtlantic_South_Georgia /*eras*/, }; @@ -11552,7 +11307,6 @@ const extended::ZoneInfo kZoneAtlantic_Stanley ACE_TIME_PROGMEM = { kZoneNameAtlantic_Stanley /*name*/, 0x7bb3e1c4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAtlantic_Stanley /*eras*/, }; @@ -11587,7 +11341,6 @@ const extended::ZoneInfo kZoneAustralia_Adelaide ACE_TIME_PROGMEM = { kZoneNameAustralia_Adelaide /*name*/, 0x2428e8a3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Adelaide /*eras*/, }; @@ -11622,7 +11375,6 @@ const extended::ZoneInfo kZoneAustralia_Brisbane ACE_TIME_PROGMEM = { kZoneNameAustralia_Brisbane /*name*/, 0x4fedc9c0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Brisbane /*eras*/, }; @@ -11669,7 +11421,6 @@ const extended::ZoneInfo kZoneAustralia_Broken_Hill ACE_TIME_PROGMEM = { kZoneNameAustralia_Broken_Hill /*name*/, 0xb06eada3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraAustralia_Broken_Hill /*eras*/, }; @@ -11704,7 +11455,6 @@ const extended::ZoneInfo kZoneAustralia_Darwin ACE_TIME_PROGMEM = { kZoneNameAustralia_Darwin /*name*/, 0x2876bdff /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Darwin /*eras*/, }; @@ -11739,7 +11489,6 @@ const extended::ZoneInfo kZoneAustralia_Eucla ACE_TIME_PROGMEM = { kZoneNameAustralia_Eucla /*name*/, 0x8cf99e44 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Eucla /*eras*/, }; @@ -11774,7 +11523,6 @@ const extended::ZoneInfo kZoneAustralia_Hobart ACE_TIME_PROGMEM = { kZoneNameAustralia_Hobart /*name*/, 0x32bf951a /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Hobart /*eras*/, }; @@ -11809,7 +11557,6 @@ const extended::ZoneInfo kZoneAustralia_Lindeman ACE_TIME_PROGMEM = { kZoneNameAustralia_Lindeman /*name*/, 0xe05029e2 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Lindeman /*eras*/, }; @@ -11844,7 +11591,6 @@ const extended::ZoneInfo kZoneAustralia_Lord_Howe ACE_TIME_PROGMEM = { kZoneNameAustralia_Lord_Howe /*name*/, 0xa748b67d /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Lord_Howe /*eras*/, }; @@ -11879,7 +11625,6 @@ const extended::ZoneInfo kZoneAustralia_Melbourne ACE_TIME_PROGMEM = { kZoneNameAustralia_Melbourne /*name*/, 0x0fe559a3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Melbourne /*eras*/, }; @@ -11914,7 +11659,6 @@ const extended::ZoneInfo kZoneAustralia_Perth ACE_TIME_PROGMEM = { kZoneNameAustralia_Perth /*name*/, 0x8db8269d /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Perth /*eras*/, }; @@ -11949,7 +11693,6 @@ const extended::ZoneInfo kZoneAustralia_Sydney ACE_TIME_PROGMEM = { kZoneNameAustralia_Sydney /*name*/, 0x4d1e9776 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraAustralia_Sydney /*eras*/, }; @@ -11984,7 +11727,6 @@ const extended::ZoneInfo kZoneCET ACE_TIME_PROGMEM = { kZoneNameCET /*name*/, 0x0b87d921 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraCET /*eras*/, }; @@ -12019,7 +11761,6 @@ const extended::ZoneInfo kZoneCST6CDT ACE_TIME_PROGMEM = { kZoneNameCST6CDT /*name*/, 0xf0e87d00 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraCST6CDT /*eras*/, }; @@ -12054,7 +11795,6 @@ const extended::ZoneInfo kZoneEET ACE_TIME_PROGMEM = { kZoneNameEET /*name*/, 0x0b87e1a3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEET /*eras*/, }; @@ -12089,7 +11829,6 @@ const extended::ZoneInfo kZoneEST ACE_TIME_PROGMEM = { kZoneNameEST /*name*/, 0x0b87e371 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEST /*eras*/, }; @@ -12124,7 +11863,6 @@ const extended::ZoneInfo kZoneEST5EDT ACE_TIME_PROGMEM = { kZoneNameEST5EDT /*name*/, 0x8adc72a3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEST5EDT /*eras*/, }; @@ -12159,7 +11897,6 @@ const extended::ZoneInfo kZoneEtc_GMT ACE_TIME_PROGMEM = { kZoneNameEtc_GMT /*name*/, 0xd8e2de58 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT /*eras*/, }; @@ -12194,7 +11931,6 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_1 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_1 /*name*/, 0x9d13da14 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_1 /*eras*/, }; @@ -12229,7 +11965,6 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_10 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_10 /*name*/, 0x3f8f1cc4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_10 /*eras*/, }; @@ -12264,7 +11999,6 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_11 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_11 /*name*/, 0x3f8f1cc5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_11 /*eras*/, }; @@ -12299,7 +12033,6 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_12 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_12 /*name*/, 0x3f8f1cc6 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_12 /*eras*/, }; @@ -12334,7 +12067,6 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_2 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_2 /*name*/, 0x9d13da15 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_2 /*eras*/, }; @@ -12369,7 +12101,6 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_3 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_3 /*name*/, 0x9d13da16 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_3 /*eras*/, }; @@ -12404,7 +12135,6 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_4 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_4 /*name*/, 0x9d13da17 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_4 /*eras*/, }; @@ -12439,7 +12169,6 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_5 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_5 /*name*/, 0x9d13da18 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_5 /*eras*/, }; @@ -12474,7 +12203,6 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_6 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_6 /*name*/, 0x9d13da19 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_6 /*eras*/, }; @@ -12509,7 +12237,6 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_7 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_7 /*name*/, 0x9d13da1a /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_7 /*eras*/, }; @@ -12544,7 +12271,6 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_8 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_8 /*name*/, 0x9d13da1b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_8 /*eras*/, }; @@ -12579,7 +12305,6 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_9 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_9 /*name*/, 0x9d13da1c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_PLUS_9 /*eras*/, }; @@ -12614,7 +12339,6 @@ const extended::ZoneInfo kZoneEtc_GMT_1 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_1 /*name*/, 0x9d13da56 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_1 /*eras*/, }; @@ -12649,7 +12373,6 @@ const extended::ZoneInfo kZoneEtc_GMT_10 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_10 /*name*/, 0x3f8f2546 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_10 /*eras*/, }; @@ -12684,7 +12407,6 @@ const extended::ZoneInfo kZoneEtc_GMT_11 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_11 /*name*/, 0x3f8f2547 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_11 /*eras*/, }; @@ -12719,7 +12441,6 @@ const extended::ZoneInfo kZoneEtc_GMT_12 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_12 /*name*/, 0x3f8f2548 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_12 /*eras*/, }; @@ -12754,7 +12475,6 @@ const extended::ZoneInfo kZoneEtc_GMT_13 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_13 /*name*/, 0x3f8f2549 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_13 /*eras*/, }; @@ -12789,7 +12509,6 @@ const extended::ZoneInfo kZoneEtc_GMT_14 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_14 /*name*/, 0x3f8f254a /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_14 /*eras*/, }; @@ -12824,7 +12543,6 @@ const extended::ZoneInfo kZoneEtc_GMT_2 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_2 /*name*/, 0x9d13da57 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_2 /*eras*/, }; @@ -12859,7 +12577,6 @@ const extended::ZoneInfo kZoneEtc_GMT_3 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_3 /*name*/, 0x9d13da58 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_3 /*eras*/, }; @@ -12894,7 +12611,6 @@ const extended::ZoneInfo kZoneEtc_GMT_4 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_4 /*name*/, 0x9d13da59 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_4 /*eras*/, }; @@ -12929,7 +12645,6 @@ const extended::ZoneInfo kZoneEtc_GMT_5 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_5 /*name*/, 0x9d13da5a /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_5 /*eras*/, }; @@ -12964,7 +12679,6 @@ const extended::ZoneInfo kZoneEtc_GMT_6 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_6 /*name*/, 0x9d13da5b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_6 /*eras*/, }; @@ -12999,7 +12713,6 @@ const extended::ZoneInfo kZoneEtc_GMT_7 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_7 /*name*/, 0x9d13da5c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_7 /*eras*/, }; @@ -13034,7 +12747,6 @@ const extended::ZoneInfo kZoneEtc_GMT_8 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_8 /*name*/, 0x9d13da5d /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_8 /*eras*/, }; @@ -13069,7 +12781,6 @@ const extended::ZoneInfo kZoneEtc_GMT_9 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_9 /*name*/, 0x9d13da5e /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_GMT_9 /*eras*/, }; @@ -13104,7 +12815,6 @@ const extended::ZoneInfo kZoneEtc_UTC ACE_TIME_PROGMEM = { kZoneNameEtc_UTC /*name*/, 0xd8e31abc /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEtc_UTC /*eras*/, }; @@ -13139,7 +12849,6 @@ const extended::ZoneInfo kZoneEurope_Amsterdam ACE_TIME_PROGMEM = { kZoneNameEurope_Amsterdam /*name*/, 0x109395c2 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Amsterdam /*eras*/, }; @@ -13174,7 +12883,6 @@ const extended::ZoneInfo kZoneEurope_Andorra ACE_TIME_PROGMEM = { kZoneNameEurope_Andorra /*name*/, 0x97f6764b /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Andorra /*eras*/, }; @@ -13245,7 +12953,6 @@ const extended::ZoneInfo kZoneEurope_Astrakhan ACE_TIME_PROGMEM = { kZoneNameEurope_Astrakhan /*name*/, 0xe22256e1 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 4 /*numEras*/, kZoneEraEurope_Astrakhan /*eras*/, }; @@ -13280,7 +12987,6 @@ const extended::ZoneInfo kZoneEurope_Athens ACE_TIME_PROGMEM = { kZoneNameEurope_Athens /*name*/, 0x4318fa27 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Athens /*eras*/, }; @@ -13315,7 +13021,6 @@ const extended::ZoneInfo kZoneEurope_Belgrade ACE_TIME_PROGMEM = { kZoneNameEurope_Belgrade /*name*/, 0xe0532b3a /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Belgrade /*eras*/, }; @@ -13350,7 +13055,6 @@ const extended::ZoneInfo kZoneEurope_Berlin ACE_TIME_PROGMEM = { kZoneNameEurope_Berlin /*name*/, 0x44644c20 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Berlin /*eras*/, }; @@ -13385,7 +13089,6 @@ const extended::ZoneInfo kZoneEurope_Brussels ACE_TIME_PROGMEM = { kZoneNameEurope_Brussels /*name*/, 0xdee07337 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Brussels /*eras*/, }; @@ -13420,7 +13123,6 @@ const extended::ZoneInfo kZoneEurope_Bucharest ACE_TIME_PROGMEM = { kZoneNameEurope_Bucharest /*name*/, 0xfb349ec5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Bucharest /*eras*/, }; @@ -13455,7 +13157,6 @@ const extended::ZoneInfo kZoneEurope_Budapest ACE_TIME_PROGMEM = { kZoneNameEurope_Budapest /*name*/, 0x9ce0197c /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Budapest /*eras*/, }; @@ -13490,7 +13191,6 @@ const extended::ZoneInfo kZoneEurope_Chisinau ACE_TIME_PROGMEM = { kZoneNameEurope_Chisinau /*name*/, 0xad58aa18 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Chisinau /*eras*/, }; @@ -13525,7 +13225,6 @@ const extended::ZoneInfo kZoneEurope_Copenhagen ACE_TIME_PROGMEM = { kZoneNameEurope_Copenhagen /*name*/, 0xe0ed30bc /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Copenhagen /*eras*/, }; @@ -13560,7 +13259,6 @@ const extended::ZoneInfo kZoneEurope_Dublin ACE_TIME_PROGMEM = { kZoneNameEurope_Dublin /*name*/, 0x4a275f62 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Dublin /*eras*/, }; @@ -13595,7 +13293,6 @@ const extended::ZoneInfo kZoneEurope_Gibraltar ACE_TIME_PROGMEM = { kZoneNameEurope_Gibraltar /*name*/, 0xf8e325fc /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Gibraltar /*eras*/, }; @@ -13630,7 +13327,6 @@ const extended::ZoneInfo kZoneEurope_Helsinki ACE_TIME_PROGMEM = { kZoneNameEurope_Helsinki /*name*/, 0x6ab2975b /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Helsinki /*eras*/, }; @@ -13761,7 +13457,6 @@ const extended::ZoneInfo kZoneEurope_Istanbul ACE_TIME_PROGMEM = { kZoneNameEurope_Istanbul /*name*/, 0x9e09d6e6 /*zoneId*/, &kZoneContext /*zoneContext*/, - 7 /*transitionBufSize*/, 9 /*numEras*/, kZoneEraEurope_Istanbul /*eras*/, }; @@ -13820,7 +13515,6 @@ const extended::ZoneInfo kZoneEurope_Kaliningrad ACE_TIME_PROGMEM = { kZoneNameEurope_Kaliningrad /*name*/, 0xd33b2f28 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraEurope_Kaliningrad /*eras*/, }; @@ -13855,7 +13549,6 @@ const extended::ZoneInfo kZoneEurope_Kiev ACE_TIME_PROGMEM = { kZoneNameEurope_Kiev /*name*/, 0xa2c19eb3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Kiev /*eras*/, }; @@ -13914,7 +13607,6 @@ const extended::ZoneInfo kZoneEurope_Kirov ACE_TIME_PROGMEM = { kZoneNameEurope_Kirov /*name*/, 0xfaf5abef /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraEurope_Kirov /*eras*/, }; @@ -13949,7 +13641,6 @@ const extended::ZoneInfo kZoneEurope_Lisbon ACE_TIME_PROGMEM = { kZoneNameEurope_Lisbon /*name*/, 0x5c00a70b /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Lisbon /*eras*/, }; @@ -13984,7 +13675,6 @@ const extended::ZoneInfo kZoneEurope_London ACE_TIME_PROGMEM = { kZoneNameEurope_London /*name*/, 0x5c6a84ae /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_London /*eras*/, }; @@ -14019,7 +13709,6 @@ const extended::ZoneInfo kZoneEurope_Luxembourg ACE_TIME_PROGMEM = { kZoneNameEurope_Luxembourg /*name*/, 0x1f8bc6ce /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Luxembourg /*eras*/, }; @@ -14054,7 +13743,6 @@ const extended::ZoneInfo kZoneEurope_Madrid ACE_TIME_PROGMEM = { kZoneNameEurope_Madrid /*name*/, 0x5dbd1535 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Madrid /*eras*/, }; @@ -14089,7 +13777,6 @@ const extended::ZoneInfo kZoneEurope_Malta ACE_TIME_PROGMEM = { kZoneNameEurope_Malta /*name*/, 0xfb1560f3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Malta /*eras*/, }; @@ -14136,7 +13823,6 @@ const extended::ZoneInfo kZoneEurope_Minsk ACE_TIME_PROGMEM = { kZoneNameEurope_Minsk /*name*/, 0xfb19cc66 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraEurope_Minsk /*eras*/, }; @@ -14171,7 +13857,6 @@ const extended::ZoneInfo kZoneEurope_Monaco ACE_TIME_PROGMEM = { kZoneNameEurope_Monaco /*name*/, 0x5ebf9f01 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Monaco /*eras*/, }; @@ -14230,7 +13915,6 @@ const extended::ZoneInfo kZoneEurope_Moscow ACE_TIME_PROGMEM = { kZoneNameEurope_Moscow /*name*/, 0x5ec266fc /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraEurope_Moscow /*eras*/, }; @@ -14265,7 +13949,6 @@ const extended::ZoneInfo kZoneEurope_Oslo ACE_TIME_PROGMEM = { kZoneNameEurope_Oslo /*name*/, 0xa2c3fba1 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Oslo /*eras*/, }; @@ -14300,7 +13983,6 @@ const extended::ZoneInfo kZoneEurope_Paris ACE_TIME_PROGMEM = { kZoneNameEurope_Paris /*name*/, 0xfb4bc2a3 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Paris /*eras*/, }; @@ -14335,7 +14017,6 @@ const extended::ZoneInfo kZoneEurope_Prague ACE_TIME_PROGMEM = { kZoneNameEurope_Prague /*name*/, 0x65ee5d48 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Prague /*eras*/, }; @@ -14394,7 +14075,6 @@ const extended::ZoneInfo kZoneEurope_Riga ACE_TIME_PROGMEM = { kZoneNameEurope_Riga /*name*/, 0xa2c57587 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraEurope_Riga /*eras*/, }; @@ -14429,7 +14109,6 @@ const extended::ZoneInfo kZoneEurope_Rome ACE_TIME_PROGMEM = { kZoneNameEurope_Rome /*name*/, 0xa2c58fd7 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Rome /*eras*/, }; @@ -14488,7 +14167,6 @@ const extended::ZoneInfo kZoneEurope_Samara ACE_TIME_PROGMEM = { kZoneNameEurope_Samara /*name*/, 0x6bc0b139 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraEurope_Samara /*eras*/, }; @@ -14559,7 +14237,6 @@ const extended::ZoneInfo kZoneEurope_Saratov ACE_TIME_PROGMEM = { kZoneNameEurope_Saratov /*name*/, 0xe4315da4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 4 /*numEras*/, kZoneEraEurope_Saratov /*eras*/, }; @@ -14618,7 +14295,6 @@ const extended::ZoneInfo kZoneEurope_Simferopol ACE_TIME_PROGMEM = { kZoneNameEurope_Simferopol /*name*/, 0xda9eb724 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraEurope_Simferopol /*eras*/, }; @@ -14653,7 +14329,6 @@ const extended::ZoneInfo kZoneEurope_Sofia ACE_TIME_PROGMEM = { kZoneNameEurope_Sofia /*name*/, 0xfb898656 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Sofia /*eras*/, }; @@ -14688,7 +14363,6 @@ const extended::ZoneInfo kZoneEurope_Stockholm ACE_TIME_PROGMEM = { kZoneNameEurope_Stockholm /*name*/, 0x5bf6fbb8 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Stockholm /*eras*/, }; @@ -14747,7 +14421,6 @@ const extended::ZoneInfo kZoneEurope_Tallinn ACE_TIME_PROGMEM = { kZoneNameEurope_Tallinn /*name*/, 0x30c4e096 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraEurope_Tallinn /*eras*/, }; @@ -14782,7 +14455,6 @@ const extended::ZoneInfo kZoneEurope_Tirane ACE_TIME_PROGMEM = { kZoneNameEurope_Tirane /*name*/, 0x6ea95b47 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Tirane /*eras*/, }; @@ -14853,7 +14525,6 @@ const extended::ZoneInfo kZoneEurope_Ulyanovsk ACE_TIME_PROGMEM = { kZoneNameEurope_Ulyanovsk /*name*/, 0xe03783d0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 4 /*numEras*/, kZoneEraEurope_Ulyanovsk /*eras*/, }; @@ -14888,7 +14559,6 @@ const extended::ZoneInfo kZoneEurope_Uzhgorod ACE_TIME_PROGMEM = { kZoneNameEurope_Uzhgorod /*name*/, 0xb066f5d6 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Uzhgorod /*eras*/, }; @@ -14923,7 +14593,6 @@ const extended::ZoneInfo kZoneEurope_Vienna ACE_TIME_PROGMEM = { kZoneNameEurope_Vienna /*name*/, 0x734cc2e5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Vienna /*eras*/, }; @@ -14982,7 +14651,6 @@ const extended::ZoneInfo kZoneEurope_Vilnius ACE_TIME_PROGMEM = { kZoneNameEurope_Vilnius /*name*/, 0xdd63b8ce /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraEurope_Vilnius /*eras*/, }; @@ -15065,7 +14733,6 @@ const extended::ZoneInfo kZoneEurope_Volgograd ACE_TIME_PROGMEM = { kZoneNameEurope_Volgograd /*name*/, 0x3ed0f389 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 5 /*numEras*/, kZoneEraEurope_Volgograd /*eras*/, }; @@ -15100,7 +14767,6 @@ const extended::ZoneInfo kZoneEurope_Warsaw ACE_TIME_PROGMEM = { kZoneNameEurope_Warsaw /*name*/, 0x75185c19 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Warsaw /*eras*/, }; @@ -15135,7 +14801,6 @@ const extended::ZoneInfo kZoneEurope_Zaporozhye ACE_TIME_PROGMEM = { kZoneNameEurope_Zaporozhye /*name*/, 0xeab9767f /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Zaporozhye /*eras*/, }; @@ -15170,7 +14835,6 @@ const extended::ZoneInfo kZoneEurope_Zurich ACE_TIME_PROGMEM = { kZoneNameEurope_Zurich /*name*/, 0x7d8195b9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraEurope_Zurich /*eras*/, }; @@ -15205,7 +14869,6 @@ const extended::ZoneInfo kZoneHST ACE_TIME_PROGMEM = { kZoneNameHST /*name*/, 0x0b87f034 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraHST /*eras*/, }; @@ -15240,7 +14903,6 @@ const extended::ZoneInfo kZoneIndian_Chagos ACE_TIME_PROGMEM = { kZoneNameIndian_Chagos /*name*/, 0x456f7c3c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Chagos /*eras*/, }; @@ -15275,7 +14937,6 @@ const extended::ZoneInfo kZoneIndian_Christmas ACE_TIME_PROGMEM = { kZoneNameIndian_Christmas /*name*/, 0x68c207d5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Christmas /*eras*/, }; @@ -15310,7 +14971,6 @@ const extended::ZoneInfo kZoneIndian_Cocos ACE_TIME_PROGMEM = { kZoneNameIndian_Cocos /*name*/, 0x021e86de /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Cocos /*eras*/, }; @@ -15345,7 +15005,6 @@ const extended::ZoneInfo kZoneIndian_Kerguelen ACE_TIME_PROGMEM = { kZoneNameIndian_Kerguelen /*name*/, 0x4351b389 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Kerguelen /*eras*/, }; @@ -15380,7 +15039,6 @@ const extended::ZoneInfo kZoneIndian_Mahe ACE_TIME_PROGMEM = { kZoneNameIndian_Mahe /*name*/, 0x45e725e2 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Mahe /*eras*/, }; @@ -15415,7 +15073,6 @@ const extended::ZoneInfo kZoneIndian_Maldives ACE_TIME_PROGMEM = { kZoneNameIndian_Maldives /*name*/, 0x9869681c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Maldives /*eras*/, }; @@ -15450,7 +15107,6 @@ const extended::ZoneInfo kZoneIndian_Mauritius ACE_TIME_PROGMEM = { kZoneNameIndian_Mauritius /*name*/, 0x7b09c02a /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Mauritius /*eras*/, }; @@ -15485,7 +15141,6 @@ const extended::ZoneInfo kZoneIndian_Reunion ACE_TIME_PROGMEM = { kZoneNameIndian_Reunion /*name*/, 0x7076c047 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraIndian_Reunion /*eras*/, }; @@ -15520,7 +15175,6 @@ const extended::ZoneInfo kZoneMET ACE_TIME_PROGMEM = { kZoneNameMET /*name*/, 0x0b8803ab /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraMET /*eras*/, }; @@ -15555,7 +15209,6 @@ const extended::ZoneInfo kZoneMST ACE_TIME_PROGMEM = { kZoneNameMST /*name*/, 0x0b880579 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraMST /*eras*/, }; @@ -15590,7 +15243,6 @@ const extended::ZoneInfo kZoneMST7MDT ACE_TIME_PROGMEM = { kZoneNameMST7MDT /*name*/, 0xf2af9375 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraMST7MDT /*eras*/, }; @@ -15625,7 +15277,6 @@ const extended::ZoneInfo kZonePST8PDT ACE_TIME_PROGMEM = { kZoneNamePST8PDT /*name*/, 0xd99ee2dc /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPST8PDT /*eras*/, }; @@ -15672,7 +15323,6 @@ const extended::ZoneInfo kZonePacific_Apia ACE_TIME_PROGMEM = { kZoneNamePacific_Apia /*name*/, 0x23359b5e /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraPacific_Apia /*eras*/, }; @@ -15707,7 +15357,6 @@ const extended::ZoneInfo kZonePacific_Auckland ACE_TIME_PROGMEM = { kZoneNamePacific_Auckland /*name*/, 0x25062f86 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Auckland /*eras*/, }; @@ -15754,7 +15403,6 @@ const extended::ZoneInfo kZonePacific_Bougainville ACE_TIME_PROGMEM = { kZoneNamePacific_Bougainville /*name*/, 0x5e10f7a4 /*zoneId*/, &kZoneContext /*zoneContext*/, - 3 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraPacific_Bougainville /*eras*/, }; @@ -15789,7 +15437,6 @@ const extended::ZoneInfo kZonePacific_Chatham ACE_TIME_PROGMEM = { kZoneNamePacific_Chatham /*name*/, 0x2f0de999 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Chatham /*eras*/, }; @@ -15824,7 +15471,6 @@ const extended::ZoneInfo kZonePacific_Chuuk ACE_TIME_PROGMEM = { kZoneNamePacific_Chuuk /*name*/, 0x8a090b23 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Chuuk /*eras*/, }; @@ -15859,7 +15505,6 @@ const extended::ZoneInfo kZonePacific_Easter ACE_TIME_PROGMEM = { kZoneNamePacific_Easter /*name*/, 0xcf54f7e7 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Easter /*eras*/, }; @@ -15894,7 +15539,6 @@ const extended::ZoneInfo kZonePacific_Efate ACE_TIME_PROGMEM = { kZoneNamePacific_Efate /*name*/, 0x8a2bce28 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Efate /*eras*/, }; @@ -15929,7 +15573,6 @@ const extended::ZoneInfo kZonePacific_Enderbury ACE_TIME_PROGMEM = { kZoneNamePacific_Enderbury /*name*/, 0x61599a93 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Enderbury /*eras*/, }; @@ -15976,7 +15619,6 @@ const extended::ZoneInfo kZonePacific_Fakaofo ACE_TIME_PROGMEM = { kZoneNamePacific_Fakaofo /*name*/, 0x06532bba /*zoneId*/, &kZoneContext /*zoneContext*/, - 3 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraPacific_Fakaofo /*eras*/, }; @@ -16011,7 +15653,6 @@ const extended::ZoneInfo kZonePacific_Fiji ACE_TIME_PROGMEM = { kZoneNamePacific_Fiji /*name*/, 0x23383ba5 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Fiji /*eras*/, }; @@ -16046,7 +15687,6 @@ const extended::ZoneInfo kZonePacific_Funafuti ACE_TIME_PROGMEM = { kZoneNamePacific_Funafuti /*name*/, 0xdb402d65 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Funafuti /*eras*/, }; @@ -16081,7 +15721,6 @@ const extended::ZoneInfo kZonePacific_Galapagos ACE_TIME_PROGMEM = { kZoneNamePacific_Galapagos /*name*/, 0xa952f752 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Galapagos /*eras*/, }; @@ -16116,7 +15755,6 @@ const extended::ZoneInfo kZonePacific_Gambier ACE_TIME_PROGMEM = { kZoneNamePacific_Gambier /*name*/, 0x53720c3a /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Gambier /*eras*/, }; @@ -16151,7 +15789,6 @@ const extended::ZoneInfo kZonePacific_Guadalcanal ACE_TIME_PROGMEM = { kZoneNamePacific_Guadalcanal /*name*/, 0xf4dd25f0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Guadalcanal /*eras*/, }; @@ -16198,7 +15835,6 @@ const extended::ZoneInfo kZonePacific_Guam ACE_TIME_PROGMEM = { kZoneNamePacific_Guam /*name*/, 0x2338f9ed /*zoneId*/, &kZoneContext /*zoneContext*/, - 3 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraPacific_Guam /*eras*/, }; @@ -16233,7 +15869,6 @@ const extended::ZoneInfo kZonePacific_Honolulu ACE_TIME_PROGMEM = { kZoneNamePacific_Honolulu /*name*/, 0xe6e70af9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Honolulu /*eras*/, }; @@ -16268,7 +15903,6 @@ const extended::ZoneInfo kZonePacific_Kiritimati ACE_TIME_PROGMEM = { kZoneNamePacific_Kiritimati /*name*/, 0x8305073a /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Kiritimati /*eras*/, }; @@ -16315,7 +15949,6 @@ const extended::ZoneInfo kZonePacific_Kosrae ACE_TIME_PROGMEM = { kZoneNamePacific_Kosrae /*name*/, 0xde5139a8 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraPacific_Kosrae /*eras*/, }; @@ -16350,7 +15983,6 @@ const extended::ZoneInfo kZonePacific_Kwajalein ACE_TIME_PROGMEM = { kZoneNamePacific_Kwajalein /*name*/, 0x8e216759 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Kwajalein /*eras*/, }; @@ -16385,7 +16017,6 @@ const extended::ZoneInfo kZonePacific_Majuro ACE_TIME_PROGMEM = { kZoneNamePacific_Majuro /*name*/, 0xe1f95371 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Majuro /*eras*/, }; @@ -16420,7 +16051,6 @@ const extended::ZoneInfo kZonePacific_Marquesas ACE_TIME_PROGMEM = { kZoneNamePacific_Marquesas /*name*/, 0x57ca7135 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Marquesas /*eras*/, }; @@ -16455,7 +16085,6 @@ const extended::ZoneInfo kZonePacific_Nauru ACE_TIME_PROGMEM = { kZoneNamePacific_Nauru /*name*/, 0x8acc41ae /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Nauru /*eras*/, }; @@ -16490,7 +16119,6 @@ const extended::ZoneInfo kZonePacific_Niue ACE_TIME_PROGMEM = { kZoneNamePacific_Niue /*name*/, 0x233ca014 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Niue /*eras*/, }; @@ -16549,7 +16177,6 @@ const extended::ZoneInfo kZonePacific_Norfolk ACE_TIME_PROGMEM = { kZoneNamePacific_Norfolk /*name*/, 0x8f4eb4be /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*transitionBufSize*/, 3 /*numEras*/, kZoneEraPacific_Norfolk /*eras*/, }; @@ -16584,7 +16211,6 @@ const extended::ZoneInfo kZonePacific_Noumea ACE_TIME_PROGMEM = { kZoneNamePacific_Noumea /*name*/, 0xe551b788 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Noumea /*eras*/, }; @@ -16619,7 +16245,6 @@ const extended::ZoneInfo kZonePacific_Pago_Pago ACE_TIME_PROGMEM = { kZoneNamePacific_Pago_Pago /*name*/, 0x603aebd0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Pago_Pago /*eras*/, }; @@ -16654,7 +16279,6 @@ const extended::ZoneInfo kZonePacific_Palau ACE_TIME_PROGMEM = { kZoneNamePacific_Palau /*name*/, 0x8af04a36 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Palau /*eras*/, }; @@ -16689,7 +16313,6 @@ const extended::ZoneInfo kZonePacific_Pitcairn ACE_TIME_PROGMEM = { kZoneNamePacific_Pitcairn /*name*/, 0x8837d8bd /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Pitcairn /*eras*/, }; @@ -16724,7 +16347,6 @@ const extended::ZoneInfo kZonePacific_Pohnpei ACE_TIME_PROGMEM = { kZoneNamePacific_Pohnpei /*name*/, 0x28929f96 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Pohnpei /*eras*/, }; @@ -16759,7 +16381,6 @@ const extended::ZoneInfo kZonePacific_Port_Moresby ACE_TIME_PROGMEM = { kZoneNamePacific_Port_Moresby /*name*/, 0xa7ba7f68 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Port_Moresby /*eras*/, }; @@ -16794,7 +16415,6 @@ const extended::ZoneInfo kZonePacific_Rarotonga ACE_TIME_PROGMEM = { kZoneNamePacific_Rarotonga /*name*/, 0x9981a3b0 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Rarotonga /*eras*/, }; @@ -16829,7 +16449,6 @@ const extended::ZoneInfo kZonePacific_Tahiti ACE_TIME_PROGMEM = { kZoneNamePacific_Tahiti /*name*/, 0xf24c2446 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Tahiti /*eras*/, }; @@ -16864,7 +16483,6 @@ const extended::ZoneInfo kZonePacific_Tarawa ACE_TIME_PROGMEM = { kZoneNamePacific_Tarawa /*name*/, 0xf2517e63 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Tarawa /*eras*/, }; @@ -16911,7 +16529,6 @@ const extended::ZoneInfo kZonePacific_Tongatapu ACE_TIME_PROGMEM = { kZoneNamePacific_Tongatapu /*name*/, 0x262ca836 /*zoneId*/, &kZoneContext /*zoneContext*/, - 6 /*transitionBufSize*/, 2 /*numEras*/, kZoneEraPacific_Tongatapu /*eras*/, }; @@ -16946,7 +16563,6 @@ const extended::ZoneInfo kZonePacific_Wake ACE_TIME_PROGMEM = { kZoneNamePacific_Wake /*name*/, 0x23416c2b /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Wake /*eras*/, }; @@ -16981,7 +16597,6 @@ const extended::ZoneInfo kZonePacific_Wallis ACE_TIME_PROGMEM = { kZoneNamePacific_Wallis /*name*/, 0xf94ddb0f /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraPacific_Wallis /*eras*/, }; @@ -17016,7 +16631,6 @@ const extended::ZoneInfo kZoneWET ACE_TIME_PROGMEM = { kZoneNameWET /*name*/, 0x0b882e35 /*zoneId*/, &kZoneContext /*zoneContext*/, - 5 /*transitionBufSize*/, 1 /*numEras*/, kZoneEraWET /*eras*/, }; diff --git a/src/ace_time/zonedbx/zone_infos.h b/src/ace_time/zonedbx/zone_infos.h index b5c517ec0..b246929d5 100644 --- a/src/ace_time/zonedbx/zone_infos.h +++ b/src/ace_time/zonedbx/zone_infos.h @@ -1039,6 +1039,402 @@ extern const extended::ZoneInfo& kZoneZulu; // Zulu -> Etc/UTC +//--------------------------------------------------------------------------- +// Estimated size of the Transition buffer in ExtendedZoneProcessor for each +// zone. Used only in the tests/validation/Extended*Test tests for +// ExtendedZoneProcessor. This used to be included in the ZoneInfo data struct +// above, but it is used only for tests, so pulling them out to these constants +// means that they take up no permanent storage space. +//--------------------------------------------------------------------------- + +const uint8_t kZoneBufSizeAfrica_Abidjan = 2; // Africa/Abidjan +const uint8_t kZoneBufSizeAfrica_Accra = 2; // Africa/Accra +const uint8_t kZoneBufSizeAfrica_Algiers = 2; // Africa/Algiers +const uint8_t kZoneBufSizeAfrica_Bissau = 2; // Africa/Bissau +const uint8_t kZoneBufSizeAfrica_Cairo = 6; // Africa/Cairo +const uint8_t kZoneBufSizeAfrica_Casablanca = 7; // Africa/Casablanca +const uint8_t kZoneBufSizeAfrica_Ceuta = 5; // Africa/Ceuta +const uint8_t kZoneBufSizeAfrica_El_Aaiun = 7; // Africa/El_Aaiun +const uint8_t kZoneBufSizeAfrica_Johannesburg = 2; // Africa/Johannesburg +const uint8_t kZoneBufSizeAfrica_Juba = 3; // Africa/Juba +const uint8_t kZoneBufSizeAfrica_Khartoum = 3; // Africa/Khartoum +const uint8_t kZoneBufSizeAfrica_Lagos = 2; // Africa/Lagos +const uint8_t kZoneBufSizeAfrica_Maputo = 2; // Africa/Maputo +const uint8_t kZoneBufSizeAfrica_Monrovia = 2; // Africa/Monrovia +const uint8_t kZoneBufSizeAfrica_Nairobi = 2; // Africa/Nairobi +const uint8_t kZoneBufSizeAfrica_Ndjamena = 2; // Africa/Ndjamena +const uint8_t kZoneBufSizeAfrica_Sao_Tome = 4; // Africa/Sao_Tome +const uint8_t kZoneBufSizeAfrica_Tripoli = 4; // Africa/Tripoli +const uint8_t kZoneBufSizeAfrica_Tunis = 5; // Africa/Tunis +const uint8_t kZoneBufSizeAfrica_Windhoek = 4; // Africa/Windhoek +const uint8_t kZoneBufSizeAmerica_Adak = 6; // America/Adak +const uint8_t kZoneBufSizeAmerica_Anchorage = 6; // America/Anchorage +const uint8_t kZoneBufSizeAmerica_Araguaina = 5; // America/Araguaina +const uint8_t kZoneBufSizeAmerica_Argentina_Buenos_Aires = 6; // America/Argentina/Buenos_Aires +const uint8_t kZoneBufSizeAmerica_Argentina_Catamarca = 5; // America/Argentina/Catamarca +const uint8_t kZoneBufSizeAmerica_Argentina_Cordoba = 6; // America/Argentina/Cordoba +const uint8_t kZoneBufSizeAmerica_Argentina_Jujuy = 5; // America/Argentina/Jujuy +const uint8_t kZoneBufSizeAmerica_Argentina_La_Rioja = 5; // America/Argentina/La_Rioja +const uint8_t kZoneBufSizeAmerica_Argentina_Mendoza = 5; // America/Argentina/Mendoza +const uint8_t kZoneBufSizeAmerica_Argentina_Rio_Gallegos = 5; // America/Argentina/Rio_Gallegos +const uint8_t kZoneBufSizeAmerica_Argentina_Salta = 5; // America/Argentina/Salta +const uint8_t kZoneBufSizeAmerica_Argentina_San_Juan = 5; // America/Argentina/San_Juan +const uint8_t kZoneBufSizeAmerica_Argentina_San_Luis = 7; // America/Argentina/San_Luis +const uint8_t kZoneBufSizeAmerica_Argentina_Tucuman = 6; // America/Argentina/Tucuman +const uint8_t kZoneBufSizeAmerica_Argentina_Ushuaia = 5; // America/Argentina/Ushuaia +const uint8_t kZoneBufSizeAmerica_Asuncion = 5; // America/Asuncion +const uint8_t kZoneBufSizeAmerica_Atikokan = 2; // America/Atikokan +const uint8_t kZoneBufSizeAmerica_Bahia = 5; // America/Bahia +const uint8_t kZoneBufSizeAmerica_Bahia_Banderas = 5; // America/Bahia_Banderas +const uint8_t kZoneBufSizeAmerica_Barbados = 2; // America/Barbados +const uint8_t kZoneBufSizeAmerica_Belem = 2; // America/Belem +const uint8_t kZoneBufSizeAmerica_Belize = 2; // America/Belize +const uint8_t kZoneBufSizeAmerica_Blanc_Sablon = 2; // America/Blanc-Sablon +const uint8_t kZoneBufSizeAmerica_Boa_Vista = 5; // America/Boa_Vista +const uint8_t kZoneBufSizeAmerica_Bogota = 2; // America/Bogota +const uint8_t kZoneBufSizeAmerica_Boise = 6; // America/Boise +const uint8_t kZoneBufSizeAmerica_Cambridge_Bay = 6; // America/Cambridge_Bay +const uint8_t kZoneBufSizeAmerica_Campo_Grande = 6; // America/Campo_Grande +const uint8_t kZoneBufSizeAmerica_Cancun = 4; // America/Cancun +const uint8_t kZoneBufSizeAmerica_Caracas = 3; // America/Caracas +const uint8_t kZoneBufSizeAmerica_Cayenne = 2; // America/Cayenne +const uint8_t kZoneBufSizeAmerica_Chicago = 6; // America/Chicago +const uint8_t kZoneBufSizeAmerica_Chihuahua = 4; // America/Chihuahua +const uint8_t kZoneBufSizeAmerica_Costa_Rica = 2; // America/Costa_Rica +const uint8_t kZoneBufSizeAmerica_Creston = 2; // America/Creston +const uint8_t kZoneBufSizeAmerica_Cuiaba = 6; // America/Cuiaba +const uint8_t kZoneBufSizeAmerica_Curacao = 2; // America/Curacao +const uint8_t kZoneBufSizeAmerica_Danmarkshavn = 2; // America/Danmarkshavn +const uint8_t kZoneBufSizeAmerica_Dawson = 6; // America/Dawson +const uint8_t kZoneBufSizeAmerica_Dawson_Creek = 2; // America/Dawson_Creek +const uint8_t kZoneBufSizeAmerica_Denver = 6; // America/Denver +const uint8_t kZoneBufSizeAmerica_Detroit = 6; // America/Detroit +const uint8_t kZoneBufSizeAmerica_Edmonton = 6; // America/Edmonton +const uint8_t kZoneBufSizeAmerica_Eirunepe = 3; // America/Eirunepe +const uint8_t kZoneBufSizeAmerica_El_Salvador = 2; // America/El_Salvador +const uint8_t kZoneBufSizeAmerica_Fort_Nelson = 6; // America/Fort_Nelson +const uint8_t kZoneBufSizeAmerica_Fortaleza = 5; // America/Fortaleza +const uint8_t kZoneBufSizeAmerica_Glace_Bay = 6; // America/Glace_Bay +const uint8_t kZoneBufSizeAmerica_Goose_Bay = 6; // America/Goose_Bay +const uint8_t kZoneBufSizeAmerica_Grand_Turk = 6; // America/Grand_Turk +const uint8_t kZoneBufSizeAmerica_Guatemala = 4; // America/Guatemala +const uint8_t kZoneBufSizeAmerica_Guayaquil = 2; // America/Guayaquil +const uint8_t kZoneBufSizeAmerica_Guyana = 2; // America/Guyana +const uint8_t kZoneBufSizeAmerica_Halifax = 6; // America/Halifax +const uint8_t kZoneBufSizeAmerica_Havana = 6; // America/Havana +const uint8_t kZoneBufSizeAmerica_Hermosillo = 2; // America/Hermosillo +const uint8_t kZoneBufSizeAmerica_Indiana_Indianapolis = 6; // America/Indiana/Indianapolis +const uint8_t kZoneBufSizeAmerica_Indiana_Knox = 6; // America/Indiana/Knox +const uint8_t kZoneBufSizeAmerica_Indiana_Marengo = 6; // America/Indiana/Marengo +const uint8_t kZoneBufSizeAmerica_Indiana_Petersburg = 6; // America/Indiana/Petersburg +const uint8_t kZoneBufSizeAmerica_Indiana_Tell_City = 6; // America/Indiana/Tell_City +const uint8_t kZoneBufSizeAmerica_Indiana_Vevay = 6; // America/Indiana/Vevay +const uint8_t kZoneBufSizeAmerica_Indiana_Vincennes = 6; // America/Indiana/Vincennes +const uint8_t kZoneBufSizeAmerica_Indiana_Winamac = 6; // America/Indiana/Winamac +const uint8_t kZoneBufSizeAmerica_Inuvik = 6; // America/Inuvik +const uint8_t kZoneBufSizeAmerica_Iqaluit = 6; // America/Iqaluit +const uint8_t kZoneBufSizeAmerica_Jamaica = 2; // America/Jamaica +const uint8_t kZoneBufSizeAmerica_Juneau = 6; // America/Juneau +const uint8_t kZoneBufSizeAmerica_Kentucky_Louisville = 6; // America/Kentucky/Louisville +const uint8_t kZoneBufSizeAmerica_Kentucky_Monticello = 6; // America/Kentucky/Monticello +const uint8_t kZoneBufSizeAmerica_La_Paz = 2; // America/La_Paz +const uint8_t kZoneBufSizeAmerica_Lima = 2; // America/Lima +const uint8_t kZoneBufSizeAmerica_Los_Angeles = 6; // America/Los_Angeles +const uint8_t kZoneBufSizeAmerica_Maceio = 5; // America/Maceio +const uint8_t kZoneBufSizeAmerica_Managua = 4; // America/Managua +const uint8_t kZoneBufSizeAmerica_Manaus = 2; // America/Manaus +const uint8_t kZoneBufSizeAmerica_Martinique = 2; // America/Martinique +const uint8_t kZoneBufSizeAmerica_Matamoros = 6; // America/Matamoros +const uint8_t kZoneBufSizeAmerica_Mazatlan = 4; // America/Mazatlan +const uint8_t kZoneBufSizeAmerica_Menominee = 6; // America/Menominee +const uint8_t kZoneBufSizeAmerica_Merida = 4; // America/Merida +const uint8_t kZoneBufSizeAmerica_Metlakatla = 6; // America/Metlakatla +const uint8_t kZoneBufSizeAmerica_Mexico_City = 5; // America/Mexico_City +const uint8_t kZoneBufSizeAmerica_Miquelon = 6; // America/Miquelon +const uint8_t kZoneBufSizeAmerica_Moncton = 6; // America/Moncton +const uint8_t kZoneBufSizeAmerica_Monterrey = 4; // America/Monterrey +const uint8_t kZoneBufSizeAmerica_Montevideo = 5; // America/Montevideo +const uint8_t kZoneBufSizeAmerica_Nassau = 6; // America/Nassau +const uint8_t kZoneBufSizeAmerica_New_York = 6; // America/New_York +const uint8_t kZoneBufSizeAmerica_Nipigon = 6; // America/Nipigon +const uint8_t kZoneBufSizeAmerica_Nome = 6; // America/Nome +const uint8_t kZoneBufSizeAmerica_Noronha = 5; // America/Noronha +const uint8_t kZoneBufSizeAmerica_North_Dakota_Beulah = 6; // America/North_Dakota/Beulah +const uint8_t kZoneBufSizeAmerica_North_Dakota_Center = 6; // America/North_Dakota/Center +const uint8_t kZoneBufSizeAmerica_North_Dakota_New_Salem = 6; // America/North_Dakota/New_Salem +const uint8_t kZoneBufSizeAmerica_Nuuk = 5; // America/Nuuk +const uint8_t kZoneBufSizeAmerica_Ojinaga = 6; // America/Ojinaga +const uint8_t kZoneBufSizeAmerica_Panama = 2; // America/Panama +const uint8_t kZoneBufSizeAmerica_Pangnirtung = 6; // America/Pangnirtung +const uint8_t kZoneBufSizeAmerica_Paramaribo = 2; // America/Paramaribo +const uint8_t kZoneBufSizeAmerica_Phoenix = 2; // America/Phoenix +const uint8_t kZoneBufSizeAmerica_Port_au_Prince = 6; // America/Port-au-Prince +const uint8_t kZoneBufSizeAmerica_Port_of_Spain = 2; // America/Port_of_Spain +const uint8_t kZoneBufSizeAmerica_Porto_Velho = 2; // America/Porto_Velho +const uint8_t kZoneBufSizeAmerica_Puerto_Rico = 2; // America/Puerto_Rico +const uint8_t kZoneBufSizeAmerica_Punta_Arenas = 5; // America/Punta_Arenas +const uint8_t kZoneBufSizeAmerica_Rainy_River = 6; // America/Rainy_River +const uint8_t kZoneBufSizeAmerica_Rankin_Inlet = 6; // America/Rankin_Inlet +const uint8_t kZoneBufSizeAmerica_Recife = 5; // America/Recife +const uint8_t kZoneBufSizeAmerica_Regina = 2; // America/Regina +const uint8_t kZoneBufSizeAmerica_Resolute = 6; // America/Resolute +const uint8_t kZoneBufSizeAmerica_Rio_Branco = 3; // America/Rio_Branco +const uint8_t kZoneBufSizeAmerica_Santarem = 3; // America/Santarem +const uint8_t kZoneBufSizeAmerica_Santiago = 5; // America/Santiago +const uint8_t kZoneBufSizeAmerica_Santo_Domingo = 4; // America/Santo_Domingo +const uint8_t kZoneBufSizeAmerica_Sao_Paulo = 6; // America/Sao_Paulo +const uint8_t kZoneBufSizeAmerica_Scoresbysund = 5; // America/Scoresbysund +const uint8_t kZoneBufSizeAmerica_Sitka = 6; // America/Sitka +const uint8_t kZoneBufSizeAmerica_St_Johns = 6; // America/St_Johns +const uint8_t kZoneBufSizeAmerica_Swift_Current = 2; // America/Swift_Current +const uint8_t kZoneBufSizeAmerica_Tegucigalpa = 4; // America/Tegucigalpa +const uint8_t kZoneBufSizeAmerica_Thule = 6; // America/Thule +const uint8_t kZoneBufSizeAmerica_Thunder_Bay = 6; // America/Thunder_Bay +const uint8_t kZoneBufSizeAmerica_Tijuana = 6; // America/Tijuana +const uint8_t kZoneBufSizeAmerica_Toronto = 6; // America/Toronto +const uint8_t kZoneBufSizeAmerica_Vancouver = 6; // America/Vancouver +const uint8_t kZoneBufSizeAmerica_Whitehorse = 6; // America/Whitehorse +const uint8_t kZoneBufSizeAmerica_Winnipeg = 6; // America/Winnipeg +const uint8_t kZoneBufSizeAmerica_Yakutat = 6; // America/Yakutat +const uint8_t kZoneBufSizeAmerica_Yellowknife = 6; // America/Yellowknife +const uint8_t kZoneBufSizeAntarctica_Casey = 4; // Antarctica/Casey +const uint8_t kZoneBufSizeAntarctica_Davis = 3; // Antarctica/Davis +const uint8_t kZoneBufSizeAntarctica_DumontDUrville = 2; // Antarctica/DumontDUrville +const uint8_t kZoneBufSizeAntarctica_Macquarie = 5; // Antarctica/Macquarie +const uint8_t kZoneBufSizeAntarctica_Mawson = 3; // Antarctica/Mawson +const uint8_t kZoneBufSizeAntarctica_Palmer = 5; // Antarctica/Palmer +const uint8_t kZoneBufSizeAntarctica_Rothera = 2; // Antarctica/Rothera +const uint8_t kZoneBufSizeAntarctica_Syowa = 2; // Antarctica/Syowa +const uint8_t kZoneBufSizeAntarctica_Troll = 6; // Antarctica/Troll +const uint8_t kZoneBufSizeAntarctica_Vostok = 2; // Antarctica/Vostok +const uint8_t kZoneBufSizeAsia_Almaty = 5; // Asia/Almaty +const uint8_t kZoneBufSizeAsia_Amman = 6; // Asia/Amman +const uint8_t kZoneBufSizeAsia_Anadyr = 5; // Asia/Anadyr +const uint8_t kZoneBufSizeAsia_Aqtau = 5; // Asia/Aqtau +const uint8_t kZoneBufSizeAsia_Aqtobe = 5; // Asia/Aqtobe +const uint8_t kZoneBufSizeAsia_Ashgabat = 2; // Asia/Ashgabat +const uint8_t kZoneBufSizeAsia_Atyrau = 6; // Asia/Atyrau +const uint8_t kZoneBufSizeAsia_Baghdad = 4; // Asia/Baghdad +const uint8_t kZoneBufSizeAsia_Baku = 5; // Asia/Baku +const uint8_t kZoneBufSizeAsia_Bangkok = 2; // Asia/Bangkok +const uint8_t kZoneBufSizeAsia_Barnaul = 5; // Asia/Barnaul +const uint8_t kZoneBufSizeAsia_Beirut = 5; // Asia/Beirut +const uint8_t kZoneBufSizeAsia_Bishkek = 5; // Asia/Bishkek +const uint8_t kZoneBufSizeAsia_Brunei = 2; // Asia/Brunei +const uint8_t kZoneBufSizeAsia_Chita = 5; // Asia/Chita +const uint8_t kZoneBufSizeAsia_Choibalsan = 5; // Asia/Choibalsan +const uint8_t kZoneBufSizeAsia_Colombo = 3; // Asia/Colombo +const uint8_t kZoneBufSizeAsia_Damascus = 6; // Asia/Damascus +const uint8_t kZoneBufSizeAsia_Dhaka = 5; // Asia/Dhaka +const uint8_t kZoneBufSizeAsia_Dili = 3; // Asia/Dili +const uint8_t kZoneBufSizeAsia_Dubai = 2; // Asia/Dubai +const uint8_t kZoneBufSizeAsia_Dushanbe = 2; // Asia/Dushanbe +const uint8_t kZoneBufSizeAsia_Famagusta = 5; // Asia/Famagusta +const uint8_t kZoneBufSizeAsia_Gaza = 7; // Asia/Gaza +const uint8_t kZoneBufSizeAsia_Hebron = 7; // Asia/Hebron +const uint8_t kZoneBufSizeAsia_Ho_Chi_Minh = 2; // Asia/Ho_Chi_Minh +const uint8_t kZoneBufSizeAsia_Hong_Kong = 2; // Asia/Hong_Kong +const uint8_t kZoneBufSizeAsia_Hovd = 5; // Asia/Hovd +const uint8_t kZoneBufSizeAsia_Irkutsk = 5; // Asia/Irkutsk +const uint8_t kZoneBufSizeAsia_Jakarta = 2; // Asia/Jakarta +const uint8_t kZoneBufSizeAsia_Jayapura = 2; // Asia/Jayapura +const uint8_t kZoneBufSizeAsia_Jerusalem = 5; // Asia/Jerusalem +const uint8_t kZoneBufSizeAsia_Kabul = 2; // Asia/Kabul +const uint8_t kZoneBufSizeAsia_Kamchatka = 5; // Asia/Kamchatka +const uint8_t kZoneBufSizeAsia_Karachi = 5; // Asia/Karachi +const uint8_t kZoneBufSizeAsia_Kathmandu = 2; // Asia/Kathmandu +const uint8_t kZoneBufSizeAsia_Khandyga = 6; // Asia/Khandyga +const uint8_t kZoneBufSizeAsia_Kolkata = 2; // Asia/Kolkata +const uint8_t kZoneBufSizeAsia_Krasnoyarsk = 5; // Asia/Krasnoyarsk +const uint8_t kZoneBufSizeAsia_Kuala_Lumpur = 2; // Asia/Kuala_Lumpur +const uint8_t kZoneBufSizeAsia_Kuching = 2; // Asia/Kuching +const uint8_t kZoneBufSizeAsia_Macau = 2; // Asia/Macau +const uint8_t kZoneBufSizeAsia_Magadan = 5; // Asia/Magadan +const uint8_t kZoneBufSizeAsia_Makassar = 2; // Asia/Makassar +const uint8_t kZoneBufSizeAsia_Manila = 2; // Asia/Manila +const uint8_t kZoneBufSizeAsia_Nicosia = 5; // Asia/Nicosia +const uint8_t kZoneBufSizeAsia_Novokuznetsk = 5; // Asia/Novokuznetsk +const uint8_t kZoneBufSizeAsia_Novosibirsk = 5; // Asia/Novosibirsk +const uint8_t kZoneBufSizeAsia_Omsk = 5; // Asia/Omsk +const uint8_t kZoneBufSizeAsia_Oral = 5; // Asia/Oral +const uint8_t kZoneBufSizeAsia_Pontianak = 2; // Asia/Pontianak +const uint8_t kZoneBufSizeAsia_Pyongyang = 3; // Asia/Pyongyang +const uint8_t kZoneBufSizeAsia_Qatar = 2; // Asia/Qatar +const uint8_t kZoneBufSizeAsia_Qostanay = 5; // Asia/Qostanay +const uint8_t kZoneBufSizeAsia_Qyzylorda = 5; // Asia/Qyzylorda +const uint8_t kZoneBufSizeAsia_Riyadh = 2; // Asia/Riyadh +const uint8_t kZoneBufSizeAsia_Sakhalin = 5; // Asia/Sakhalin +const uint8_t kZoneBufSizeAsia_Samarkand = 2; // Asia/Samarkand +const uint8_t kZoneBufSizeAsia_Seoul = 2; // Asia/Seoul +const uint8_t kZoneBufSizeAsia_Shanghai = 2; // Asia/Shanghai +const uint8_t kZoneBufSizeAsia_Singapore = 2; // Asia/Singapore +const uint8_t kZoneBufSizeAsia_Srednekolymsk = 5; // Asia/Srednekolymsk +const uint8_t kZoneBufSizeAsia_Taipei = 2; // Asia/Taipei +const uint8_t kZoneBufSizeAsia_Tashkent = 2; // Asia/Tashkent +const uint8_t kZoneBufSizeAsia_Tbilisi = 6; // Asia/Tbilisi +const uint8_t kZoneBufSizeAsia_Tehran = 5; // Asia/Tehran +const uint8_t kZoneBufSizeAsia_Thimphu = 2; // Asia/Thimphu +const uint8_t kZoneBufSizeAsia_Tokyo = 2; // Asia/Tokyo +const uint8_t kZoneBufSizeAsia_Tomsk = 6; // Asia/Tomsk +const uint8_t kZoneBufSizeAsia_Ulaanbaatar = 5; // Asia/Ulaanbaatar +const uint8_t kZoneBufSizeAsia_Urumqi = 2; // Asia/Urumqi +const uint8_t kZoneBufSizeAsia_Ust_Nera = 5; // Asia/Ust-Nera +const uint8_t kZoneBufSizeAsia_Vladivostok = 5; // Asia/Vladivostok +const uint8_t kZoneBufSizeAsia_Yakutsk = 5; // Asia/Yakutsk +const uint8_t kZoneBufSizeAsia_Yangon = 2; // Asia/Yangon +const uint8_t kZoneBufSizeAsia_Yekaterinburg = 5; // Asia/Yekaterinburg +const uint8_t kZoneBufSizeAsia_Yerevan = 6; // Asia/Yerevan +const uint8_t kZoneBufSizeAtlantic_Azores = 5; // Atlantic/Azores +const uint8_t kZoneBufSizeAtlantic_Bermuda = 6; // Atlantic/Bermuda +const uint8_t kZoneBufSizeAtlantic_Canary = 5; // Atlantic/Canary +const uint8_t kZoneBufSizeAtlantic_Cape_Verde = 2; // Atlantic/Cape_Verde +const uint8_t kZoneBufSizeAtlantic_Faroe = 5; // Atlantic/Faroe +const uint8_t kZoneBufSizeAtlantic_Madeira = 5; // Atlantic/Madeira +const uint8_t kZoneBufSizeAtlantic_Reykjavik = 2; // Atlantic/Reykjavik +const uint8_t kZoneBufSizeAtlantic_South_Georgia = 2; // Atlantic/South_Georgia +const uint8_t kZoneBufSizeAtlantic_Stanley = 4; // Atlantic/Stanley +const uint8_t kZoneBufSizeAustralia_Adelaide = 5; // Australia/Adelaide +const uint8_t kZoneBufSizeAustralia_Brisbane = 2; // Australia/Brisbane +const uint8_t kZoneBufSizeAustralia_Broken_Hill = 6; // Australia/Broken_Hill +const uint8_t kZoneBufSizeAustralia_Darwin = 2; // Australia/Darwin +const uint8_t kZoneBufSizeAustralia_Eucla = 6; // Australia/Eucla +const uint8_t kZoneBufSizeAustralia_Hobart = 5; // Australia/Hobart +const uint8_t kZoneBufSizeAustralia_Lindeman = 2; // Australia/Lindeman +const uint8_t kZoneBufSizeAustralia_Lord_Howe = 5; // Australia/Lord_Howe +const uint8_t kZoneBufSizeAustralia_Melbourne = 5; // Australia/Melbourne +const uint8_t kZoneBufSizeAustralia_Perth = 6; // Australia/Perth +const uint8_t kZoneBufSizeAustralia_Sydney = 5; // Australia/Sydney +const uint8_t kZoneBufSizeCET = 5; // CET +const uint8_t kZoneBufSizeCST6CDT = 6; // CST6CDT +const uint8_t kZoneBufSizeEET = 5; // EET +const uint8_t kZoneBufSizeEST = 2; // EST +const uint8_t kZoneBufSizeEST5EDT = 6; // EST5EDT +const uint8_t kZoneBufSizeEtc_GMT = 2; // Etc/GMT +const uint8_t kZoneBufSizeEtc_GMT_PLUS_1 = 2; // Etc/GMT+1 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_10 = 2; // Etc/GMT+10 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_11 = 2; // Etc/GMT+11 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_12 = 2; // Etc/GMT+12 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_2 = 2; // Etc/GMT+2 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_3 = 2; // Etc/GMT+3 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_4 = 2; // Etc/GMT+4 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_5 = 2; // Etc/GMT+5 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_6 = 2; // Etc/GMT+6 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_7 = 2; // Etc/GMT+7 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_8 = 2; // Etc/GMT+8 +const uint8_t kZoneBufSizeEtc_GMT_PLUS_9 = 2; // Etc/GMT+9 +const uint8_t kZoneBufSizeEtc_GMT_1 = 2; // Etc/GMT-1 +const uint8_t kZoneBufSizeEtc_GMT_10 = 2; // Etc/GMT-10 +const uint8_t kZoneBufSizeEtc_GMT_11 = 2; // Etc/GMT-11 +const uint8_t kZoneBufSizeEtc_GMT_12 = 2; // Etc/GMT-12 +const uint8_t kZoneBufSizeEtc_GMT_13 = 2; // Etc/GMT-13 +const uint8_t kZoneBufSizeEtc_GMT_14 = 2; // Etc/GMT-14 +const uint8_t kZoneBufSizeEtc_GMT_2 = 2; // Etc/GMT-2 +const uint8_t kZoneBufSizeEtc_GMT_3 = 2; // Etc/GMT-3 +const uint8_t kZoneBufSizeEtc_GMT_4 = 2; // Etc/GMT-4 +const uint8_t kZoneBufSizeEtc_GMT_5 = 2; // Etc/GMT-5 +const uint8_t kZoneBufSizeEtc_GMT_6 = 2; // Etc/GMT-6 +const uint8_t kZoneBufSizeEtc_GMT_7 = 2; // Etc/GMT-7 +const uint8_t kZoneBufSizeEtc_GMT_8 = 2; // Etc/GMT-8 +const uint8_t kZoneBufSizeEtc_GMT_9 = 2; // Etc/GMT-9 +const uint8_t kZoneBufSizeEtc_UTC = 2; // Etc/UTC +const uint8_t kZoneBufSizeEurope_Amsterdam = 5; // Europe/Amsterdam +const uint8_t kZoneBufSizeEurope_Andorra = 5; // Europe/Andorra +const uint8_t kZoneBufSizeEurope_Astrakhan = 5; // Europe/Astrakhan +const uint8_t kZoneBufSizeEurope_Athens = 5; // Europe/Athens +const uint8_t kZoneBufSizeEurope_Belgrade = 5; // Europe/Belgrade +const uint8_t kZoneBufSizeEurope_Berlin = 5; // Europe/Berlin +const uint8_t kZoneBufSizeEurope_Brussels = 5; // Europe/Brussels +const uint8_t kZoneBufSizeEurope_Bucharest = 5; // Europe/Bucharest +const uint8_t kZoneBufSizeEurope_Budapest = 5; // Europe/Budapest +const uint8_t kZoneBufSizeEurope_Chisinau = 5; // Europe/Chisinau +const uint8_t kZoneBufSizeEurope_Copenhagen = 5; // Europe/Copenhagen +const uint8_t kZoneBufSizeEurope_Dublin = 5; // Europe/Dublin +const uint8_t kZoneBufSizeEurope_Gibraltar = 5; // Europe/Gibraltar +const uint8_t kZoneBufSizeEurope_Helsinki = 5; // Europe/Helsinki +const uint8_t kZoneBufSizeEurope_Istanbul = 7; // Europe/Istanbul +const uint8_t kZoneBufSizeEurope_Kaliningrad = 5; // Europe/Kaliningrad +const uint8_t kZoneBufSizeEurope_Kiev = 5; // Europe/Kiev +const uint8_t kZoneBufSizeEurope_Kirov = 5; // Europe/Kirov +const uint8_t kZoneBufSizeEurope_Lisbon = 5; // Europe/Lisbon +const uint8_t kZoneBufSizeEurope_London = 5; // Europe/London +const uint8_t kZoneBufSizeEurope_Luxembourg = 5; // Europe/Luxembourg +const uint8_t kZoneBufSizeEurope_Madrid = 5; // Europe/Madrid +const uint8_t kZoneBufSizeEurope_Malta = 5; // Europe/Malta +const uint8_t kZoneBufSizeEurope_Minsk = 5; // Europe/Minsk +const uint8_t kZoneBufSizeEurope_Monaco = 5; // Europe/Monaco +const uint8_t kZoneBufSizeEurope_Moscow = 5; // Europe/Moscow +const uint8_t kZoneBufSizeEurope_Oslo = 5; // Europe/Oslo +const uint8_t kZoneBufSizeEurope_Paris = 5; // Europe/Paris +const uint8_t kZoneBufSizeEurope_Prague = 5; // Europe/Prague +const uint8_t kZoneBufSizeEurope_Riga = 6; // Europe/Riga +const uint8_t kZoneBufSizeEurope_Rome = 5; // Europe/Rome +const uint8_t kZoneBufSizeEurope_Samara = 5; // Europe/Samara +const uint8_t kZoneBufSizeEurope_Saratov = 5; // Europe/Saratov +const uint8_t kZoneBufSizeEurope_Simferopol = 5; // Europe/Simferopol +const uint8_t kZoneBufSizeEurope_Sofia = 5; // Europe/Sofia +const uint8_t kZoneBufSizeEurope_Stockholm = 5; // Europe/Stockholm +const uint8_t kZoneBufSizeEurope_Tallinn = 6; // Europe/Tallinn +const uint8_t kZoneBufSizeEurope_Tirane = 5; // Europe/Tirane +const uint8_t kZoneBufSizeEurope_Ulyanovsk = 5; // Europe/Ulyanovsk +const uint8_t kZoneBufSizeEurope_Uzhgorod = 5; // Europe/Uzhgorod +const uint8_t kZoneBufSizeEurope_Vienna = 5; // Europe/Vienna +const uint8_t kZoneBufSizeEurope_Vilnius = 6; // Europe/Vilnius +const uint8_t kZoneBufSizeEurope_Volgograd = 5; // Europe/Volgograd +const uint8_t kZoneBufSizeEurope_Warsaw = 5; // Europe/Warsaw +const uint8_t kZoneBufSizeEurope_Zaporozhye = 5; // Europe/Zaporozhye +const uint8_t kZoneBufSizeEurope_Zurich = 5; // Europe/Zurich +const uint8_t kZoneBufSizeHST = 2; // HST +const uint8_t kZoneBufSizeIndian_Chagos = 2; // Indian/Chagos +const uint8_t kZoneBufSizeIndian_Christmas = 2; // Indian/Christmas +const uint8_t kZoneBufSizeIndian_Cocos = 2; // Indian/Cocos +const uint8_t kZoneBufSizeIndian_Kerguelen = 2; // Indian/Kerguelen +const uint8_t kZoneBufSizeIndian_Mahe = 2; // Indian/Mahe +const uint8_t kZoneBufSizeIndian_Maldives = 2; // Indian/Maldives +const uint8_t kZoneBufSizeIndian_Mauritius = 4; // Indian/Mauritius +const uint8_t kZoneBufSizeIndian_Reunion = 2; // Indian/Reunion +const uint8_t kZoneBufSizeMET = 5; // MET +const uint8_t kZoneBufSizeMST = 2; // MST +const uint8_t kZoneBufSizeMST7MDT = 6; // MST7MDT +const uint8_t kZoneBufSizePST8PDT = 6; // PST8PDT +const uint8_t kZoneBufSizePacific_Apia = 5; // Pacific/Apia +const uint8_t kZoneBufSizePacific_Auckland = 5; // Pacific/Auckland +const uint8_t kZoneBufSizePacific_Bougainville = 3; // Pacific/Bougainville +const uint8_t kZoneBufSizePacific_Chatham = 5; // Pacific/Chatham +const uint8_t kZoneBufSizePacific_Chuuk = 2; // Pacific/Chuuk +const uint8_t kZoneBufSizePacific_Easter = 5; // Pacific/Easter +const uint8_t kZoneBufSizePacific_Efate = 2; // Pacific/Efate +const uint8_t kZoneBufSizePacific_Enderbury = 2; // Pacific/Enderbury +const uint8_t kZoneBufSizePacific_Fakaofo = 3; // Pacific/Fakaofo +const uint8_t kZoneBufSizePacific_Fiji = 6; // Pacific/Fiji +const uint8_t kZoneBufSizePacific_Funafuti = 2; // Pacific/Funafuti +const uint8_t kZoneBufSizePacific_Galapagos = 2; // Pacific/Galapagos +const uint8_t kZoneBufSizePacific_Gambier = 2; // Pacific/Gambier +const uint8_t kZoneBufSizePacific_Guadalcanal = 2; // Pacific/Guadalcanal +const uint8_t kZoneBufSizePacific_Guam = 3; // Pacific/Guam +const uint8_t kZoneBufSizePacific_Honolulu = 2; // Pacific/Honolulu +const uint8_t kZoneBufSizePacific_Kiritimati = 2; // Pacific/Kiritimati +const uint8_t kZoneBufSizePacific_Kosrae = 2; // Pacific/Kosrae +const uint8_t kZoneBufSizePacific_Kwajalein = 2; // Pacific/Kwajalein +const uint8_t kZoneBufSizePacific_Majuro = 2; // Pacific/Majuro +const uint8_t kZoneBufSizePacific_Marquesas = 2; // Pacific/Marquesas +const uint8_t kZoneBufSizePacific_Nauru = 2; // Pacific/Nauru +const uint8_t kZoneBufSizePacific_Niue = 2; // Pacific/Niue +const uint8_t kZoneBufSizePacific_Norfolk = 4; // Pacific/Norfolk +const uint8_t kZoneBufSizePacific_Noumea = 2; // Pacific/Noumea +const uint8_t kZoneBufSizePacific_Pago_Pago = 2; // Pacific/Pago_Pago +const uint8_t kZoneBufSizePacific_Palau = 2; // Pacific/Palau +const uint8_t kZoneBufSizePacific_Pitcairn = 2; // Pacific/Pitcairn +const uint8_t kZoneBufSizePacific_Pohnpei = 2; // Pacific/Pohnpei +const uint8_t kZoneBufSizePacific_Port_Moresby = 2; // Pacific/Port_Moresby +const uint8_t kZoneBufSizePacific_Rarotonga = 2; // Pacific/Rarotonga +const uint8_t kZoneBufSizePacific_Tahiti = 2; // Pacific/Tahiti +const uint8_t kZoneBufSizePacific_Tarawa = 2; // Pacific/Tarawa +const uint8_t kZoneBufSizePacific_Tongatapu = 6; // Pacific/Tongatapu +const uint8_t kZoneBufSizePacific_Wake = 2; // Pacific/Wake +const uint8_t kZoneBufSizePacific_Wallis = 2; // Pacific/Wallis +const uint8_t kZoneBufSizeWET = 5; // WET + + //--------------------------------------------------------------------------- // Unsupported zones: 0 //--------------------------------------------------------------------------- From fe80b3ad387c7330d3bfc7a402edd12fa3f7fece Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 17:10:16 -0800 Subject: [PATCH 22/74] MemoryBenchmark: Regenerate after removing 'transitionBufSize' from ZoneInfo --- examples/MemoryBenchmark/README.md | 34 ++++++++++++--------- examples/MemoryBenchmark/generate_readme.py | 6 ++++ examples/MemoryBenchmark/micro.txt | 14 ++++----- examples/MemoryBenchmark/nano.txt | 14 ++++----- 4 files changed, 40 insertions(+), 28 deletions(-) diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index 0baf8c08c..1827bdf5a 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -46,6 +46,12 @@ applications targetted towards 8-bit processors will normally have fixed number of timezones at compile time, so they can avoid using a `ZoneManager`, and avoid this penalty in flash size. +In v1.4.1+, we removed the `ZoneInfo::transitionBufSize` field from the +`ZoneInfo` struct, which saves 1 byte on 8-bit processors (none on 32-bit +processors due to 4-byte alignment). We save 266 bytes for `BasicZoneManager` +and 386 bytes for `ExtendedZoneManager` when all the zones are loaded into the +zone registry. + ## Arduino Nano * Arduino IDE 1.8.13 @@ -61,17 +67,17 @@ this penalty in flash size. | ZonedDateTime | 2440/ 123 | 1992/ 113 | | Manual ZoneManager | 2684/ 123 | 2236/ 113 | | Basic TimeZone (1 zone) | 6910/ 187 | 6462/ 177 | -| Basic TimeZone (2 zones) | 7488/ 193 | 7040/ 183 | +| Basic TimeZone (2 zones) | 7486/ 193 | 7038/ 183 | | Basic ZoneManager (1 zone) | 8428/ 213 | 7980/ 203 | -| Basic ZoneManager (all) | 23206/ 591 | 22758/ 581 | -| Extended TimeZone (1 zone) | 9690/ 187 | 9242/ 177 | -| Extended TimeZone (2 zones) | 10166/ 193 | 9718/ 183 | -| Extended ZoneManager (1 zone) | 11368/ 213 | 10920/ 203 | -| Extended ZoneManager (all) | 36232/ 697 | 35784/ 687 | +| Basic ZoneManager (all) | 22940/ 591 | 22492/ 581 | +| Extended TimeZone (1 zone) | 9688/ 187 | 9240/ 177 | +| Extended TimeZone (2 zones) | 10164/ 193 | 9716/ 183 | +| Extended ZoneManager (1 zone) | 11366/ 213 | 10918/ 203 | +| Extended ZoneManager (all) | 35846/ 697 | 35398/ 687 | |---------------------------------+--------------+-------------| | SystemClock | 5662/ 282 | 5214/ 272 | | SystemClock+Basic TimeZone | 9990/ 334 | 9542/ 324 | -| SystemClock+Extended TimeZone | 12996/ 334 | 12548/ 324 | +| SystemClock+Extended TimeZone | 12994/ 334 | 12546/ 324 | +--------------------------------------------------------------+ ``` @@ -91,17 +97,17 @@ this penalty in flash size. | ZonedDateTime | 5564/ 263 | 2100/ 113 | | Manual ZoneManager | 5808/ 263 | 2344/ 113 | | Basic TimeZone (1 zone) | 10012/ 327 | 6548/ 177 | -| Basic TimeZone (2 zones) | 10588/ 331 | 7124/ 181 | +| Basic TimeZone (2 zones) | 10586/ 331 | 7122/ 181 | | Basic ZoneManager (1 zone) | 11530/ 353 | 8066/ 203 | -| Basic ZoneManager (all) | 26306/ 729 | 22842/ 579 | -| Extended TimeZone (1 zone) | 12792/ 327 | 9328/ 177 | -| Extended TimeZone (2 zones) | 13266/ 331 | 9802/ 181 | -| Extended ZoneManager (1 zone) | 14470/ 353 | 11006/ 203 | -| Extended ZoneManager (all) | 39334/ 837 | 35870/ 687 | +| Basic ZoneManager (all) | 26040/ 729 | 22576/ 579 | +| Extended TimeZone (1 zone) | 12790/ 327 | 9326/ 177 | +| Extended TimeZone (2 zones) | 13264/ 331 | 9800/ 181 | +| Extended ZoneManager (1 zone) | 14468/ 353 | 11004/ 203 | +| Extended ZoneManager (all) | 38948/ 837 | 35484/ 687 | |---------------------------------+--------------+-------------| | SystemClock | 8646/ 422 | 5182/ 272 | | SystemClock+Basic TimeZone | 12974/ 474 | 9510/ 324 | -| SystemClock+Extended TimeZone | 15980/ 474 | 12516/ 324 | +| SystemClock+Extended TimeZone | 15978/ 474 | 12514/ 324 | +--------------------------------------------------------------+ ``` diff --git a/examples/MemoryBenchmark/generate_readme.py b/examples/MemoryBenchmark/generate_readme.py index d53b6cf76..f7eb60af3 100755 --- a/examples/MemoryBenchmark/generate_readme.py +++ b/examples/MemoryBenchmark/generate_readme.py @@ -68,6 +68,12 @@ of timezones at compile time, so they can avoid using a `ZoneManager`, and avoid this penalty in flash size. +In v1.4.1+, we removed the `ZoneInfo::transitionBufSize` field from the +`ZoneInfo` struct, which saves 1 byte on 8-bit processors (none on 32-bit +processors due to 4-byte alignment). We save 266 bytes for `BasicZoneManager` +and 386 bytes for `ExtendedZoneManager` when all the zones are loaded into the +zone registry. + ## Arduino Nano * Arduino IDE 1.8.13 diff --git a/examples/MemoryBenchmark/micro.txt b/examples/MemoryBenchmark/micro.txt index aafc36346..30fda2373 100644 --- a/examples/MemoryBenchmark/micro.txt +++ b/examples/MemoryBenchmark/micro.txt @@ -3,13 +3,13 @@ 2 5564 28672 263 2560 3 5808 28672 263 2560 4 10012 28672 327 2560 -5 10588 28672 331 2560 +5 10586 28672 331 2560 6 11530 28672 353 2560 -7 26306 28672 729 2560 -8 12792 28672 327 2560 -9 13266 28672 331 2560 -10 14470 28672 353 2560 -11 39334 28672 837 2560 +7 26040 28672 729 2560 +8 12790 28672 327 2560 +9 13264 28672 331 2560 +10 14468 28672 353 2560 +11 38948 28672 837 2560 12 8646 28672 422 2560 13 12974 28672 474 2560 -14 15980 28672 474 2560 +14 15978 28672 474 2560 diff --git a/examples/MemoryBenchmark/nano.txt b/examples/MemoryBenchmark/nano.txt index b282e24ef..7b066f453 100644 --- a/examples/MemoryBenchmark/nano.txt +++ b/examples/MemoryBenchmark/nano.txt @@ -3,13 +3,13 @@ 2 2440 30720 123 2048 3 2684 30720 123 2048 4 6910 30720 187 2048 -5 7488 30720 193 2048 +5 7486 30720 193 2048 6 8428 30720 213 2048 -7 23206 30720 591 2048 -8 9690 30720 187 2048 -9 10166 30720 193 2048 -10 11368 30720 213 2048 -11 36232 30720 697 2048 +7 22940 30720 591 2048 +8 9688 30720 187 2048 +9 10164 30720 193 2048 +10 11366 30720 213 2048 +11 35846 30720 697 2048 12 5662 30720 282 2048 13 9990 30720 334 2048 -14 12996 30720 334 2048 +14 12994 30720 334 2048 From 6efff8c229347b08618c1e7438eae36755569776 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 17:15:32 -0800 Subject: [PATCH 23/74] CHANGELOG.md: Add note about removal of 'transitionBufSize' and replacement with 'kZoneBufSize{xxx}' constants --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fd36a461..d3eeb5ddc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,12 @@ that a binary search on the 386 zones in `zonedbx/zone_registry.cpp` is 10X faster (on average) than a linear search through the same list. (Linear search takes ~190 iterations; binary search takes ~9 iterations.) + * Remove `transitionBufSize` from `ZoneInfo` struct, and migrate to + `kZoneBufSize{xxx}` constants in the `zone_infos.h` files. This was used + only in validation tests under `tests/validation` and only for + `Extended{xxx}` tests. Saves 1 byte per Zone on 8-bit processors, but none + on 32-bit processors due to 4-byte alignment. This has no impact on client + code since this field was used only for validation testing. * 1.4.1 (2020-12-30, TZDB version 2020f for real) * Actually update `src/ace_time/zonedb` and `src/ace_time/zonedbx` zone info files to 2020f. Oops. From a58c71a306ca916eab9034be553472b516915edb Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 19:23:25 -0800 Subject: [PATCH 24/74] src/argenerator.py: Decrease sizeof(ZoneInfo) from 12 to 11 on 8-bit processors; regenerate zonedb and zonedbx --- src/ace_time/zonedb/zone_infos.cpp | 534 +++++++++---------- src/ace_time/zonedbx/zone_infos.cpp | 774 ++++++++++++++-------------- tools/generator/argenerator.py | 2 +- 3 files changed, 655 insertions(+), 655 deletions(-) diff --git a/src/ace_time/zonedb/zone_infos.cpp b/src/ace_time/zonedb/zone_infos.cpp index f39ba0d54..b0a5eb3b8 100644 --- a/src/ace_time/zonedb/zone_infos.cpp +++ b/src/ace_time/zonedb/zone_infos.cpp @@ -27,7 +27,7 @@ // Zones: 266 // Links: 183 // Strings (bytes): 5333 -// Memory (8-bit): 11594 +// Memory (8-bit): 11328 // Memory (32-bit): 15117 // // DO NOT EDIT @@ -59,7 +59,7 @@ const basic::ZoneContext kZoneContext = { // Zone name: Africa/Abidjan // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -93,7 +93,7 @@ const basic::ZoneInfo kZoneAfrica_Abidjan ACE_TIME_PROGMEM = { // Zone name: Africa/Algiers // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -127,7 +127,7 @@ const basic::ZoneInfo kZoneAfrica_Algiers ACE_TIME_PROGMEM = { // Zone name: Africa/Bissau // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -161,7 +161,7 @@ const basic::ZoneInfo kZoneAfrica_Bissau ACE_TIME_PROGMEM = { // Zone name: Africa/Ceuta // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -195,7 +195,7 @@ const basic::ZoneInfo kZoneAfrica_Ceuta ACE_TIME_PROGMEM = { // Zone name: Africa/Johannesburg // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -229,7 +229,7 @@ const basic::ZoneInfo kZoneAfrica_Johannesburg ACE_TIME_PROGMEM = { // Zone name: Africa/Lagos // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -263,7 +263,7 @@ const basic::ZoneInfo kZoneAfrica_Lagos ACE_TIME_PROGMEM = { // Zone name: Africa/Maputo // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -297,7 +297,7 @@ const basic::ZoneInfo kZoneAfrica_Maputo ACE_TIME_PROGMEM = { // Zone name: Africa/Monrovia // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -331,7 +331,7 @@ const basic::ZoneInfo kZoneAfrica_Monrovia ACE_TIME_PROGMEM = { // Zone name: Africa/Nairobi // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -365,7 +365,7 @@ const basic::ZoneInfo kZoneAfrica_Nairobi ACE_TIME_PROGMEM = { // Zone name: Africa/Ndjamena // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -399,7 +399,7 @@ const basic::ZoneInfo kZoneAfrica_Ndjamena ACE_TIME_PROGMEM = { // Zone name: Africa/Tunis // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -433,7 +433,7 @@ const basic::ZoneInfo kZoneAfrica_Tunis ACE_TIME_PROGMEM = { // Zone name: America/Adak // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -467,7 +467,7 @@ const basic::ZoneInfo kZoneAmerica_Adak ACE_TIME_PROGMEM = { // Zone name: America/Anchorage // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -501,7 +501,7 @@ const basic::ZoneInfo kZoneAmerica_Anchorage ACE_TIME_PROGMEM = { // Zone name: America/Asuncion // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -535,7 +535,7 @@ const basic::ZoneInfo kZoneAmerica_Asuncion ACE_TIME_PROGMEM = { // Zone name: America/Atikokan // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -569,7 +569,7 @@ const basic::ZoneInfo kZoneAmerica_Atikokan ACE_TIME_PROGMEM = { // Zone name: America/Barbados // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -603,7 +603,7 @@ const basic::ZoneInfo kZoneAmerica_Barbados ACE_TIME_PROGMEM = { // Zone name: America/Belem // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -637,7 +637,7 @@ const basic::ZoneInfo kZoneAmerica_Belem ACE_TIME_PROGMEM = { // Zone name: America/Blanc-Sablon // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -671,7 +671,7 @@ const basic::ZoneInfo kZoneAmerica_Blanc_Sablon ACE_TIME_PROGMEM = { // Zone name: America/Bogota // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -705,7 +705,7 @@ const basic::ZoneInfo kZoneAmerica_Bogota ACE_TIME_PROGMEM = { // Zone name: America/Boise // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -739,7 +739,7 @@ const basic::ZoneInfo kZoneAmerica_Boise ACE_TIME_PROGMEM = { // Zone name: America/Campo_Grande // Zone Eras: 1 // Strings (bytes): 29 -// Memory (8-bit): 52 +// Memory (8-bit): 51 // Memory (32-bit): 65 //--------------------------------------------------------------------------- @@ -773,7 +773,7 @@ const basic::ZoneInfo kZoneAmerica_Campo_Grande ACE_TIME_PROGMEM = { // Zone name: America/Cayenne // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -807,7 +807,7 @@ const basic::ZoneInfo kZoneAmerica_Cayenne ACE_TIME_PROGMEM = { // Zone name: America/Chicago // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -841,7 +841,7 @@ const basic::ZoneInfo kZoneAmerica_Chicago ACE_TIME_PROGMEM = { // Zone name: America/Chihuahua // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -875,7 +875,7 @@ const basic::ZoneInfo kZoneAmerica_Chihuahua ACE_TIME_PROGMEM = { // Zone name: America/Costa_Rica // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -909,7 +909,7 @@ const basic::ZoneInfo kZoneAmerica_Costa_Rica ACE_TIME_PROGMEM = { // Zone name: America/Creston // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -943,7 +943,7 @@ const basic::ZoneInfo kZoneAmerica_Creston ACE_TIME_PROGMEM = { // Zone name: America/Curacao // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -977,7 +977,7 @@ const basic::ZoneInfo kZoneAmerica_Curacao ACE_TIME_PROGMEM = { // Zone name: America/Danmarkshavn // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -1011,7 +1011,7 @@ const basic::ZoneInfo kZoneAmerica_Danmarkshavn ACE_TIME_PROGMEM = { // Zone name: America/Dawson_Creek // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -1045,7 +1045,7 @@ const basic::ZoneInfo kZoneAmerica_Dawson_Creek ACE_TIME_PROGMEM = { // Zone name: America/Denver // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -1079,7 +1079,7 @@ const basic::ZoneInfo kZoneAmerica_Denver ACE_TIME_PROGMEM = { // Zone name: America/Detroit // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -1113,7 +1113,7 @@ const basic::ZoneInfo kZoneAmerica_Detroit ACE_TIME_PROGMEM = { // Zone name: America/Edmonton // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -1147,7 +1147,7 @@ const basic::ZoneInfo kZoneAmerica_Edmonton ACE_TIME_PROGMEM = { // Zone name: America/El_Salvador // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -1181,7 +1181,7 @@ const basic::ZoneInfo kZoneAmerica_El_Salvador ACE_TIME_PROGMEM = { // Zone name: America/Glace_Bay // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -1215,7 +1215,7 @@ const basic::ZoneInfo kZoneAmerica_Glace_Bay ACE_TIME_PROGMEM = { // Zone name: America/Guatemala // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -1249,7 +1249,7 @@ const basic::ZoneInfo kZoneAmerica_Guatemala ACE_TIME_PROGMEM = { // Zone name: America/Guayaquil // Zone Eras: 1 // Strings (bytes): 26 -// Memory (8-bit): 49 +// Memory (8-bit): 48 // Memory (32-bit): 62 //--------------------------------------------------------------------------- @@ -1283,7 +1283,7 @@ const basic::ZoneInfo kZoneAmerica_Guayaquil ACE_TIME_PROGMEM = { // Zone name: America/Guyana // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -1317,7 +1317,7 @@ const basic::ZoneInfo kZoneAmerica_Guyana ACE_TIME_PROGMEM = { // Zone name: America/Halifax // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -1351,7 +1351,7 @@ const basic::ZoneInfo kZoneAmerica_Halifax ACE_TIME_PROGMEM = { // Zone name: America/Havana // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -1385,7 +1385,7 @@ const basic::ZoneInfo kZoneAmerica_Havana ACE_TIME_PROGMEM = { // Zone name: America/Hermosillo // Zone Eras: 2 // Strings (bytes): 27 -// Memory (8-bit): 61 +// Memory (8-bit): 60 // Memory (32-bit): 79 //--------------------------------------------------------------------------- @@ -1431,7 +1431,7 @@ const basic::ZoneInfo kZoneAmerica_Hermosillo ACE_TIME_PROGMEM = { // Zone name: America/Indiana/Indianapolis // Zone Eras: 2 // Strings (bytes): 37 -// Memory (8-bit): 71 +// Memory (8-bit): 70 // Memory (32-bit): 89 //--------------------------------------------------------------------------- @@ -1477,7 +1477,7 @@ const basic::ZoneInfo kZoneAmerica_Indiana_Indianapolis ACE_TIME_PROGMEM = { // Zone name: America/Indiana/Marengo // Zone Eras: 2 // Strings (bytes): 32 -// Memory (8-bit): 66 +// Memory (8-bit): 65 // Memory (32-bit): 84 //--------------------------------------------------------------------------- @@ -1523,7 +1523,7 @@ const basic::ZoneInfo kZoneAmerica_Indiana_Marengo ACE_TIME_PROGMEM = { // Zone name: America/Indiana/Vevay // Zone Eras: 2 // Strings (bytes): 30 -// Memory (8-bit): 64 +// Memory (8-bit): 63 // Memory (32-bit): 82 //--------------------------------------------------------------------------- @@ -1569,7 +1569,7 @@ const basic::ZoneInfo kZoneAmerica_Indiana_Vevay ACE_TIME_PROGMEM = { // Zone name: America/Inuvik // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -1603,7 +1603,7 @@ const basic::ZoneInfo kZoneAmerica_Inuvik ACE_TIME_PROGMEM = { // Zone name: America/Jamaica // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -1637,7 +1637,7 @@ const basic::ZoneInfo kZoneAmerica_Jamaica ACE_TIME_PROGMEM = { // Zone name: America/Juneau // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -1671,7 +1671,7 @@ const basic::ZoneInfo kZoneAmerica_Juneau ACE_TIME_PROGMEM = { // Zone name: America/Kentucky/Louisville // Zone Eras: 1 // Strings (bytes): 32 -// Memory (8-bit): 55 +// Memory (8-bit): 54 // Memory (32-bit): 68 //--------------------------------------------------------------------------- @@ -1705,7 +1705,7 @@ const basic::ZoneInfo kZoneAmerica_Kentucky_Louisville ACE_TIME_PROGMEM = { // Zone name: America/La_Paz // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -1739,7 +1739,7 @@ const basic::ZoneInfo kZoneAmerica_La_Paz ACE_TIME_PROGMEM = { // Zone name: America/Lima // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -1773,7 +1773,7 @@ const basic::ZoneInfo kZoneAmerica_Lima ACE_TIME_PROGMEM = { // Zone name: America/Los_Angeles // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -1807,7 +1807,7 @@ const basic::ZoneInfo kZoneAmerica_Los_Angeles ACE_TIME_PROGMEM = { // Zone name: America/Managua // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -1841,7 +1841,7 @@ const basic::ZoneInfo kZoneAmerica_Managua ACE_TIME_PROGMEM = { // Zone name: America/Manaus // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -1875,7 +1875,7 @@ const basic::ZoneInfo kZoneAmerica_Manaus ACE_TIME_PROGMEM = { // Zone name: America/Martinique // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -1909,7 +1909,7 @@ const basic::ZoneInfo kZoneAmerica_Martinique ACE_TIME_PROGMEM = { // Zone name: America/Matamoros // Zone Eras: 2 // Strings (bytes): 26 -// Memory (8-bit): 60 +// Memory (8-bit): 59 // Memory (32-bit): 78 //--------------------------------------------------------------------------- @@ -1955,7 +1955,7 @@ const basic::ZoneInfo kZoneAmerica_Matamoros ACE_TIME_PROGMEM = { // Zone name: America/Mazatlan // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -1989,7 +1989,7 @@ const basic::ZoneInfo kZoneAmerica_Mazatlan ACE_TIME_PROGMEM = { // Zone name: America/Menominee // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -2023,7 +2023,7 @@ const basic::ZoneInfo kZoneAmerica_Menominee ACE_TIME_PROGMEM = { // Zone name: America/Merida // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -2057,7 +2057,7 @@ const basic::ZoneInfo kZoneAmerica_Merida ACE_TIME_PROGMEM = { // Zone name: America/Miquelon // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -2091,7 +2091,7 @@ const basic::ZoneInfo kZoneAmerica_Miquelon ACE_TIME_PROGMEM = { // Zone name: America/Moncton // Zone Eras: 2 // Strings (bytes): 24 -// Memory (8-bit): 58 +// Memory (8-bit): 57 // Memory (32-bit): 76 //--------------------------------------------------------------------------- @@ -2137,7 +2137,7 @@ const basic::ZoneInfo kZoneAmerica_Moncton ACE_TIME_PROGMEM = { // Zone name: America/Monterrey // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -2171,7 +2171,7 @@ const basic::ZoneInfo kZoneAmerica_Monterrey ACE_TIME_PROGMEM = { // Zone name: America/Montevideo // Zone Eras: 1 // Strings (bytes): 27 -// Memory (8-bit): 50 +// Memory (8-bit): 49 // Memory (32-bit): 63 //--------------------------------------------------------------------------- @@ -2205,7 +2205,7 @@ const basic::ZoneInfo kZoneAmerica_Montevideo ACE_TIME_PROGMEM = { // Zone name: America/Nassau // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -2239,7 +2239,7 @@ const basic::ZoneInfo kZoneAmerica_Nassau ACE_TIME_PROGMEM = { // Zone name: America/New_York // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -2273,7 +2273,7 @@ const basic::ZoneInfo kZoneAmerica_New_York ACE_TIME_PROGMEM = { // Zone name: America/Nipigon // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -2307,7 +2307,7 @@ const basic::ZoneInfo kZoneAmerica_Nipigon ACE_TIME_PROGMEM = { // Zone name: America/Nome // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -2341,7 +2341,7 @@ const basic::ZoneInfo kZoneAmerica_Nome ACE_TIME_PROGMEM = { // Zone name: America/North_Dakota/Center // Zone Eras: 1 // Strings (bytes): 32 -// Memory (8-bit): 55 +// Memory (8-bit): 54 // Memory (32-bit): 68 //--------------------------------------------------------------------------- @@ -2375,7 +2375,7 @@ const basic::ZoneInfo kZoneAmerica_North_Dakota_Center ACE_TIME_PROGMEM = { // Zone name: America/Nuuk // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -2409,7 +2409,7 @@ const basic::ZoneInfo kZoneAmerica_Nuuk ACE_TIME_PROGMEM = { // Zone name: America/Ojinaga // Zone Eras: 2 // Strings (bytes): 24 -// Memory (8-bit): 58 +// Memory (8-bit): 57 // Memory (32-bit): 76 //--------------------------------------------------------------------------- @@ -2455,7 +2455,7 @@ const basic::ZoneInfo kZoneAmerica_Ojinaga ACE_TIME_PROGMEM = { // Zone name: America/Panama // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -2489,7 +2489,7 @@ const basic::ZoneInfo kZoneAmerica_Panama ACE_TIME_PROGMEM = { // Zone name: America/Paramaribo // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -2523,7 +2523,7 @@ const basic::ZoneInfo kZoneAmerica_Paramaribo ACE_TIME_PROGMEM = { // Zone name: America/Phoenix // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -2557,7 +2557,7 @@ const basic::ZoneInfo kZoneAmerica_Phoenix ACE_TIME_PROGMEM = { // Zone name: America/Port-au-Prince // Zone Eras: 1 // Strings (bytes): 27 -// Memory (8-bit): 50 +// Memory (8-bit): 49 // Memory (32-bit): 63 //--------------------------------------------------------------------------- @@ -2591,7 +2591,7 @@ const basic::ZoneInfo kZoneAmerica_Port_au_Prince ACE_TIME_PROGMEM = { // Zone name: America/Port_of_Spain // Zone Eras: 1 // Strings (bytes): 26 -// Memory (8-bit): 49 +// Memory (8-bit): 48 // Memory (32-bit): 62 //--------------------------------------------------------------------------- @@ -2625,7 +2625,7 @@ const basic::ZoneInfo kZoneAmerica_Port_of_Spain ACE_TIME_PROGMEM = { // Zone name: America/Porto_Velho // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -2659,7 +2659,7 @@ const basic::ZoneInfo kZoneAmerica_Porto_Velho ACE_TIME_PROGMEM = { // Zone name: America/Puerto_Rico // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -2693,7 +2693,7 @@ const basic::ZoneInfo kZoneAmerica_Puerto_Rico ACE_TIME_PROGMEM = { // Zone name: America/Rainy_River // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -2727,7 +2727,7 @@ const basic::ZoneInfo kZoneAmerica_Rainy_River ACE_TIME_PROGMEM = { // Zone name: America/Regina // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -2761,7 +2761,7 @@ const basic::ZoneInfo kZoneAmerica_Regina ACE_TIME_PROGMEM = { // Zone name: America/Santiago // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -2795,7 +2795,7 @@ const basic::ZoneInfo kZoneAmerica_Santiago ACE_TIME_PROGMEM = { // Zone name: America/Sao_Paulo // Zone Eras: 1 // Strings (bytes): 26 -// Memory (8-bit): 49 +// Memory (8-bit): 48 // Memory (32-bit): 62 //--------------------------------------------------------------------------- @@ -2829,7 +2829,7 @@ const basic::ZoneInfo kZoneAmerica_Sao_Paulo ACE_TIME_PROGMEM = { // Zone name: America/Scoresbysund // Zone Eras: 1 // Strings (bytes): 29 -// Memory (8-bit): 52 +// Memory (8-bit): 51 // Memory (32-bit): 65 //--------------------------------------------------------------------------- @@ -2863,7 +2863,7 @@ const basic::ZoneInfo kZoneAmerica_Scoresbysund ACE_TIME_PROGMEM = { // Zone name: America/Sitka // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -2897,7 +2897,7 @@ const basic::ZoneInfo kZoneAmerica_Sitka ACE_TIME_PROGMEM = { // Zone name: America/Swift_Current // Zone Eras: 1 // Strings (bytes): 26 -// Memory (8-bit): 49 +// Memory (8-bit): 48 // Memory (32-bit): 62 //--------------------------------------------------------------------------- @@ -2931,7 +2931,7 @@ const basic::ZoneInfo kZoneAmerica_Swift_Current ACE_TIME_PROGMEM = { // Zone name: America/Tegucigalpa // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -2965,7 +2965,7 @@ const basic::ZoneInfo kZoneAmerica_Tegucigalpa ACE_TIME_PROGMEM = { // Zone name: America/Thule // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -2999,7 +2999,7 @@ const basic::ZoneInfo kZoneAmerica_Thule ACE_TIME_PROGMEM = { // Zone name: America/Thunder_Bay // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -3033,7 +3033,7 @@ const basic::ZoneInfo kZoneAmerica_Thunder_Bay ACE_TIME_PROGMEM = { // Zone name: America/Toronto // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -3067,7 +3067,7 @@ const basic::ZoneInfo kZoneAmerica_Toronto ACE_TIME_PROGMEM = { // Zone name: America/Vancouver // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -3101,7 +3101,7 @@ const basic::ZoneInfo kZoneAmerica_Vancouver ACE_TIME_PROGMEM = { // Zone name: America/Winnipeg // Zone Eras: 2 // Strings (bytes): 25 -// Memory (8-bit): 59 +// Memory (8-bit): 58 // Memory (32-bit): 77 //--------------------------------------------------------------------------- @@ -3147,7 +3147,7 @@ const basic::ZoneInfo kZoneAmerica_Winnipeg ACE_TIME_PROGMEM = { // Zone name: America/Yakutat // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -3181,7 +3181,7 @@ const basic::ZoneInfo kZoneAmerica_Yakutat ACE_TIME_PROGMEM = { // Zone name: America/Yellowknife // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -3215,7 +3215,7 @@ const basic::ZoneInfo kZoneAmerica_Yellowknife ACE_TIME_PROGMEM = { // Zone name: Antarctica/DumontDUrville // Zone Eras: 1 // Strings (bytes): 30 -// Memory (8-bit): 53 +// Memory (8-bit): 52 // Memory (32-bit): 66 //--------------------------------------------------------------------------- @@ -3249,7 +3249,7 @@ const basic::ZoneInfo kZoneAntarctica_DumontDUrville ACE_TIME_PROGMEM = { // Zone name: Antarctica/Rothera // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -3283,7 +3283,7 @@ const basic::ZoneInfo kZoneAntarctica_Rothera ACE_TIME_PROGMEM = { // Zone name: Antarctica/Syowa // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -3317,7 +3317,7 @@ const basic::ZoneInfo kZoneAntarctica_Syowa ACE_TIME_PROGMEM = { // Zone name: Antarctica/Vostok // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -3351,7 +3351,7 @@ const basic::ZoneInfo kZoneAntarctica_Vostok ACE_TIME_PROGMEM = { // Zone name: Asia/Amman // Zone Eras: 1 // Strings (bytes): 16 -// Memory (8-bit): 39 +// Memory (8-bit): 38 // Memory (32-bit): 52 //--------------------------------------------------------------------------- @@ -3385,7 +3385,7 @@ const basic::ZoneInfo kZoneAsia_Amman ACE_TIME_PROGMEM = { // Zone name: Asia/Ashgabat // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -3419,7 +3419,7 @@ const basic::ZoneInfo kZoneAsia_Ashgabat ACE_TIME_PROGMEM = { // Zone name: Asia/Baghdad // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -3453,7 +3453,7 @@ const basic::ZoneInfo kZoneAsia_Baghdad ACE_TIME_PROGMEM = { // Zone name: Asia/Baku // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -3487,7 +3487,7 @@ const basic::ZoneInfo kZoneAsia_Baku ACE_TIME_PROGMEM = { // Zone name: Asia/Bangkok // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -3521,7 +3521,7 @@ const basic::ZoneInfo kZoneAsia_Bangkok ACE_TIME_PROGMEM = { // Zone name: Asia/Beirut // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -3555,7 +3555,7 @@ const basic::ZoneInfo kZoneAsia_Beirut ACE_TIME_PROGMEM = { // Zone name: Asia/Brunei // Zone Eras: 1 // Strings (bytes): 16 -// Memory (8-bit): 39 +// Memory (8-bit): 38 // Memory (32-bit): 52 //--------------------------------------------------------------------------- @@ -3589,7 +3589,7 @@ const basic::ZoneInfo kZoneAsia_Brunei ACE_TIME_PROGMEM = { // Zone name: Asia/Damascus // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -3623,7 +3623,7 @@ const basic::ZoneInfo kZoneAsia_Damascus ACE_TIME_PROGMEM = { // Zone name: Asia/Dhaka // Zone Eras: 2 // Strings (bytes): 23 -// Memory (8-bit): 57 +// Memory (8-bit): 56 // Memory (32-bit): 75 //--------------------------------------------------------------------------- @@ -3669,7 +3669,7 @@ const basic::ZoneInfo kZoneAsia_Dhaka ACE_TIME_PROGMEM = { // Zone name: Asia/Dubai // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -3703,7 +3703,7 @@ const basic::ZoneInfo kZoneAsia_Dubai ACE_TIME_PROGMEM = { // Zone name: Asia/Dushanbe // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -3737,7 +3737,7 @@ const basic::ZoneInfo kZoneAsia_Dushanbe ACE_TIME_PROGMEM = { // Zone name: Asia/Ho_Chi_Minh // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -3771,7 +3771,7 @@ const basic::ZoneInfo kZoneAsia_Ho_Chi_Minh ACE_TIME_PROGMEM = { // Zone name: Asia/Hong_Kong // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -3805,7 +3805,7 @@ const basic::ZoneInfo kZoneAsia_Hong_Kong ACE_TIME_PROGMEM = { // Zone name: Asia/Hovd // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -3839,7 +3839,7 @@ const basic::ZoneInfo kZoneAsia_Hovd ACE_TIME_PROGMEM = { // Zone name: Asia/Jakarta // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -3873,7 +3873,7 @@ const basic::ZoneInfo kZoneAsia_Jakarta ACE_TIME_PROGMEM = { // Zone name: Asia/Jayapura // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -3907,7 +3907,7 @@ const basic::ZoneInfo kZoneAsia_Jayapura ACE_TIME_PROGMEM = { // Zone name: Asia/Jerusalem // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -3941,7 +3941,7 @@ const basic::ZoneInfo kZoneAsia_Jerusalem ACE_TIME_PROGMEM = { // Zone name: Asia/Kabul // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -3975,7 +3975,7 @@ const basic::ZoneInfo kZoneAsia_Kabul ACE_TIME_PROGMEM = { // Zone name: Asia/Karachi // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -4009,7 +4009,7 @@ const basic::ZoneInfo kZoneAsia_Karachi ACE_TIME_PROGMEM = { // Zone name: Asia/Kathmandu // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -4043,7 +4043,7 @@ const basic::ZoneInfo kZoneAsia_Kathmandu ACE_TIME_PROGMEM = { // Zone name: Asia/Kolkata // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -4077,7 +4077,7 @@ const basic::ZoneInfo kZoneAsia_Kolkata ACE_TIME_PROGMEM = { // Zone name: Asia/Kuala_Lumpur // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -4111,7 +4111,7 @@ const basic::ZoneInfo kZoneAsia_Kuala_Lumpur ACE_TIME_PROGMEM = { // Zone name: Asia/Kuching // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -4145,7 +4145,7 @@ const basic::ZoneInfo kZoneAsia_Kuching ACE_TIME_PROGMEM = { // Zone name: Asia/Macau // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -4179,7 +4179,7 @@ const basic::ZoneInfo kZoneAsia_Macau ACE_TIME_PROGMEM = { // Zone name: Asia/Makassar // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -4213,7 +4213,7 @@ const basic::ZoneInfo kZoneAsia_Makassar ACE_TIME_PROGMEM = { // Zone name: Asia/Manila // Zone Eras: 1 // Strings (bytes): 16 -// Memory (8-bit): 39 +// Memory (8-bit): 38 // Memory (32-bit): 52 //--------------------------------------------------------------------------- @@ -4247,7 +4247,7 @@ const basic::ZoneInfo kZoneAsia_Manila ACE_TIME_PROGMEM = { // Zone name: Asia/Nicosia // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -4281,7 +4281,7 @@ const basic::ZoneInfo kZoneAsia_Nicosia ACE_TIME_PROGMEM = { // Zone name: Asia/Pontianak // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -4315,7 +4315,7 @@ const basic::ZoneInfo kZoneAsia_Pontianak ACE_TIME_PROGMEM = { // Zone name: Asia/Qatar // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -4349,7 +4349,7 @@ const basic::ZoneInfo kZoneAsia_Qatar ACE_TIME_PROGMEM = { // Zone name: Asia/Riyadh // Zone Eras: 1 // Strings (bytes): 16 -// Memory (8-bit): 39 +// Memory (8-bit): 38 // Memory (32-bit): 52 //--------------------------------------------------------------------------- @@ -4383,7 +4383,7 @@ const basic::ZoneInfo kZoneAsia_Riyadh ACE_TIME_PROGMEM = { // Zone name: Asia/Samarkand // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -4417,7 +4417,7 @@ const basic::ZoneInfo kZoneAsia_Samarkand ACE_TIME_PROGMEM = { // Zone name: Asia/Seoul // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -4451,7 +4451,7 @@ const basic::ZoneInfo kZoneAsia_Seoul ACE_TIME_PROGMEM = { // Zone name: Asia/Shanghai // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -4485,7 +4485,7 @@ const basic::ZoneInfo kZoneAsia_Shanghai ACE_TIME_PROGMEM = { // Zone name: Asia/Singapore // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -4519,7 +4519,7 @@ const basic::ZoneInfo kZoneAsia_Singapore ACE_TIME_PROGMEM = { // Zone name: Asia/Taipei // Zone Eras: 1 // Strings (bytes): 16 -// Memory (8-bit): 39 +// Memory (8-bit): 38 // Memory (32-bit): 52 //--------------------------------------------------------------------------- @@ -4553,7 +4553,7 @@ const basic::ZoneInfo kZoneAsia_Taipei ACE_TIME_PROGMEM = { // Zone name: Asia/Tashkent // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -4587,7 +4587,7 @@ const basic::ZoneInfo kZoneAsia_Tashkent ACE_TIME_PROGMEM = { // Zone name: Asia/Tehran // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -4621,7 +4621,7 @@ const basic::ZoneInfo kZoneAsia_Tehran ACE_TIME_PROGMEM = { // Zone name: Asia/Thimphu // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -4655,7 +4655,7 @@ const basic::ZoneInfo kZoneAsia_Thimphu ACE_TIME_PROGMEM = { // Zone name: Asia/Tokyo // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -4689,7 +4689,7 @@ const basic::ZoneInfo kZoneAsia_Tokyo ACE_TIME_PROGMEM = { // Zone name: Asia/Ulaanbaatar // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -4723,7 +4723,7 @@ const basic::ZoneInfo kZoneAsia_Ulaanbaatar ACE_TIME_PROGMEM = { // Zone name: Asia/Urumqi // Zone Eras: 1 // Strings (bytes): 16 -// Memory (8-bit): 39 +// Memory (8-bit): 38 // Memory (32-bit): 52 //--------------------------------------------------------------------------- @@ -4757,7 +4757,7 @@ const basic::ZoneInfo kZoneAsia_Urumqi ACE_TIME_PROGMEM = { // Zone name: Asia/Yangon // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -4791,7 +4791,7 @@ const basic::ZoneInfo kZoneAsia_Yangon ACE_TIME_PROGMEM = { // Zone name: Asia/Yerevan // Zone Eras: 2 // Strings (bytes): 29 -// Memory (8-bit): 63 +// Memory (8-bit): 62 // Memory (32-bit): 81 //--------------------------------------------------------------------------- @@ -4837,7 +4837,7 @@ const basic::ZoneInfo kZoneAsia_Yerevan ACE_TIME_PROGMEM = { // Zone name: Atlantic/Azores // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -4871,7 +4871,7 @@ const basic::ZoneInfo kZoneAtlantic_Azores ACE_TIME_PROGMEM = { // Zone name: Atlantic/Bermuda // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -4905,7 +4905,7 @@ const basic::ZoneInfo kZoneAtlantic_Bermuda ACE_TIME_PROGMEM = { // Zone name: Atlantic/Canary // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -4939,7 +4939,7 @@ const basic::ZoneInfo kZoneAtlantic_Canary ACE_TIME_PROGMEM = { // Zone name: Atlantic/Cape_Verde // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -4973,7 +4973,7 @@ const basic::ZoneInfo kZoneAtlantic_Cape_Verde ACE_TIME_PROGMEM = { // Zone name: Atlantic/Faroe // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -5007,7 +5007,7 @@ const basic::ZoneInfo kZoneAtlantic_Faroe ACE_TIME_PROGMEM = { // Zone name: Atlantic/Madeira // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -5041,7 +5041,7 @@ const basic::ZoneInfo kZoneAtlantic_Madeira ACE_TIME_PROGMEM = { // Zone name: Atlantic/Reykjavik // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -5075,7 +5075,7 @@ const basic::ZoneInfo kZoneAtlantic_Reykjavik ACE_TIME_PROGMEM = { // Zone name: Atlantic/South_Georgia // Zone Eras: 1 // Strings (bytes): 27 -// Memory (8-bit): 50 +// Memory (8-bit): 49 // Memory (32-bit): 63 //--------------------------------------------------------------------------- @@ -5109,7 +5109,7 @@ const basic::ZoneInfo kZoneAtlantic_South_Georgia ACE_TIME_PROGMEM = { // Zone name: Australia/Adelaide // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -5143,7 +5143,7 @@ const basic::ZoneInfo kZoneAustralia_Adelaide ACE_TIME_PROGMEM = { // Zone name: Australia/Brisbane // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -5177,7 +5177,7 @@ const basic::ZoneInfo kZoneAustralia_Brisbane ACE_TIME_PROGMEM = { // Zone name: Australia/Broken_Hill // Zone Eras: 2 // Strings (bytes): 32 -// Memory (8-bit): 66 +// Memory (8-bit): 65 // Memory (32-bit): 84 //--------------------------------------------------------------------------- @@ -5223,7 +5223,7 @@ const basic::ZoneInfo kZoneAustralia_Broken_Hill ACE_TIME_PROGMEM = { // Zone name: Australia/Darwin // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -5257,7 +5257,7 @@ const basic::ZoneInfo kZoneAustralia_Darwin ACE_TIME_PROGMEM = { // Zone name: Australia/Eucla // Zone Eras: 1 // Strings (bytes): 28 -// Memory (8-bit): 51 +// Memory (8-bit): 50 // Memory (32-bit): 64 //--------------------------------------------------------------------------- @@ -5291,7 +5291,7 @@ const basic::ZoneInfo kZoneAustralia_Eucla ACE_TIME_PROGMEM = { // Zone name: Australia/Hobart // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -5325,7 +5325,7 @@ const basic::ZoneInfo kZoneAustralia_Hobart ACE_TIME_PROGMEM = { // Zone name: Australia/Lindeman // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -5359,7 +5359,7 @@ const basic::ZoneInfo kZoneAustralia_Lindeman ACE_TIME_PROGMEM = { // Zone name: Australia/Lord_Howe // Zone Eras: 1 // Strings (bytes): 30 -// Memory (8-bit): 53 +// Memory (8-bit): 52 // Memory (32-bit): 66 //--------------------------------------------------------------------------- @@ -5393,7 +5393,7 @@ const basic::ZoneInfo kZoneAustralia_Lord_Howe ACE_TIME_PROGMEM = { // Zone name: Australia/Melbourne // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -5427,7 +5427,7 @@ const basic::ZoneInfo kZoneAustralia_Melbourne ACE_TIME_PROGMEM = { // Zone name: Australia/Perth // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -5461,7 +5461,7 @@ const basic::ZoneInfo kZoneAustralia_Perth ACE_TIME_PROGMEM = { // Zone name: Australia/Sydney // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -5495,7 +5495,7 @@ const basic::ZoneInfo kZoneAustralia_Sydney ACE_TIME_PROGMEM = { // Zone name: CET // Zone Eras: 1 // Strings (bytes): 9 -// Memory (8-bit): 32 +// Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- @@ -5529,7 +5529,7 @@ const basic::ZoneInfo kZoneCET ACE_TIME_PROGMEM = { // Zone name: CST6CDT // Zone Eras: 1 // Strings (bytes): 12 -// Memory (8-bit): 35 +// Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -5563,7 +5563,7 @@ const basic::ZoneInfo kZoneCST6CDT ACE_TIME_PROGMEM = { // Zone name: EET // Zone Eras: 1 // Strings (bytes): 9 -// Memory (8-bit): 32 +// Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- @@ -5597,7 +5597,7 @@ const basic::ZoneInfo kZoneEET ACE_TIME_PROGMEM = { // Zone name: EST // Zone Eras: 1 // Strings (bytes): 8 -// Memory (8-bit): 31 +// Memory (8-bit): 30 // Memory (32-bit): 44 //--------------------------------------------------------------------------- @@ -5631,7 +5631,7 @@ const basic::ZoneInfo kZoneEST ACE_TIME_PROGMEM = { // Zone name: EST5EDT // Zone Eras: 1 // Strings (bytes): 12 -// Memory (8-bit): 35 +// Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -5665,7 +5665,7 @@ const basic::ZoneInfo kZoneEST5EDT ACE_TIME_PROGMEM = { // Zone name: Etc/GMT // Zone Eras: 1 // Strings (bytes): 12 -// Memory (8-bit): 35 +// Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -5699,7 +5699,7 @@ const basic::ZoneInfo kZoneEtc_GMT ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+1 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -5733,7 +5733,7 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_1 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+10 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -5767,7 +5767,7 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_10 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+11 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -5801,7 +5801,7 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_11 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+12 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -5835,7 +5835,7 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_12 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+2 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -5869,7 +5869,7 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_2 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+3 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -5903,7 +5903,7 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_3 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+4 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -5937,7 +5937,7 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_4 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+5 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -5971,7 +5971,7 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_5 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+6 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -6005,7 +6005,7 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_6 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+7 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -6039,7 +6039,7 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_7 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+8 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -6073,7 +6073,7 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_8 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+9 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -6107,7 +6107,7 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_9 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-1 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -6141,7 +6141,7 @@ const basic::ZoneInfo kZoneEtc_GMT_1 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-10 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -6175,7 +6175,7 @@ const basic::ZoneInfo kZoneEtc_GMT_10 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-11 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -6209,7 +6209,7 @@ const basic::ZoneInfo kZoneEtc_GMT_11 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-12 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -6243,7 +6243,7 @@ const basic::ZoneInfo kZoneEtc_GMT_12 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-13 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -6277,7 +6277,7 @@ const basic::ZoneInfo kZoneEtc_GMT_13 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-14 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -6311,7 +6311,7 @@ const basic::ZoneInfo kZoneEtc_GMT_14 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-2 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -6345,7 +6345,7 @@ const basic::ZoneInfo kZoneEtc_GMT_2 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-3 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -6379,7 +6379,7 @@ const basic::ZoneInfo kZoneEtc_GMT_3 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-4 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -6413,7 +6413,7 @@ const basic::ZoneInfo kZoneEtc_GMT_4 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-5 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -6447,7 +6447,7 @@ const basic::ZoneInfo kZoneEtc_GMT_5 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-6 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -6481,7 +6481,7 @@ const basic::ZoneInfo kZoneEtc_GMT_6 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-7 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -6515,7 +6515,7 @@ const basic::ZoneInfo kZoneEtc_GMT_7 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-8 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -6549,7 +6549,7 @@ const basic::ZoneInfo kZoneEtc_GMT_8 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-9 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -6583,7 +6583,7 @@ const basic::ZoneInfo kZoneEtc_GMT_9 ACE_TIME_PROGMEM = { // Zone name: Etc/UTC // Zone Eras: 1 // Strings (bytes): 12 -// Memory (8-bit): 35 +// Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -6617,7 +6617,7 @@ const basic::ZoneInfo kZoneEtc_UTC ACE_TIME_PROGMEM = { // Zone name: Europe/Amsterdam // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -6651,7 +6651,7 @@ const basic::ZoneInfo kZoneEurope_Amsterdam ACE_TIME_PROGMEM = { // Zone name: Europe/Andorra // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -6685,7 +6685,7 @@ const basic::ZoneInfo kZoneEurope_Andorra ACE_TIME_PROGMEM = { // Zone name: Europe/Athens // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -6719,7 +6719,7 @@ const basic::ZoneInfo kZoneEurope_Athens ACE_TIME_PROGMEM = { // Zone name: Europe/Belgrade // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -6753,7 +6753,7 @@ const basic::ZoneInfo kZoneEurope_Belgrade ACE_TIME_PROGMEM = { // Zone name: Europe/Berlin // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -6787,7 +6787,7 @@ const basic::ZoneInfo kZoneEurope_Berlin ACE_TIME_PROGMEM = { // Zone name: Europe/Brussels // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -6821,7 +6821,7 @@ const basic::ZoneInfo kZoneEurope_Brussels ACE_TIME_PROGMEM = { // Zone name: Europe/Bucharest // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -6855,7 +6855,7 @@ const basic::ZoneInfo kZoneEurope_Bucharest ACE_TIME_PROGMEM = { // Zone name: Europe/Budapest // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -6889,7 +6889,7 @@ const basic::ZoneInfo kZoneEurope_Budapest ACE_TIME_PROGMEM = { // Zone name: Europe/Chisinau // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -6923,7 +6923,7 @@ const basic::ZoneInfo kZoneEurope_Chisinau ACE_TIME_PROGMEM = { // Zone name: Europe/Copenhagen // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -6957,7 +6957,7 @@ const basic::ZoneInfo kZoneEurope_Copenhagen ACE_TIME_PROGMEM = { // Zone name: Europe/Dublin // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -6991,7 +6991,7 @@ const basic::ZoneInfo kZoneEurope_Dublin ACE_TIME_PROGMEM = { // Zone name: Europe/Gibraltar // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -7025,7 +7025,7 @@ const basic::ZoneInfo kZoneEurope_Gibraltar ACE_TIME_PROGMEM = { // Zone name: Europe/Helsinki // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -7059,7 +7059,7 @@ const basic::ZoneInfo kZoneEurope_Helsinki ACE_TIME_PROGMEM = { // Zone name: Europe/Kiev // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -7093,7 +7093,7 @@ const basic::ZoneInfo kZoneEurope_Kiev ACE_TIME_PROGMEM = { // Zone name: Europe/Lisbon // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -7127,7 +7127,7 @@ const basic::ZoneInfo kZoneEurope_Lisbon ACE_TIME_PROGMEM = { // Zone name: Europe/London // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -7161,7 +7161,7 @@ const basic::ZoneInfo kZoneEurope_London ACE_TIME_PROGMEM = { // Zone name: Europe/Luxembourg // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -7195,7 +7195,7 @@ const basic::ZoneInfo kZoneEurope_Luxembourg ACE_TIME_PROGMEM = { // Zone name: Europe/Madrid // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -7229,7 +7229,7 @@ const basic::ZoneInfo kZoneEurope_Madrid ACE_TIME_PROGMEM = { // Zone name: Europe/Malta // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -7263,7 +7263,7 @@ const basic::ZoneInfo kZoneEurope_Malta ACE_TIME_PROGMEM = { // Zone name: Europe/Monaco // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -7297,7 +7297,7 @@ const basic::ZoneInfo kZoneEurope_Monaco ACE_TIME_PROGMEM = { // Zone name: Europe/Oslo // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -7331,7 +7331,7 @@ const basic::ZoneInfo kZoneEurope_Oslo ACE_TIME_PROGMEM = { // Zone name: Europe/Paris // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -7365,7 +7365,7 @@ const basic::ZoneInfo kZoneEurope_Paris ACE_TIME_PROGMEM = { // Zone name: Europe/Prague // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -7399,7 +7399,7 @@ const basic::ZoneInfo kZoneEurope_Prague ACE_TIME_PROGMEM = { // Zone name: Europe/Rome // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -7433,7 +7433,7 @@ const basic::ZoneInfo kZoneEurope_Rome ACE_TIME_PROGMEM = { // Zone name: Europe/Sofia // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -7467,7 +7467,7 @@ const basic::ZoneInfo kZoneEurope_Sofia ACE_TIME_PROGMEM = { // Zone name: Europe/Stockholm // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -7501,7 +7501,7 @@ const basic::ZoneInfo kZoneEurope_Stockholm ACE_TIME_PROGMEM = { // Zone name: Europe/Tirane // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -7535,7 +7535,7 @@ const basic::ZoneInfo kZoneEurope_Tirane ACE_TIME_PROGMEM = { // Zone name: Europe/Uzhgorod // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -7569,7 +7569,7 @@ const basic::ZoneInfo kZoneEurope_Uzhgorod ACE_TIME_PROGMEM = { // Zone name: Europe/Vienna // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -7603,7 +7603,7 @@ const basic::ZoneInfo kZoneEurope_Vienna ACE_TIME_PROGMEM = { // Zone name: Europe/Warsaw // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -7637,7 +7637,7 @@ const basic::ZoneInfo kZoneEurope_Warsaw ACE_TIME_PROGMEM = { // Zone name: Europe/Zaporozhye // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -7671,7 +7671,7 @@ const basic::ZoneInfo kZoneEurope_Zaporozhye ACE_TIME_PROGMEM = { // Zone name: Europe/Zurich // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -7705,7 +7705,7 @@ const basic::ZoneInfo kZoneEurope_Zurich ACE_TIME_PROGMEM = { // Zone name: HST // Zone Eras: 1 // Strings (bytes): 8 -// Memory (8-bit): 31 +// Memory (8-bit): 30 // Memory (32-bit): 44 //--------------------------------------------------------------------------- @@ -7739,7 +7739,7 @@ const basic::ZoneInfo kZoneHST ACE_TIME_PROGMEM = { // Zone name: Indian/Chagos // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -7773,7 +7773,7 @@ const basic::ZoneInfo kZoneIndian_Chagos ACE_TIME_PROGMEM = { // Zone name: Indian/Christmas // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -7807,7 +7807,7 @@ const basic::ZoneInfo kZoneIndian_Christmas ACE_TIME_PROGMEM = { // Zone name: Indian/Cocos // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -7841,7 +7841,7 @@ const basic::ZoneInfo kZoneIndian_Cocos ACE_TIME_PROGMEM = { // Zone name: Indian/Kerguelen // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -7875,7 +7875,7 @@ const basic::ZoneInfo kZoneIndian_Kerguelen ACE_TIME_PROGMEM = { // Zone name: Indian/Mahe // Zone Eras: 1 // Strings (bytes): 16 -// Memory (8-bit): 39 +// Memory (8-bit): 38 // Memory (32-bit): 52 //--------------------------------------------------------------------------- @@ -7909,7 +7909,7 @@ const basic::ZoneInfo kZoneIndian_Mahe ACE_TIME_PROGMEM = { // Zone name: Indian/Maldives // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -7943,7 +7943,7 @@ const basic::ZoneInfo kZoneIndian_Maldives ACE_TIME_PROGMEM = { // Zone name: Indian/Mauritius // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -7977,7 +7977,7 @@ const basic::ZoneInfo kZoneIndian_Mauritius ACE_TIME_PROGMEM = { // Zone name: Indian/Reunion // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -8011,7 +8011,7 @@ const basic::ZoneInfo kZoneIndian_Reunion ACE_TIME_PROGMEM = { // Zone name: MET // Zone Eras: 1 // Strings (bytes): 9 -// Memory (8-bit): 32 +// Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- @@ -8045,7 +8045,7 @@ const basic::ZoneInfo kZoneMET ACE_TIME_PROGMEM = { // Zone name: MST // Zone Eras: 1 // Strings (bytes): 8 -// Memory (8-bit): 31 +// Memory (8-bit): 30 // Memory (32-bit): 44 //--------------------------------------------------------------------------- @@ -8079,7 +8079,7 @@ const basic::ZoneInfo kZoneMST ACE_TIME_PROGMEM = { // Zone name: MST7MDT // Zone Eras: 1 // Strings (bytes): 12 -// Memory (8-bit): 35 +// Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -8113,7 +8113,7 @@ const basic::ZoneInfo kZoneMST7MDT ACE_TIME_PROGMEM = { // Zone name: PST8PDT // Zone Eras: 1 // Strings (bytes): 12 -// Memory (8-bit): 35 +// Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -8147,7 +8147,7 @@ const basic::ZoneInfo kZonePST8PDT ACE_TIME_PROGMEM = { // Zone name: Pacific/Auckland // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -8181,7 +8181,7 @@ const basic::ZoneInfo kZonePacific_Auckland ACE_TIME_PROGMEM = { // Zone name: Pacific/Chatham // Zone Eras: 1 // Strings (bytes): 28 -// Memory (8-bit): 51 +// Memory (8-bit): 50 // Memory (32-bit): 64 //--------------------------------------------------------------------------- @@ -8215,7 +8215,7 @@ const basic::ZoneInfo kZonePacific_Chatham ACE_TIME_PROGMEM = { // Zone name: Pacific/Chuuk // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -8249,7 +8249,7 @@ const basic::ZoneInfo kZonePacific_Chuuk ACE_TIME_PROGMEM = { // Zone name: Pacific/Easter // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -8283,7 +8283,7 @@ const basic::ZoneInfo kZonePacific_Easter ACE_TIME_PROGMEM = { // Zone name: Pacific/Efate // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -8317,7 +8317,7 @@ const basic::ZoneInfo kZonePacific_Efate ACE_TIME_PROGMEM = { // Zone name: Pacific/Enderbury // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -8351,7 +8351,7 @@ const basic::ZoneInfo kZonePacific_Enderbury ACE_TIME_PROGMEM = { // Zone name: Pacific/Fiji // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -8385,7 +8385,7 @@ const basic::ZoneInfo kZonePacific_Fiji ACE_TIME_PROGMEM = { // Zone name: Pacific/Funafuti // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -8419,7 +8419,7 @@ const basic::ZoneInfo kZonePacific_Funafuti ACE_TIME_PROGMEM = { // Zone name: Pacific/Galapagos // Zone Eras: 1 // Strings (bytes): 26 -// Memory (8-bit): 49 +// Memory (8-bit): 48 // Memory (32-bit): 62 //--------------------------------------------------------------------------- @@ -8453,7 +8453,7 @@ const basic::ZoneInfo kZonePacific_Galapagos ACE_TIME_PROGMEM = { // Zone name: Pacific/Gambier // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -8487,7 +8487,7 @@ const basic::ZoneInfo kZonePacific_Gambier ACE_TIME_PROGMEM = { // Zone name: Pacific/Guadalcanal // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -8521,7 +8521,7 @@ const basic::ZoneInfo kZonePacific_Guadalcanal ACE_TIME_PROGMEM = { // Zone name: Pacific/Honolulu // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -8555,7 +8555,7 @@ const basic::ZoneInfo kZonePacific_Honolulu ACE_TIME_PROGMEM = { // Zone name: Pacific/Kiritimati // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -8589,7 +8589,7 @@ const basic::ZoneInfo kZonePacific_Kiritimati ACE_TIME_PROGMEM = { // Zone name: Pacific/Kosrae // Zone Eras: 2 // Strings (bytes): 23 -// Memory (8-bit): 57 +// Memory (8-bit): 56 // Memory (32-bit): 75 //--------------------------------------------------------------------------- @@ -8635,7 +8635,7 @@ const basic::ZoneInfo kZonePacific_Kosrae ACE_TIME_PROGMEM = { // Zone name: Pacific/Kwajalein // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -8669,7 +8669,7 @@ const basic::ZoneInfo kZonePacific_Kwajalein ACE_TIME_PROGMEM = { // Zone name: Pacific/Majuro // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -8703,7 +8703,7 @@ const basic::ZoneInfo kZonePacific_Majuro ACE_TIME_PROGMEM = { // Zone name: Pacific/Marquesas // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -8737,7 +8737,7 @@ const basic::ZoneInfo kZonePacific_Marquesas ACE_TIME_PROGMEM = { // Zone name: Pacific/Nauru // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -8771,7 +8771,7 @@ const basic::ZoneInfo kZonePacific_Nauru ACE_TIME_PROGMEM = { // Zone name: Pacific/Niue // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -8805,7 +8805,7 @@ const basic::ZoneInfo kZonePacific_Niue ACE_TIME_PROGMEM = { // Zone name: Pacific/Noumea // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -8839,7 +8839,7 @@ const basic::ZoneInfo kZonePacific_Noumea ACE_TIME_PROGMEM = { // Zone name: Pacific/Pago_Pago // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -8873,7 +8873,7 @@ const basic::ZoneInfo kZonePacific_Pago_Pago ACE_TIME_PROGMEM = { // Zone name: Pacific/Palau // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -8907,7 +8907,7 @@ const basic::ZoneInfo kZonePacific_Palau ACE_TIME_PROGMEM = { // Zone name: Pacific/Pitcairn // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -8941,7 +8941,7 @@ const basic::ZoneInfo kZonePacific_Pitcairn ACE_TIME_PROGMEM = { // Zone name: Pacific/Pohnpei // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -8975,7 +8975,7 @@ const basic::ZoneInfo kZonePacific_Pohnpei ACE_TIME_PROGMEM = { // Zone name: Pacific/Port_Moresby // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -9009,7 +9009,7 @@ const basic::ZoneInfo kZonePacific_Port_Moresby ACE_TIME_PROGMEM = { // Zone name: Pacific/Rarotonga // Zone Eras: 1 // Strings (bytes): 28 -// Memory (8-bit): 51 +// Memory (8-bit): 50 // Memory (32-bit): 64 //--------------------------------------------------------------------------- @@ -9043,7 +9043,7 @@ const basic::ZoneInfo kZonePacific_Rarotonga ACE_TIME_PROGMEM = { // Zone name: Pacific/Tahiti // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -9077,7 +9077,7 @@ const basic::ZoneInfo kZonePacific_Tahiti ACE_TIME_PROGMEM = { // Zone name: Pacific/Tarawa // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -9111,7 +9111,7 @@ const basic::ZoneInfo kZonePacific_Tarawa ACE_TIME_PROGMEM = { // Zone name: Pacific/Tongatapu // Zone Eras: 2 // Strings (bytes): 30 -// Memory (8-bit): 64 +// Memory (8-bit): 63 // Memory (32-bit): 82 //--------------------------------------------------------------------------- @@ -9157,7 +9157,7 @@ const basic::ZoneInfo kZonePacific_Tongatapu ACE_TIME_PROGMEM = { // Zone name: Pacific/Wake // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -9191,7 +9191,7 @@ const basic::ZoneInfo kZonePacific_Wake ACE_TIME_PROGMEM = { // Zone name: Pacific/Wallis // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -9225,7 +9225,7 @@ const basic::ZoneInfo kZonePacific_Wallis ACE_TIME_PROGMEM = { // Zone name: WET // Zone Eras: 1 // Strings (bytes): 9 -// Memory (8-bit): 32 +// Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- diff --git a/src/ace_time/zonedbx/zone_infos.cpp b/src/ace_time/zonedbx/zone_infos.cpp index bdec4cf2a..92e3771f8 100644 --- a/src/ace_time/zonedbx/zone_infos.cpp +++ b/src/ace_time/zonedbx/zone_infos.cpp @@ -27,7 +27,7 @@ // Zones: 386 // Links: 207 // Strings (bytes): 9465 -// Memory (8-bit): 21511 +// Memory (8-bit): 21125 // Memory (32-bit): 27969 // // DO NOT EDIT @@ -59,7 +59,7 @@ const extended::ZoneContext kZoneContext = { // Zone name: Africa/Abidjan // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -93,7 +93,7 @@ const extended::ZoneInfo kZoneAfrica_Abidjan ACE_TIME_PROGMEM = { // Zone name: Africa/Accra // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -127,7 +127,7 @@ const extended::ZoneInfo kZoneAfrica_Accra ACE_TIME_PROGMEM = { // Zone name: Africa/Algiers // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -161,7 +161,7 @@ const extended::ZoneInfo kZoneAfrica_Algiers ACE_TIME_PROGMEM = { // Zone name: Africa/Bissau // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -195,7 +195,7 @@ const extended::ZoneInfo kZoneAfrica_Bissau ACE_TIME_PROGMEM = { // Zone name: Africa/Cairo // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -229,7 +229,7 @@ const extended::ZoneInfo kZoneAfrica_Cairo ACE_TIME_PROGMEM = { // Zone name: Africa/Casablanca // Zone Eras: 2 // Strings (bytes): 34 -// Memory (8-bit): 68 +// Memory (8-bit): 67 // Memory (32-bit): 86 //--------------------------------------------------------------------------- @@ -275,7 +275,7 @@ const extended::ZoneInfo kZoneAfrica_Casablanca ACE_TIME_PROGMEM = { // Zone name: Africa/Ceuta // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -309,7 +309,7 @@ const extended::ZoneInfo kZoneAfrica_Ceuta ACE_TIME_PROGMEM = { // Zone name: Africa/El_Aaiun // Zone Eras: 2 // Strings (bytes): 32 -// Memory (8-bit): 66 +// Memory (8-bit): 65 // Memory (32-bit): 84 //--------------------------------------------------------------------------- @@ -355,7 +355,7 @@ const extended::ZoneInfo kZoneAfrica_El_Aaiun ACE_TIME_PROGMEM = { // Zone name: Africa/Johannesburg // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -389,7 +389,7 @@ const extended::ZoneInfo kZoneAfrica_Johannesburg ACE_TIME_PROGMEM = { // Zone name: Africa/Juba // Zone Eras: 2 // Strings (bytes): 21 -// Memory (8-bit): 55 +// Memory (8-bit): 54 // Memory (32-bit): 73 //--------------------------------------------------------------------------- @@ -435,7 +435,7 @@ const extended::ZoneInfo kZoneAfrica_Juba ACE_TIME_PROGMEM = { // Zone name: Africa/Khartoum // Zone Eras: 3 // Strings (bytes): 29 -// Memory (8-bit): 74 +// Memory (8-bit): 73 // Memory (32-bit): 97 //--------------------------------------------------------------------------- @@ -493,7 +493,7 @@ const extended::ZoneInfo kZoneAfrica_Khartoum ACE_TIME_PROGMEM = { // Zone name: Africa/Lagos // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -527,7 +527,7 @@ const extended::ZoneInfo kZoneAfrica_Lagos ACE_TIME_PROGMEM = { // Zone name: Africa/Maputo // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -561,7 +561,7 @@ const extended::ZoneInfo kZoneAfrica_Maputo ACE_TIME_PROGMEM = { // Zone name: Africa/Monrovia // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -595,7 +595,7 @@ const extended::ZoneInfo kZoneAfrica_Monrovia ACE_TIME_PROGMEM = { // Zone name: Africa/Nairobi // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -629,7 +629,7 @@ const extended::ZoneInfo kZoneAfrica_Nairobi ACE_TIME_PROGMEM = { // Zone name: Africa/Ndjamena // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -663,7 +663,7 @@ const extended::ZoneInfo kZoneAfrica_Ndjamena ACE_TIME_PROGMEM = { // Zone name: Africa/Sao_Tome // Zone Eras: 3 // Strings (bytes): 28 -// Memory (8-bit): 73 +// Memory (8-bit): 72 // Memory (32-bit): 96 //--------------------------------------------------------------------------- @@ -721,7 +721,7 @@ const extended::ZoneInfo kZoneAfrica_Sao_Tome ACE_TIME_PROGMEM = { // Zone name: Africa/Tripoli // Zone Eras: 3 // Strings (bytes): 28 -// Memory (8-bit): 73 +// Memory (8-bit): 72 // Memory (32-bit): 96 //--------------------------------------------------------------------------- @@ -779,7 +779,7 @@ const extended::ZoneInfo kZoneAfrica_Tripoli ACE_TIME_PROGMEM = { // Zone name: Africa/Tunis // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -813,7 +813,7 @@ const extended::ZoneInfo kZoneAfrica_Tunis ACE_TIME_PROGMEM = { // Zone name: Africa/Windhoek // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -847,7 +847,7 @@ const extended::ZoneInfo kZoneAfrica_Windhoek ACE_TIME_PROGMEM = { // Zone name: America/Adak // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -881,7 +881,7 @@ const extended::ZoneInfo kZoneAmerica_Adak ACE_TIME_PROGMEM = { // Zone name: America/Anchorage // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -915,7 +915,7 @@ const extended::ZoneInfo kZoneAmerica_Anchorage ACE_TIME_PROGMEM = { // Zone name: America/Araguaina // Zone Eras: 4 // Strings (bytes): 42 -// Memory (8-bit): 98 +// Memory (8-bit): 97 // Memory (32-bit): 126 //--------------------------------------------------------------------------- @@ -985,7 +985,7 @@ const extended::ZoneInfo kZoneAmerica_Araguaina ACE_TIME_PROGMEM = { // Zone name: America/Argentina/Buenos_Aires // Zone Eras: 3 // Strings (bytes): 55 -// Memory (8-bit): 100 +// Memory (8-bit): 99 // Memory (32-bit): 123 //--------------------------------------------------------------------------- @@ -1043,7 +1043,7 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Buenos_Aires ACE_TIME_PROGMEM = // Zone name: America/Argentina/Catamarca // Zone Eras: 6 // Strings (bytes): 64 -// Memory (8-bit): 142 +// Memory (8-bit): 141 // Memory (32-bit): 180 //--------------------------------------------------------------------------- @@ -1137,7 +1137,7 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Catamarca ACE_TIME_PROGMEM = { // Zone name: America/Argentina/Cordoba // Zone Eras: 3 // Strings (bytes): 50 -// Memory (8-bit): 95 +// Memory (8-bit): 94 // Memory (32-bit): 118 //--------------------------------------------------------------------------- @@ -1195,7 +1195,7 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Cordoba ACE_TIME_PROGMEM = { // Zone name: America/Argentina/Jujuy // Zone Eras: 4 // Strings (bytes): 52 -// Memory (8-bit): 108 +// Memory (8-bit): 107 // Memory (32-bit): 136 //--------------------------------------------------------------------------- @@ -1265,7 +1265,7 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Jujuy ACE_TIME_PROGMEM = { // Zone name: America/Argentina/La_Rioja // Zone Eras: 6 // Strings (bytes): 63 -// Memory (8-bit): 141 +// Memory (8-bit): 140 // Memory (32-bit): 179 //--------------------------------------------------------------------------- @@ -1359,7 +1359,7 @@ const extended::ZoneInfo kZoneAmerica_Argentina_La_Rioja ACE_TIME_PROGMEM = { // Zone name: America/Argentina/Mendoza // Zone Eras: 6 // Strings (bytes): 62 -// Memory (8-bit): 140 +// Memory (8-bit): 139 // Memory (32-bit): 178 //--------------------------------------------------------------------------- @@ -1453,7 +1453,7 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Mendoza ACE_TIME_PROGMEM = { // Zone name: America/Argentina/Rio_Gallegos // Zone Eras: 6 // Strings (bytes): 67 -// Memory (8-bit): 145 +// Memory (8-bit): 144 // Memory (32-bit): 183 //--------------------------------------------------------------------------- @@ -1547,7 +1547,7 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Rio_Gallegos ACE_TIME_PROGMEM = // Zone name: America/Argentina/Salta // Zone Eras: 4 // Strings (bytes): 52 -// Memory (8-bit): 108 +// Memory (8-bit): 107 // Memory (32-bit): 136 //--------------------------------------------------------------------------- @@ -1617,7 +1617,7 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Salta ACE_TIME_PROGMEM = { // Zone name: America/Argentina/San_Juan // Zone Eras: 6 // Strings (bytes): 63 -// Memory (8-bit): 141 +// Memory (8-bit): 140 // Memory (32-bit): 179 //--------------------------------------------------------------------------- @@ -1711,7 +1711,7 @@ const extended::ZoneInfo kZoneAmerica_Argentina_San_Juan ACE_TIME_PROGMEM = { // Zone name: America/Argentina/San_Luis // Zone Eras: 7 // Strings (bytes): 63 -// Memory (8-bit): 152 +// Memory (8-bit): 151 // Memory (32-bit): 195 //--------------------------------------------------------------------------- @@ -1817,7 +1817,7 @@ const extended::ZoneInfo kZoneAmerica_Argentina_San_Luis ACE_TIME_PROGMEM = { // Zone name: America/Argentina/Tucuman // Zone Eras: 5 // Strings (bytes): 58 -// Memory (8-bit): 125 +// Memory (8-bit): 124 // Memory (32-bit): 158 //--------------------------------------------------------------------------- @@ -1899,7 +1899,7 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Tucuman ACE_TIME_PROGMEM = { // Zone name: America/Argentina/Ushuaia // Zone Eras: 6 // Strings (bytes): 62 -// Memory (8-bit): 140 +// Memory (8-bit): 139 // Memory (32-bit): 178 //--------------------------------------------------------------------------- @@ -1993,7 +1993,7 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Ushuaia ACE_TIME_PROGMEM = { // Zone name: America/Asuncion // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -2027,7 +2027,7 @@ const extended::ZoneInfo kZoneAmerica_Asuncion ACE_TIME_PROGMEM = { // Zone name: America/Atikokan // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -2061,7 +2061,7 @@ const extended::ZoneInfo kZoneAmerica_Atikokan ACE_TIME_PROGMEM = { // Zone name: America/Bahia // Zone Eras: 4 // Strings (bytes): 38 -// Memory (8-bit): 94 +// Memory (8-bit): 93 // Memory (32-bit): 122 //--------------------------------------------------------------------------- @@ -2131,7 +2131,7 @@ const extended::ZoneInfo kZoneAmerica_Bahia ACE_TIME_PROGMEM = { // Zone name: America/Bahia_Banderas // Zone Eras: 2 // Strings (bytes): 31 -// Memory (8-bit): 65 +// Memory (8-bit): 64 // Memory (32-bit): 83 //--------------------------------------------------------------------------- @@ -2177,7 +2177,7 @@ const extended::ZoneInfo kZoneAmerica_Bahia_Banderas ACE_TIME_PROGMEM = { // Zone name: America/Barbados // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -2211,7 +2211,7 @@ const extended::ZoneInfo kZoneAmerica_Barbados ACE_TIME_PROGMEM = { // Zone name: America/Belem // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -2245,7 +2245,7 @@ const extended::ZoneInfo kZoneAmerica_Belem ACE_TIME_PROGMEM = { // Zone name: America/Belize // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -2279,7 +2279,7 @@ const extended::ZoneInfo kZoneAmerica_Belize ACE_TIME_PROGMEM = { // Zone name: America/Blanc-Sablon // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -2313,7 +2313,7 @@ const extended::ZoneInfo kZoneAmerica_Blanc_Sablon ACE_TIME_PROGMEM = { // Zone name: America/Boa_Vista // Zone Eras: 3 // Strings (bytes): 34 -// Memory (8-bit): 79 +// Memory (8-bit): 78 // Memory (32-bit): 102 //--------------------------------------------------------------------------- @@ -2371,7 +2371,7 @@ const extended::ZoneInfo kZoneAmerica_Boa_Vista ACE_TIME_PROGMEM = { // Zone name: America/Bogota // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -2405,7 +2405,7 @@ const extended::ZoneInfo kZoneAmerica_Bogota ACE_TIME_PROGMEM = { // Zone name: America/Boise // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -2439,7 +2439,7 @@ const extended::ZoneInfo kZoneAmerica_Boise ACE_TIME_PROGMEM = { // Zone name: America/Cambridge_Bay // Zone Eras: 5 // Strings (bytes): 42 -// Memory (8-bit): 109 +// Memory (8-bit): 108 // Memory (32-bit): 142 //--------------------------------------------------------------------------- @@ -2521,7 +2521,7 @@ const extended::ZoneInfo kZoneAmerica_Cambridge_Bay ACE_TIME_PROGMEM = { // Zone name: America/Campo_Grande // Zone Eras: 1 // Strings (bytes): 29 -// Memory (8-bit): 52 +// Memory (8-bit): 51 // Memory (32-bit): 65 //--------------------------------------------------------------------------- @@ -2555,7 +2555,7 @@ const extended::ZoneInfo kZoneAmerica_Campo_Grande ACE_TIME_PROGMEM = { // Zone name: America/Cancun // Zone Eras: 2 // Strings (bytes): 23 -// Memory (8-bit): 57 +// Memory (8-bit): 56 // Memory (32-bit): 75 //--------------------------------------------------------------------------- @@ -2601,7 +2601,7 @@ const extended::ZoneInfo kZoneAmerica_Cancun ACE_TIME_PROGMEM = { // Zone name: America/Caracas // Zone Eras: 3 // Strings (bytes): 30 -// Memory (8-bit): 75 +// Memory (8-bit): 74 // Memory (32-bit): 98 //--------------------------------------------------------------------------- @@ -2659,7 +2659,7 @@ const extended::ZoneInfo kZoneAmerica_Caracas ACE_TIME_PROGMEM = { // Zone name: America/Cayenne // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -2693,7 +2693,7 @@ const extended::ZoneInfo kZoneAmerica_Cayenne ACE_TIME_PROGMEM = { // Zone name: America/Chicago // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -2727,7 +2727,7 @@ const extended::ZoneInfo kZoneAmerica_Chicago ACE_TIME_PROGMEM = { // Zone name: America/Chihuahua // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -2761,7 +2761,7 @@ const extended::ZoneInfo kZoneAmerica_Chihuahua ACE_TIME_PROGMEM = { // Zone name: America/Costa_Rica // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -2795,7 +2795,7 @@ const extended::ZoneInfo kZoneAmerica_Costa_Rica ACE_TIME_PROGMEM = { // Zone name: America/Creston // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -2829,7 +2829,7 @@ const extended::ZoneInfo kZoneAmerica_Creston ACE_TIME_PROGMEM = { // Zone name: America/Cuiaba // Zone Eras: 3 // Strings (bytes): 35 -// Memory (8-bit): 80 +// Memory (8-bit): 79 // Memory (32-bit): 103 //--------------------------------------------------------------------------- @@ -2887,7 +2887,7 @@ const extended::ZoneInfo kZoneAmerica_Cuiaba ACE_TIME_PROGMEM = { // Zone name: America/Curacao // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -2921,7 +2921,7 @@ const extended::ZoneInfo kZoneAmerica_Curacao ACE_TIME_PROGMEM = { // Zone name: America/Danmarkshavn // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -2955,7 +2955,7 @@ const extended::ZoneInfo kZoneAmerica_Danmarkshavn ACE_TIME_PROGMEM = { // Zone name: America/Dawson // Zone Eras: 2 // Strings (bytes): 23 -// Memory (8-bit): 57 +// Memory (8-bit): 56 // Memory (32-bit): 75 //--------------------------------------------------------------------------- @@ -3001,7 +3001,7 @@ const extended::ZoneInfo kZoneAmerica_Dawson ACE_TIME_PROGMEM = { // Zone name: America/Dawson_Creek // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -3035,7 +3035,7 @@ const extended::ZoneInfo kZoneAmerica_Dawson_Creek ACE_TIME_PROGMEM = { // Zone name: America/Denver // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -3069,7 +3069,7 @@ const extended::ZoneInfo kZoneAmerica_Denver ACE_TIME_PROGMEM = { // Zone name: America/Detroit // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -3103,7 +3103,7 @@ const extended::ZoneInfo kZoneAmerica_Detroit ACE_TIME_PROGMEM = { // Zone name: America/Edmonton // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -3137,7 +3137,7 @@ const extended::ZoneInfo kZoneAmerica_Edmonton ACE_TIME_PROGMEM = { // Zone name: America/Eirunepe // Zone Eras: 3 // Strings (bytes): 29 -// Memory (8-bit): 74 +// Memory (8-bit): 73 // Memory (32-bit): 97 //--------------------------------------------------------------------------- @@ -3195,7 +3195,7 @@ const extended::ZoneInfo kZoneAmerica_Eirunepe ACE_TIME_PROGMEM = { // Zone name: America/El_Salvador // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -3229,7 +3229,7 @@ const extended::ZoneInfo kZoneAmerica_El_Salvador ACE_TIME_PROGMEM = { // Zone name: America/Fort_Nelson // Zone Eras: 2 // Strings (bytes): 28 -// Memory (8-bit): 62 +// Memory (8-bit): 61 // Memory (32-bit): 80 //--------------------------------------------------------------------------- @@ -3275,7 +3275,7 @@ const extended::ZoneInfo kZoneAmerica_Fort_Nelson ACE_TIME_PROGMEM = { // Zone name: America/Fortaleza // Zone Eras: 5 // Strings (bytes): 46 -// Memory (8-bit): 113 +// Memory (8-bit): 112 // Memory (32-bit): 146 //--------------------------------------------------------------------------- @@ -3357,7 +3357,7 @@ const extended::ZoneInfo kZoneAmerica_Fortaleza ACE_TIME_PROGMEM = { // Zone name: America/Glace_Bay // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -3391,7 +3391,7 @@ const extended::ZoneInfo kZoneAmerica_Glace_Bay ACE_TIME_PROGMEM = { // Zone name: America/Goose_Bay // Zone Eras: 2 // Strings (bytes): 26 -// Memory (8-bit): 60 +// Memory (8-bit): 59 // Memory (32-bit): 78 //--------------------------------------------------------------------------- @@ -3437,7 +3437,7 @@ const extended::ZoneInfo kZoneAmerica_Goose_Bay ACE_TIME_PROGMEM = { // Zone name: America/Grand_Turk // Zone Eras: 3 // Strings (bytes): 31 -// Memory (8-bit): 76 +// Memory (8-bit): 75 // Memory (32-bit): 99 //--------------------------------------------------------------------------- @@ -3495,7 +3495,7 @@ const extended::ZoneInfo kZoneAmerica_Grand_Turk ACE_TIME_PROGMEM = { // Zone name: America/Guatemala // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -3529,7 +3529,7 @@ const extended::ZoneInfo kZoneAmerica_Guatemala ACE_TIME_PROGMEM = { // Zone name: America/Guayaquil // Zone Eras: 1 // Strings (bytes): 26 -// Memory (8-bit): 49 +// Memory (8-bit): 48 // Memory (32-bit): 62 //--------------------------------------------------------------------------- @@ -3563,7 +3563,7 @@ const extended::ZoneInfo kZoneAmerica_Guayaquil ACE_TIME_PROGMEM = { // Zone name: America/Guyana // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -3597,7 +3597,7 @@ const extended::ZoneInfo kZoneAmerica_Guyana ACE_TIME_PROGMEM = { // Zone name: America/Halifax // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -3631,7 +3631,7 @@ const extended::ZoneInfo kZoneAmerica_Halifax ACE_TIME_PROGMEM = { // Zone name: America/Havana // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -3665,7 +3665,7 @@ const extended::ZoneInfo kZoneAmerica_Havana ACE_TIME_PROGMEM = { // Zone name: America/Hermosillo // Zone Eras: 2 // Strings (bytes): 27 -// Memory (8-bit): 61 +// Memory (8-bit): 60 // Memory (32-bit): 79 //--------------------------------------------------------------------------- @@ -3711,7 +3711,7 @@ const extended::ZoneInfo kZoneAmerica_Hermosillo ACE_TIME_PROGMEM = { // Zone name: America/Indiana/Indianapolis // Zone Eras: 2 // Strings (bytes): 37 -// Memory (8-bit): 71 +// Memory (8-bit): 70 // Memory (32-bit): 89 //--------------------------------------------------------------------------- @@ -3757,7 +3757,7 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Indianapolis ACE_TIME_PROGMEM = { // Zone name: America/Indiana/Knox // Zone Eras: 2 // Strings (bytes): 29 -// Memory (8-bit): 63 +// Memory (8-bit): 62 // Memory (32-bit): 81 //--------------------------------------------------------------------------- @@ -3803,7 +3803,7 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Knox ACE_TIME_PROGMEM = { // Zone name: America/Indiana/Marengo // Zone Eras: 2 // Strings (bytes): 32 -// Memory (8-bit): 66 +// Memory (8-bit): 65 // Memory (32-bit): 84 //--------------------------------------------------------------------------- @@ -3849,7 +3849,7 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Marengo ACE_TIME_PROGMEM = { // Zone name: America/Indiana/Petersburg // Zone Eras: 3 // Strings (bytes): 39 -// Memory (8-bit): 84 +// Memory (8-bit): 83 // Memory (32-bit): 107 //--------------------------------------------------------------------------- @@ -3907,7 +3907,7 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Petersburg ACE_TIME_PROGMEM = { // Zone name: America/Indiana/Tell_City // Zone Eras: 2 // Strings (bytes): 34 -// Memory (8-bit): 68 +// Memory (8-bit): 67 // Memory (32-bit): 86 //--------------------------------------------------------------------------- @@ -3953,7 +3953,7 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Tell_City ACE_TIME_PROGMEM = { // Zone name: America/Indiana/Vevay // Zone Eras: 2 // Strings (bytes): 30 -// Memory (8-bit): 64 +// Memory (8-bit): 63 // Memory (32-bit): 82 //--------------------------------------------------------------------------- @@ -3999,7 +3999,7 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Vevay ACE_TIME_PROGMEM = { // Zone name: America/Indiana/Vincennes // Zone Eras: 3 // Strings (bytes): 38 -// Memory (8-bit): 83 +// Memory (8-bit): 82 // Memory (32-bit): 106 //--------------------------------------------------------------------------- @@ -4057,7 +4057,7 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Vincennes ACE_TIME_PROGMEM = { // Zone name: America/Indiana/Winamac // Zone Eras: 3 // Strings (bytes): 36 -// Memory (8-bit): 81 +// Memory (8-bit): 80 // Memory (32-bit): 104 //--------------------------------------------------------------------------- @@ -4115,7 +4115,7 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Winamac ACE_TIME_PROGMEM = { // Zone name: America/Inuvik // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -4149,7 +4149,7 @@ const extended::ZoneInfo kZoneAmerica_Inuvik ACE_TIME_PROGMEM = { // Zone name: America/Iqaluit // Zone Eras: 3 // Strings (bytes): 28 -// Memory (8-bit): 73 +// Memory (8-bit): 72 // Memory (32-bit): 96 //--------------------------------------------------------------------------- @@ -4207,7 +4207,7 @@ const extended::ZoneInfo kZoneAmerica_Iqaluit ACE_TIME_PROGMEM = { // Zone name: America/Jamaica // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -4241,7 +4241,7 @@ const extended::ZoneInfo kZoneAmerica_Jamaica ACE_TIME_PROGMEM = { // Zone name: America/Juneau // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -4275,7 +4275,7 @@ const extended::ZoneInfo kZoneAmerica_Juneau ACE_TIME_PROGMEM = { // Zone name: America/Kentucky/Louisville // Zone Eras: 1 // Strings (bytes): 32 -// Memory (8-bit): 55 +// Memory (8-bit): 54 // Memory (32-bit): 68 //--------------------------------------------------------------------------- @@ -4309,7 +4309,7 @@ const extended::ZoneInfo kZoneAmerica_Kentucky_Louisville ACE_TIME_PROGMEM = { // Zone name: America/Kentucky/Monticello // Zone Eras: 2 // Strings (bytes): 36 -// Memory (8-bit): 70 +// Memory (8-bit): 69 // Memory (32-bit): 88 //--------------------------------------------------------------------------- @@ -4355,7 +4355,7 @@ const extended::ZoneInfo kZoneAmerica_Kentucky_Monticello ACE_TIME_PROGMEM = { // Zone name: America/La_Paz // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -4389,7 +4389,7 @@ const extended::ZoneInfo kZoneAmerica_La_Paz ACE_TIME_PROGMEM = { // Zone name: America/Lima // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -4423,7 +4423,7 @@ const extended::ZoneInfo kZoneAmerica_Lima ACE_TIME_PROGMEM = { // Zone name: America/Los_Angeles // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -4457,7 +4457,7 @@ const extended::ZoneInfo kZoneAmerica_Los_Angeles ACE_TIME_PROGMEM = { // Zone name: America/Maceio // Zone Eras: 5 // Strings (bytes): 43 -// Memory (8-bit): 110 +// Memory (8-bit): 109 // Memory (32-bit): 143 //--------------------------------------------------------------------------- @@ -4539,7 +4539,7 @@ const extended::ZoneInfo kZoneAmerica_Maceio ACE_TIME_PROGMEM = { // Zone name: America/Managua // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -4573,7 +4573,7 @@ const extended::ZoneInfo kZoneAmerica_Managua ACE_TIME_PROGMEM = { // Zone name: America/Manaus // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -4607,7 +4607,7 @@ const extended::ZoneInfo kZoneAmerica_Manaus ACE_TIME_PROGMEM = { // Zone name: America/Martinique // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -4641,7 +4641,7 @@ const extended::ZoneInfo kZoneAmerica_Martinique ACE_TIME_PROGMEM = { // Zone name: America/Matamoros // Zone Eras: 2 // Strings (bytes): 26 -// Memory (8-bit): 60 +// Memory (8-bit): 59 // Memory (32-bit): 78 //--------------------------------------------------------------------------- @@ -4687,7 +4687,7 @@ const extended::ZoneInfo kZoneAmerica_Matamoros ACE_TIME_PROGMEM = { // Zone name: America/Mazatlan // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -4721,7 +4721,7 @@ const extended::ZoneInfo kZoneAmerica_Mazatlan ACE_TIME_PROGMEM = { // Zone name: America/Menominee // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -4755,7 +4755,7 @@ const extended::ZoneInfo kZoneAmerica_Menominee ACE_TIME_PROGMEM = { // Zone name: America/Merida // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -4789,7 +4789,7 @@ const extended::ZoneInfo kZoneAmerica_Merida ACE_TIME_PROGMEM = { // Zone name: America/Metlakatla // Zone Eras: 4 // Strings (bytes): 37 -// Memory (8-bit): 93 +// Memory (8-bit): 92 // Memory (32-bit): 121 //--------------------------------------------------------------------------- @@ -4859,7 +4859,7 @@ const extended::ZoneInfo kZoneAmerica_Metlakatla ACE_TIME_PROGMEM = { // Zone name: America/Mexico_City // Zone Eras: 3 // Strings (bytes): 32 -// Memory (8-bit): 77 +// Memory (8-bit): 76 // Memory (32-bit): 100 //--------------------------------------------------------------------------- @@ -4917,7 +4917,7 @@ const extended::ZoneInfo kZoneAmerica_Mexico_City ACE_TIME_PROGMEM = { // Zone name: America/Miquelon // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -4951,7 +4951,7 @@ const extended::ZoneInfo kZoneAmerica_Miquelon ACE_TIME_PROGMEM = { // Zone name: America/Moncton // Zone Eras: 2 // Strings (bytes): 24 -// Memory (8-bit): 58 +// Memory (8-bit): 57 // Memory (32-bit): 76 //--------------------------------------------------------------------------- @@ -4997,7 +4997,7 @@ const extended::ZoneInfo kZoneAmerica_Moncton ACE_TIME_PROGMEM = { // Zone name: America/Monterrey // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -5031,7 +5031,7 @@ const extended::ZoneInfo kZoneAmerica_Monterrey ACE_TIME_PROGMEM = { // Zone name: America/Montevideo // Zone Eras: 1 // Strings (bytes): 27 -// Memory (8-bit): 50 +// Memory (8-bit): 49 // Memory (32-bit): 63 //--------------------------------------------------------------------------- @@ -5065,7 +5065,7 @@ const extended::ZoneInfo kZoneAmerica_Montevideo ACE_TIME_PROGMEM = { // Zone name: America/Nassau // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -5099,7 +5099,7 @@ const extended::ZoneInfo kZoneAmerica_Nassau ACE_TIME_PROGMEM = { // Zone name: America/New_York // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -5133,7 +5133,7 @@ const extended::ZoneInfo kZoneAmerica_New_York ACE_TIME_PROGMEM = { // Zone name: America/Nipigon // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -5167,7 +5167,7 @@ const extended::ZoneInfo kZoneAmerica_Nipigon ACE_TIME_PROGMEM = { // Zone name: America/Nome // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -5201,7 +5201,7 @@ const extended::ZoneInfo kZoneAmerica_Nome ACE_TIME_PROGMEM = { // Zone name: America/Noronha // Zone Eras: 5 // Strings (bytes): 44 -// Memory (8-bit): 111 +// Memory (8-bit): 110 // Memory (32-bit): 144 //--------------------------------------------------------------------------- @@ -5283,7 +5283,7 @@ const extended::ZoneInfo kZoneAmerica_Noronha ACE_TIME_PROGMEM = { // Zone name: America/North_Dakota/Beulah // Zone Eras: 2 // Strings (bytes): 36 -// Memory (8-bit): 70 +// Memory (8-bit): 69 // Memory (32-bit): 88 //--------------------------------------------------------------------------- @@ -5329,7 +5329,7 @@ const extended::ZoneInfo kZoneAmerica_North_Dakota_Beulah ACE_TIME_PROGMEM = { // Zone name: America/North_Dakota/Center // Zone Eras: 1 // Strings (bytes): 32 -// Memory (8-bit): 55 +// Memory (8-bit): 54 // Memory (32-bit): 68 //--------------------------------------------------------------------------- @@ -5363,7 +5363,7 @@ const extended::ZoneInfo kZoneAmerica_North_Dakota_Center ACE_TIME_PROGMEM = { // Zone name: America/North_Dakota/New_Salem // Zone Eras: 2 // Strings (bytes): 39 -// Memory (8-bit): 73 +// Memory (8-bit): 72 // Memory (32-bit): 91 //--------------------------------------------------------------------------- @@ -5409,7 +5409,7 @@ const extended::ZoneInfo kZoneAmerica_North_Dakota_New_Salem ACE_TIME_PROGMEM = // Zone name: America/Nuuk // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -5443,7 +5443,7 @@ const extended::ZoneInfo kZoneAmerica_Nuuk ACE_TIME_PROGMEM = { // Zone name: America/Ojinaga // Zone Eras: 2 // Strings (bytes): 24 -// Memory (8-bit): 58 +// Memory (8-bit): 57 // Memory (32-bit): 76 //--------------------------------------------------------------------------- @@ -5489,7 +5489,7 @@ const extended::ZoneInfo kZoneAmerica_Ojinaga ACE_TIME_PROGMEM = { // Zone name: America/Panama // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -5523,7 +5523,7 @@ const extended::ZoneInfo kZoneAmerica_Panama ACE_TIME_PROGMEM = { // Zone name: America/Pangnirtung // Zone Eras: 3 // Strings (bytes): 32 -// Memory (8-bit): 77 +// Memory (8-bit): 76 // Memory (32-bit): 100 //--------------------------------------------------------------------------- @@ -5581,7 +5581,7 @@ const extended::ZoneInfo kZoneAmerica_Pangnirtung ACE_TIME_PROGMEM = { // Zone name: America/Paramaribo // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -5615,7 +5615,7 @@ const extended::ZoneInfo kZoneAmerica_Paramaribo ACE_TIME_PROGMEM = { // Zone name: America/Phoenix // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -5649,7 +5649,7 @@ const extended::ZoneInfo kZoneAmerica_Phoenix ACE_TIME_PROGMEM = { // Zone name: America/Port-au-Prince // Zone Eras: 1 // Strings (bytes): 27 -// Memory (8-bit): 50 +// Memory (8-bit): 49 // Memory (32-bit): 63 //--------------------------------------------------------------------------- @@ -5683,7 +5683,7 @@ const extended::ZoneInfo kZoneAmerica_Port_au_Prince ACE_TIME_PROGMEM = { // Zone name: America/Port_of_Spain // Zone Eras: 1 // Strings (bytes): 26 -// Memory (8-bit): 49 +// Memory (8-bit): 48 // Memory (32-bit): 62 //--------------------------------------------------------------------------- @@ -5717,7 +5717,7 @@ const extended::ZoneInfo kZoneAmerica_Port_of_Spain ACE_TIME_PROGMEM = { // Zone name: America/Porto_Velho // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -5751,7 +5751,7 @@ const extended::ZoneInfo kZoneAmerica_Porto_Velho ACE_TIME_PROGMEM = { // Zone name: America/Puerto_Rico // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -5785,7 +5785,7 @@ const extended::ZoneInfo kZoneAmerica_Puerto_Rico ACE_TIME_PROGMEM = { // Zone name: America/Punta_Arenas // Zone Eras: 2 // Strings (bytes): 33 -// Memory (8-bit): 67 +// Memory (8-bit): 66 // Memory (32-bit): 85 //--------------------------------------------------------------------------- @@ -5831,7 +5831,7 @@ const extended::ZoneInfo kZoneAmerica_Punta_Arenas ACE_TIME_PROGMEM = { // Zone name: America/Rainy_River // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -5865,7 +5865,7 @@ const extended::ZoneInfo kZoneAmerica_Rainy_River ACE_TIME_PROGMEM = { // Zone name: America/Rankin_Inlet // Zone Eras: 3 // Strings (bytes): 33 -// Memory (8-bit): 78 +// Memory (8-bit): 77 // Memory (32-bit): 101 //--------------------------------------------------------------------------- @@ -5923,7 +5923,7 @@ const extended::ZoneInfo kZoneAmerica_Rankin_Inlet ACE_TIME_PROGMEM = { // Zone name: America/Recife // Zone Eras: 5 // Strings (bytes): 43 -// Memory (8-bit): 110 +// Memory (8-bit): 109 // Memory (32-bit): 143 //--------------------------------------------------------------------------- @@ -6005,7 +6005,7 @@ const extended::ZoneInfo kZoneAmerica_Recife ACE_TIME_PROGMEM = { // Zone name: America/Regina // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -6039,7 +6039,7 @@ const extended::ZoneInfo kZoneAmerica_Regina ACE_TIME_PROGMEM = { // Zone name: America/Resolute // Zone Eras: 5 // Strings (bytes): 37 -// Memory (8-bit): 104 +// Memory (8-bit): 103 // Memory (32-bit): 137 //--------------------------------------------------------------------------- @@ -6121,7 +6121,7 @@ const extended::ZoneInfo kZoneAmerica_Resolute ACE_TIME_PROGMEM = { // Zone name: America/Rio_Branco // Zone Eras: 3 // Strings (bytes): 31 -// Memory (8-bit): 76 +// Memory (8-bit): 75 // Memory (32-bit): 99 //--------------------------------------------------------------------------- @@ -6179,7 +6179,7 @@ const extended::ZoneInfo kZoneAmerica_Rio_Branco ACE_TIME_PROGMEM = { // Zone name: America/Santarem // Zone Eras: 2 // Strings (bytes): 25 -// Memory (8-bit): 59 +// Memory (8-bit): 58 // Memory (32-bit): 77 //--------------------------------------------------------------------------- @@ -6225,7 +6225,7 @@ const extended::ZoneInfo kZoneAmerica_Santarem ACE_TIME_PROGMEM = { // Zone name: America/Santiago // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -6259,7 +6259,7 @@ const extended::ZoneInfo kZoneAmerica_Santiago ACE_TIME_PROGMEM = { // Zone name: America/Santo_Domingo // Zone Eras: 3 // Strings (bytes): 34 -// Memory (8-bit): 79 +// Memory (8-bit): 78 // Memory (32-bit): 102 //--------------------------------------------------------------------------- @@ -6317,7 +6317,7 @@ const extended::ZoneInfo kZoneAmerica_Santo_Domingo ACE_TIME_PROGMEM = { // Zone name: America/Sao_Paulo // Zone Eras: 1 // Strings (bytes): 26 -// Memory (8-bit): 49 +// Memory (8-bit): 48 // Memory (32-bit): 62 //--------------------------------------------------------------------------- @@ -6351,7 +6351,7 @@ const extended::ZoneInfo kZoneAmerica_Sao_Paulo ACE_TIME_PROGMEM = { // Zone name: America/Scoresbysund // Zone Eras: 1 // Strings (bytes): 29 -// Memory (8-bit): 52 +// Memory (8-bit): 51 // Memory (32-bit): 65 //--------------------------------------------------------------------------- @@ -6385,7 +6385,7 @@ const extended::ZoneInfo kZoneAmerica_Scoresbysund ACE_TIME_PROGMEM = { // Zone name: America/Sitka // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -6419,7 +6419,7 @@ const extended::ZoneInfo kZoneAmerica_Sitka ACE_TIME_PROGMEM = { // Zone name: America/St_Johns // Zone Eras: 2 // Strings (bytes): 25 -// Memory (8-bit): 59 +// Memory (8-bit): 58 // Memory (32-bit): 77 //--------------------------------------------------------------------------- @@ -6465,7 +6465,7 @@ const extended::ZoneInfo kZoneAmerica_St_Johns ACE_TIME_PROGMEM = { // Zone name: America/Swift_Current // Zone Eras: 1 // Strings (bytes): 26 -// Memory (8-bit): 49 +// Memory (8-bit): 48 // Memory (32-bit): 62 //--------------------------------------------------------------------------- @@ -6499,7 +6499,7 @@ const extended::ZoneInfo kZoneAmerica_Swift_Current ACE_TIME_PROGMEM = { // Zone name: America/Tegucigalpa // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -6533,7 +6533,7 @@ const extended::ZoneInfo kZoneAmerica_Tegucigalpa ACE_TIME_PROGMEM = { // Zone name: America/Thule // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -6567,7 +6567,7 @@ const extended::ZoneInfo kZoneAmerica_Thule ACE_TIME_PROGMEM = { // Zone name: America/Thunder_Bay // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -6601,7 +6601,7 @@ const extended::ZoneInfo kZoneAmerica_Thunder_Bay ACE_TIME_PROGMEM = { // Zone name: America/Tijuana // Zone Eras: 4 // Strings (bytes): 32 -// Memory (8-bit): 88 +// Memory (8-bit): 87 // Memory (32-bit): 116 //--------------------------------------------------------------------------- @@ -6671,7 +6671,7 @@ const extended::ZoneInfo kZoneAmerica_Tijuana ACE_TIME_PROGMEM = { // Zone name: America/Toronto // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -6705,7 +6705,7 @@ const extended::ZoneInfo kZoneAmerica_Toronto ACE_TIME_PROGMEM = { // Zone name: America/Vancouver // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -6739,7 +6739,7 @@ const extended::ZoneInfo kZoneAmerica_Vancouver ACE_TIME_PROGMEM = { // Zone name: America/Whitehorse // Zone Eras: 2 // Strings (bytes): 27 -// Memory (8-bit): 61 +// Memory (8-bit): 60 // Memory (32-bit): 79 //--------------------------------------------------------------------------- @@ -6785,7 +6785,7 @@ const extended::ZoneInfo kZoneAmerica_Whitehorse ACE_TIME_PROGMEM = { // Zone name: America/Winnipeg // Zone Eras: 2 // Strings (bytes): 25 -// Memory (8-bit): 59 +// Memory (8-bit): 58 // Memory (32-bit): 77 //--------------------------------------------------------------------------- @@ -6831,7 +6831,7 @@ const extended::ZoneInfo kZoneAmerica_Winnipeg ACE_TIME_PROGMEM = { // Zone name: America/Yakutat // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -6865,7 +6865,7 @@ const extended::ZoneInfo kZoneAmerica_Yakutat ACE_TIME_PROGMEM = { // Zone name: America/Yellowknife // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -6899,7 +6899,7 @@ const extended::ZoneInfo kZoneAmerica_Yellowknife ACE_TIME_PROGMEM = { // Zone name: Antarctica/Casey // Zone Eras: 12 // Strings (bytes): 65 -// Memory (8-bit): 209 +// Memory (8-bit): 208 // Memory (32-bit): 277 //--------------------------------------------------------------------------- @@ -7065,7 +7065,7 @@ const extended::ZoneInfo kZoneAntarctica_Casey ACE_TIME_PROGMEM = { // Zone name: Antarctica/Davis // Zone Eras: 5 // Strings (bytes): 37 -// Memory (8-bit): 104 +// Memory (8-bit): 103 // Memory (32-bit): 137 //--------------------------------------------------------------------------- @@ -7147,7 +7147,7 @@ const extended::ZoneInfo kZoneAntarctica_Davis ACE_TIME_PROGMEM = { // Zone name: Antarctica/DumontDUrville // Zone Eras: 1 // Strings (bytes): 30 -// Memory (8-bit): 53 +// Memory (8-bit): 52 // Memory (32-bit): 66 //--------------------------------------------------------------------------- @@ -7181,7 +7181,7 @@ const extended::ZoneInfo kZoneAntarctica_DumontDUrville ACE_TIME_PROGMEM = { // Zone name: Antarctica/Macquarie // Zone Eras: 3 // Strings (bytes): 36 -// Memory (8-bit): 81 +// Memory (8-bit): 80 // Memory (32-bit): 104 //--------------------------------------------------------------------------- @@ -7239,7 +7239,7 @@ const extended::ZoneInfo kZoneAntarctica_Macquarie ACE_TIME_PROGMEM = { // Zone name: Antarctica/Mawson // Zone Eras: 2 // Strings (bytes): 26 -// Memory (8-bit): 60 +// Memory (8-bit): 59 // Memory (32-bit): 78 //--------------------------------------------------------------------------- @@ -7285,7 +7285,7 @@ const extended::ZoneInfo kZoneAntarctica_Mawson ACE_TIME_PROGMEM = { // Zone name: Antarctica/Palmer // Zone Eras: 2 // Strings (bytes): 30 -// Memory (8-bit): 64 +// Memory (8-bit): 63 // Memory (32-bit): 82 //--------------------------------------------------------------------------- @@ -7331,7 +7331,7 @@ const extended::ZoneInfo kZoneAntarctica_Palmer ACE_TIME_PROGMEM = { // Zone name: Antarctica/Rothera // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -7365,7 +7365,7 @@ const extended::ZoneInfo kZoneAntarctica_Rothera ACE_TIME_PROGMEM = { // Zone name: Antarctica/Syowa // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -7399,7 +7399,7 @@ const extended::ZoneInfo kZoneAntarctica_Syowa ACE_TIME_PROGMEM = { // Zone name: Antarctica/Troll // Zone Eras: 2 // Strings (bytes): 23 -// Memory (8-bit): 57 +// Memory (8-bit): 56 // Memory (32-bit): 75 //--------------------------------------------------------------------------- @@ -7445,7 +7445,7 @@ const extended::ZoneInfo kZoneAntarctica_Troll ACE_TIME_PROGMEM = { // Zone name: Antarctica/Vostok // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -7479,7 +7479,7 @@ const extended::ZoneInfo kZoneAntarctica_Vostok ACE_TIME_PROGMEM = { // Zone name: Asia/Almaty // Zone Eras: 2 // Strings (bytes): 24 -// Memory (8-bit): 58 +// Memory (8-bit): 57 // Memory (32-bit): 76 //--------------------------------------------------------------------------- @@ -7525,7 +7525,7 @@ const extended::ZoneInfo kZoneAsia_Almaty ACE_TIME_PROGMEM = { // Zone name: Asia/Amman // Zone Eras: 1 // Strings (bytes): 16 -// Memory (8-bit): 39 +// Memory (8-bit): 38 // Memory (32-bit): 52 //--------------------------------------------------------------------------- @@ -7559,7 +7559,7 @@ const extended::ZoneInfo kZoneAsia_Amman ACE_TIME_PROGMEM = { // Zone name: Asia/Anadyr // Zone Eras: 3 // Strings (bytes): 32 -// Memory (8-bit): 77 +// Memory (8-bit): 76 // Memory (32-bit): 100 //--------------------------------------------------------------------------- @@ -7617,7 +7617,7 @@ const extended::ZoneInfo kZoneAsia_Anadyr ACE_TIME_PROGMEM = { // Zone name: Asia/Aqtau // Zone Eras: 2 // Strings (bytes): 23 -// Memory (8-bit): 57 +// Memory (8-bit): 56 // Memory (32-bit): 75 //--------------------------------------------------------------------------- @@ -7663,7 +7663,7 @@ const extended::ZoneInfo kZoneAsia_Aqtau ACE_TIME_PROGMEM = { // Zone name: Asia/Aqtobe // Zone Eras: 2 // Strings (bytes): 24 -// Memory (8-bit): 58 +// Memory (8-bit): 57 // Memory (32-bit): 76 //--------------------------------------------------------------------------- @@ -7709,7 +7709,7 @@ const extended::ZoneInfo kZoneAsia_Aqtobe ACE_TIME_PROGMEM = { // Zone name: Asia/Ashgabat // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -7743,7 +7743,7 @@ const extended::ZoneInfo kZoneAsia_Ashgabat ACE_TIME_PROGMEM = { // Zone name: Asia/Atyrau // Zone Eras: 3 // Strings (bytes): 32 -// Memory (8-bit): 77 +// Memory (8-bit): 76 // Memory (32-bit): 100 //--------------------------------------------------------------------------- @@ -7801,7 +7801,7 @@ const extended::ZoneInfo kZoneAsia_Atyrau ACE_TIME_PROGMEM = { // Zone name: Asia/Baghdad // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -7835,7 +7835,7 @@ const extended::ZoneInfo kZoneAsia_Baghdad ACE_TIME_PROGMEM = { // Zone name: Asia/Baku // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -7869,7 +7869,7 @@ const extended::ZoneInfo kZoneAsia_Baku ACE_TIME_PROGMEM = { // Zone name: Asia/Bangkok // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -7903,7 +7903,7 @@ const extended::ZoneInfo kZoneAsia_Bangkok ACE_TIME_PROGMEM = { // Zone name: Asia/Barnaul // Zone Eras: 4 // Strings (bytes): 33 -// Memory (8-bit): 89 +// Memory (8-bit): 88 // Memory (32-bit): 117 //--------------------------------------------------------------------------- @@ -7973,7 +7973,7 @@ const extended::ZoneInfo kZoneAsia_Barnaul ACE_TIME_PROGMEM = { // Zone name: Asia/Beirut // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -8007,7 +8007,7 @@ const extended::ZoneInfo kZoneAsia_Beirut ACE_TIME_PROGMEM = { // Zone name: Asia/Bishkek // Zone Eras: 2 // Strings (bytes): 25 -// Memory (8-bit): 59 +// Memory (8-bit): 58 // Memory (32-bit): 77 //--------------------------------------------------------------------------- @@ -8053,7 +8053,7 @@ const extended::ZoneInfo kZoneAsia_Bishkek ACE_TIME_PROGMEM = { // Zone name: Asia/Brunei // Zone Eras: 1 // Strings (bytes): 16 -// Memory (8-bit): 39 +// Memory (8-bit): 38 // Memory (32-bit): 52 //--------------------------------------------------------------------------- @@ -8087,7 +8087,7 @@ const extended::ZoneInfo kZoneAsia_Brunei ACE_TIME_PROGMEM = { // Zone name: Asia/Chita // Zone Eras: 4 // Strings (bytes): 31 -// Memory (8-bit): 87 +// Memory (8-bit): 86 // Memory (32-bit): 115 //--------------------------------------------------------------------------- @@ -8157,7 +8157,7 @@ const extended::ZoneInfo kZoneAsia_Chita ACE_TIME_PROGMEM = { // Zone name: Asia/Choibalsan // Zone Eras: 2 // Strings (bytes): 32 -// Memory (8-bit): 66 +// Memory (8-bit): 65 // Memory (32-bit): 84 //--------------------------------------------------------------------------- @@ -8203,7 +8203,7 @@ const extended::ZoneInfo kZoneAsia_Choibalsan ACE_TIME_PROGMEM = { // Zone name: Asia/Colombo // Zone Eras: 2 // Strings (bytes): 23 -// Memory (8-bit): 57 +// Memory (8-bit): 56 // Memory (32-bit): 75 //--------------------------------------------------------------------------- @@ -8249,7 +8249,7 @@ const extended::ZoneInfo kZoneAsia_Colombo ACE_TIME_PROGMEM = { // Zone name: Asia/Damascus // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -8283,7 +8283,7 @@ const extended::ZoneInfo kZoneAsia_Damascus ACE_TIME_PROGMEM = { // Zone name: Asia/Dhaka // Zone Eras: 2 // Strings (bytes): 23 -// Memory (8-bit): 57 +// Memory (8-bit): 56 // Memory (32-bit): 75 //--------------------------------------------------------------------------- @@ -8329,7 +8329,7 @@ const extended::ZoneInfo kZoneAsia_Dhaka ACE_TIME_PROGMEM = { // Zone name: Asia/Dili // Zone Eras: 2 // Strings (bytes): 18 -// Memory (8-bit): 52 +// Memory (8-bit): 51 // Memory (32-bit): 70 //--------------------------------------------------------------------------- @@ -8375,7 +8375,7 @@ const extended::ZoneInfo kZoneAsia_Dili ACE_TIME_PROGMEM = { // Zone name: Asia/Dubai // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -8409,7 +8409,7 @@ const extended::ZoneInfo kZoneAsia_Dubai ACE_TIME_PROGMEM = { // Zone name: Asia/Dushanbe // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -8443,7 +8443,7 @@ const extended::ZoneInfo kZoneAsia_Dushanbe ACE_TIME_PROGMEM = { // Zone name: Asia/Famagusta // Zone Eras: 3 // Strings (bytes): 29 -// Memory (8-bit): 74 +// Memory (8-bit): 73 // Memory (32-bit): 97 //--------------------------------------------------------------------------- @@ -8501,7 +8501,7 @@ const extended::ZoneInfo kZoneAsia_Famagusta ACE_TIME_PROGMEM = { // Zone name: Asia/Gaza // Zone Eras: 8 // Strings (bytes): 47 -// Memory (8-bit): 147 +// Memory (8-bit): 146 // Memory (32-bit): 195 //--------------------------------------------------------------------------- @@ -8619,7 +8619,7 @@ const extended::ZoneInfo kZoneAsia_Gaza ACE_TIME_PROGMEM = { // Zone name: Asia/Hebron // Zone Eras: 2 // Strings (bytes): 22 -// Memory (8-bit): 56 +// Memory (8-bit): 55 // Memory (32-bit): 74 //--------------------------------------------------------------------------- @@ -8665,7 +8665,7 @@ const extended::ZoneInfo kZoneAsia_Hebron ACE_TIME_PROGMEM = { // Zone name: Asia/Ho_Chi_Minh // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -8699,7 +8699,7 @@ const extended::ZoneInfo kZoneAsia_Ho_Chi_Minh ACE_TIME_PROGMEM = { // Zone name: Asia/Hong_Kong // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -8733,7 +8733,7 @@ const extended::ZoneInfo kZoneAsia_Hong_Kong ACE_TIME_PROGMEM = { // Zone name: Asia/Hovd // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -8767,7 +8767,7 @@ const extended::ZoneInfo kZoneAsia_Hovd ACE_TIME_PROGMEM = { // Zone name: Asia/Irkutsk // Zone Eras: 3 // Strings (bytes): 29 -// Memory (8-bit): 74 +// Memory (8-bit): 73 // Memory (32-bit): 97 //--------------------------------------------------------------------------- @@ -8825,7 +8825,7 @@ const extended::ZoneInfo kZoneAsia_Irkutsk ACE_TIME_PROGMEM = { // Zone name: Asia/Jakarta // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -8859,7 +8859,7 @@ const extended::ZoneInfo kZoneAsia_Jakarta ACE_TIME_PROGMEM = { // Zone name: Asia/Jayapura // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -8893,7 +8893,7 @@ const extended::ZoneInfo kZoneAsia_Jayapura ACE_TIME_PROGMEM = { // Zone name: Asia/Jerusalem // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -8927,7 +8927,7 @@ const extended::ZoneInfo kZoneAsia_Jerusalem ACE_TIME_PROGMEM = { // Zone name: Asia/Kabul // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -8961,7 +8961,7 @@ const extended::ZoneInfo kZoneAsia_Kabul ACE_TIME_PROGMEM = { // Zone name: Asia/Kamchatka // Zone Eras: 3 // Strings (bytes): 35 -// Memory (8-bit): 80 +// Memory (8-bit): 79 // Memory (32-bit): 103 //--------------------------------------------------------------------------- @@ -9019,7 +9019,7 @@ const extended::ZoneInfo kZoneAsia_Kamchatka ACE_TIME_PROGMEM = { // Zone name: Asia/Karachi // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -9053,7 +9053,7 @@ const extended::ZoneInfo kZoneAsia_Karachi ACE_TIME_PROGMEM = { // Zone name: Asia/Kathmandu // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -9087,7 +9087,7 @@ const extended::ZoneInfo kZoneAsia_Kathmandu ACE_TIME_PROGMEM = { // Zone name: Asia/Khandyga // Zone Eras: 5 // Strings (bytes): 42 -// Memory (8-bit): 109 +// Memory (8-bit): 108 // Memory (32-bit): 142 //--------------------------------------------------------------------------- @@ -9169,7 +9169,7 @@ const extended::ZoneInfo kZoneAsia_Khandyga ACE_TIME_PROGMEM = { // Zone name: Asia/Kolkata // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -9203,7 +9203,7 @@ const extended::ZoneInfo kZoneAsia_Kolkata ACE_TIME_PROGMEM = { // Zone name: Asia/Krasnoyarsk // Zone Eras: 3 // Strings (bytes): 33 -// Memory (8-bit): 78 +// Memory (8-bit): 77 // Memory (32-bit): 101 //--------------------------------------------------------------------------- @@ -9261,7 +9261,7 @@ const extended::ZoneInfo kZoneAsia_Krasnoyarsk ACE_TIME_PROGMEM = { // Zone name: Asia/Kuala_Lumpur // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -9295,7 +9295,7 @@ const extended::ZoneInfo kZoneAsia_Kuala_Lumpur ACE_TIME_PROGMEM = { // Zone name: Asia/Kuching // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -9329,7 +9329,7 @@ const extended::ZoneInfo kZoneAsia_Kuching ACE_TIME_PROGMEM = { // Zone name: Asia/Macau // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -9363,7 +9363,7 @@ const extended::ZoneInfo kZoneAsia_Macau ACE_TIME_PROGMEM = { // Zone name: Asia/Magadan // Zone Eras: 4 // Strings (bytes): 33 -// Memory (8-bit): 89 +// Memory (8-bit): 88 // Memory (32-bit): 117 //--------------------------------------------------------------------------- @@ -9433,7 +9433,7 @@ const extended::ZoneInfo kZoneAsia_Magadan ACE_TIME_PROGMEM = { // Zone name: Asia/Makassar // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -9467,7 +9467,7 @@ const extended::ZoneInfo kZoneAsia_Makassar ACE_TIME_PROGMEM = { // Zone name: Asia/Manila // Zone Eras: 1 // Strings (bytes): 16 -// Memory (8-bit): 39 +// Memory (8-bit): 38 // Memory (32-bit): 52 //--------------------------------------------------------------------------- @@ -9501,7 +9501,7 @@ const extended::ZoneInfo kZoneAsia_Manila ACE_TIME_PROGMEM = { // Zone name: Asia/Nicosia // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -9535,7 +9535,7 @@ const extended::ZoneInfo kZoneAsia_Nicosia ACE_TIME_PROGMEM = { // Zone name: Asia/Novokuznetsk // Zone Eras: 3 // Strings (bytes): 38 -// Memory (8-bit): 83 +// Memory (8-bit): 82 // Memory (32-bit): 106 //--------------------------------------------------------------------------- @@ -9593,7 +9593,7 @@ const extended::ZoneInfo kZoneAsia_Novokuznetsk ACE_TIME_PROGMEM = { // Zone name: Asia/Novosibirsk // Zone Eras: 4 // Strings (bytes): 37 -// Memory (8-bit): 93 +// Memory (8-bit): 92 // Memory (32-bit): 121 //--------------------------------------------------------------------------- @@ -9663,7 +9663,7 @@ const extended::ZoneInfo kZoneAsia_Novosibirsk ACE_TIME_PROGMEM = { // Zone name: Asia/Omsk // Zone Eras: 3 // Strings (bytes): 26 -// Memory (8-bit): 71 +// Memory (8-bit): 70 // Memory (32-bit): 94 //--------------------------------------------------------------------------- @@ -9721,7 +9721,7 @@ const extended::ZoneInfo kZoneAsia_Omsk ACE_TIME_PROGMEM = { // Zone name: Asia/Oral // Zone Eras: 2 // Strings (bytes): 22 -// Memory (8-bit): 56 +// Memory (8-bit): 55 // Memory (32-bit): 74 //--------------------------------------------------------------------------- @@ -9767,7 +9767,7 @@ const extended::ZoneInfo kZoneAsia_Oral ACE_TIME_PROGMEM = { // Zone name: Asia/Pontianak // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -9801,7 +9801,7 @@ const extended::ZoneInfo kZoneAsia_Pontianak ACE_TIME_PROGMEM = { // Zone name: Asia/Pyongyang // Zone Eras: 3 // Strings (bytes): 27 -// Memory (8-bit): 72 +// Memory (8-bit): 71 // Memory (32-bit): 95 //--------------------------------------------------------------------------- @@ -9859,7 +9859,7 @@ const extended::ZoneInfo kZoneAsia_Pyongyang ACE_TIME_PROGMEM = { // Zone name: Asia/Qatar // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -9893,7 +9893,7 @@ const extended::ZoneInfo kZoneAsia_Qatar ACE_TIME_PROGMEM = { // Zone name: Asia/Qostanay // Zone Eras: 2 // Strings (bytes): 26 -// Memory (8-bit): 60 +// Memory (8-bit): 59 // Memory (32-bit): 78 //--------------------------------------------------------------------------- @@ -9939,7 +9939,7 @@ const extended::ZoneInfo kZoneAsia_Qostanay ACE_TIME_PROGMEM = { // Zone name: Asia/Qyzylorda // Zone Eras: 3 // Strings (bytes): 31 -// Memory (8-bit): 76 +// Memory (8-bit): 75 // Memory (32-bit): 99 //--------------------------------------------------------------------------- @@ -9997,7 +9997,7 @@ const extended::ZoneInfo kZoneAsia_Qyzylorda ACE_TIME_PROGMEM = { // Zone name: Asia/Riyadh // Zone Eras: 1 // Strings (bytes): 16 -// Memory (8-bit): 39 +// Memory (8-bit): 38 // Memory (32-bit): 52 //--------------------------------------------------------------------------- @@ -10031,7 +10031,7 @@ const extended::ZoneInfo kZoneAsia_Riyadh ACE_TIME_PROGMEM = { // Zone name: Asia/Sakhalin // Zone Eras: 4 // Strings (bytes): 34 -// Memory (8-bit): 90 +// Memory (8-bit): 89 // Memory (32-bit): 118 //--------------------------------------------------------------------------- @@ -10101,7 +10101,7 @@ const extended::ZoneInfo kZoneAsia_Sakhalin ACE_TIME_PROGMEM = { // Zone name: Asia/Samarkand // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -10135,7 +10135,7 @@ const extended::ZoneInfo kZoneAsia_Samarkand ACE_TIME_PROGMEM = { // Zone name: Asia/Seoul // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -10169,7 +10169,7 @@ const extended::ZoneInfo kZoneAsia_Seoul ACE_TIME_PROGMEM = { // Zone name: Asia/Shanghai // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -10203,7 +10203,7 @@ const extended::ZoneInfo kZoneAsia_Shanghai ACE_TIME_PROGMEM = { // Zone name: Asia/Singapore // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -10237,7 +10237,7 @@ const extended::ZoneInfo kZoneAsia_Singapore ACE_TIME_PROGMEM = { // Zone name: Asia/Srednekolymsk // Zone Eras: 3 // Strings (bytes): 35 -// Memory (8-bit): 80 +// Memory (8-bit): 79 // Memory (32-bit): 103 //--------------------------------------------------------------------------- @@ -10295,7 +10295,7 @@ const extended::ZoneInfo kZoneAsia_Srednekolymsk ACE_TIME_PROGMEM = { // Zone name: Asia/Taipei // Zone Eras: 1 // Strings (bytes): 16 -// Memory (8-bit): 39 +// Memory (8-bit): 38 // Memory (32-bit): 52 //--------------------------------------------------------------------------- @@ -10329,7 +10329,7 @@ const extended::ZoneInfo kZoneAsia_Taipei ACE_TIME_PROGMEM = { // Zone name: Asia/Tashkent // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -10363,7 +10363,7 @@ const extended::ZoneInfo kZoneAsia_Tashkent ACE_TIME_PROGMEM = { // Zone name: Asia/Tbilisi // Zone Eras: 3 // Strings (bytes): 33 -// Memory (8-bit): 78 +// Memory (8-bit): 77 // Memory (32-bit): 101 //--------------------------------------------------------------------------- @@ -10421,7 +10421,7 @@ const extended::ZoneInfo kZoneAsia_Tbilisi ACE_TIME_PROGMEM = { // Zone name: Asia/Tehran // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -10455,7 +10455,7 @@ const extended::ZoneInfo kZoneAsia_Tehran ACE_TIME_PROGMEM = { // Zone name: Asia/Thimphu // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -10489,7 +10489,7 @@ const extended::ZoneInfo kZoneAsia_Thimphu ACE_TIME_PROGMEM = { // Zone name: Asia/Tokyo // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -10523,7 +10523,7 @@ const extended::ZoneInfo kZoneAsia_Tokyo ACE_TIME_PROGMEM = { // Zone name: Asia/Tomsk // Zone Eras: 5 // Strings (bytes): 39 -// Memory (8-bit): 106 +// Memory (8-bit): 105 // Memory (32-bit): 139 //--------------------------------------------------------------------------- @@ -10605,7 +10605,7 @@ const extended::ZoneInfo kZoneAsia_Tomsk ACE_TIME_PROGMEM = { // Zone name: Asia/Ulaanbaatar // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -10639,7 +10639,7 @@ const extended::ZoneInfo kZoneAsia_Ulaanbaatar ACE_TIME_PROGMEM = { // Zone name: Asia/Urumqi // Zone Eras: 1 // Strings (bytes): 16 -// Memory (8-bit): 39 +// Memory (8-bit): 38 // Memory (32-bit): 52 //--------------------------------------------------------------------------- @@ -10673,7 +10673,7 @@ const extended::ZoneInfo kZoneAsia_Urumqi ACE_TIME_PROGMEM = { // Zone name: Asia/Ust-Nera // Zone Eras: 4 // Strings (bytes): 34 -// Memory (8-bit): 90 +// Memory (8-bit): 89 // Memory (32-bit): 118 //--------------------------------------------------------------------------- @@ -10743,7 +10743,7 @@ const extended::ZoneInfo kZoneAsia_Ust_Nera ACE_TIME_PROGMEM = { // Zone name: Asia/Vladivostok // Zone Eras: 3 // Strings (bytes): 33 -// Memory (8-bit): 78 +// Memory (8-bit): 77 // Memory (32-bit): 101 //--------------------------------------------------------------------------- @@ -10801,7 +10801,7 @@ const extended::ZoneInfo kZoneAsia_Vladivostok ACE_TIME_PROGMEM = { // Zone name: Asia/Yakutsk // Zone Eras: 3 // Strings (bytes): 29 -// Memory (8-bit): 74 +// Memory (8-bit): 73 // Memory (32-bit): 97 //--------------------------------------------------------------------------- @@ -10859,7 +10859,7 @@ const extended::ZoneInfo kZoneAsia_Yakutsk ACE_TIME_PROGMEM = { // Zone name: Asia/Yangon // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -10893,7 +10893,7 @@ const extended::ZoneInfo kZoneAsia_Yangon ACE_TIME_PROGMEM = { // Zone name: Asia/Yekaterinburg // Zone Eras: 3 // Strings (bytes): 35 -// Memory (8-bit): 80 +// Memory (8-bit): 79 // Memory (32-bit): 103 //--------------------------------------------------------------------------- @@ -10951,7 +10951,7 @@ const extended::ZoneInfo kZoneAsia_Yekaterinburg ACE_TIME_PROGMEM = { // Zone name: Asia/Yerevan // Zone Eras: 2 // Strings (bytes): 29 -// Memory (8-bit): 63 +// Memory (8-bit): 62 // Memory (32-bit): 81 //--------------------------------------------------------------------------- @@ -10997,7 +10997,7 @@ const extended::ZoneInfo kZoneAsia_Yerevan ACE_TIME_PROGMEM = { // Zone name: Atlantic/Azores // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -11031,7 +11031,7 @@ const extended::ZoneInfo kZoneAtlantic_Azores ACE_TIME_PROGMEM = { // Zone name: Atlantic/Bermuda // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -11065,7 +11065,7 @@ const extended::ZoneInfo kZoneAtlantic_Bermuda ACE_TIME_PROGMEM = { // Zone name: Atlantic/Canary // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -11099,7 +11099,7 @@ const extended::ZoneInfo kZoneAtlantic_Canary ACE_TIME_PROGMEM = { // Zone name: Atlantic/Cape_Verde // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -11133,7 +11133,7 @@ const extended::ZoneInfo kZoneAtlantic_Cape_Verde ACE_TIME_PROGMEM = { // Zone name: Atlantic/Faroe // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -11167,7 +11167,7 @@ const extended::ZoneInfo kZoneAtlantic_Faroe ACE_TIME_PROGMEM = { // Zone name: Atlantic/Madeira // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -11201,7 +11201,7 @@ const extended::ZoneInfo kZoneAtlantic_Madeira ACE_TIME_PROGMEM = { // Zone name: Atlantic/Reykjavik // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -11235,7 +11235,7 @@ const extended::ZoneInfo kZoneAtlantic_Reykjavik ACE_TIME_PROGMEM = { // Zone name: Atlantic/South_Georgia // Zone Eras: 1 // Strings (bytes): 27 -// Memory (8-bit): 50 +// Memory (8-bit): 49 // Memory (32-bit): 63 //--------------------------------------------------------------------------- @@ -11269,7 +11269,7 @@ const extended::ZoneInfo kZoneAtlantic_South_Georgia ACE_TIME_PROGMEM = { // Zone name: Atlantic/Stanley // Zone Eras: 2 // Strings (bytes): 29 -// Memory (8-bit): 63 +// Memory (8-bit): 62 // Memory (32-bit): 81 //--------------------------------------------------------------------------- @@ -11315,7 +11315,7 @@ const extended::ZoneInfo kZoneAtlantic_Stanley ACE_TIME_PROGMEM = { // Zone name: Australia/Adelaide // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -11349,7 +11349,7 @@ const extended::ZoneInfo kZoneAustralia_Adelaide ACE_TIME_PROGMEM = { // Zone name: Australia/Brisbane // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -11383,7 +11383,7 @@ const extended::ZoneInfo kZoneAustralia_Brisbane ACE_TIME_PROGMEM = { // Zone name: Australia/Broken_Hill // Zone Eras: 2 // Strings (bytes): 32 -// Memory (8-bit): 66 +// Memory (8-bit): 65 // Memory (32-bit): 84 //--------------------------------------------------------------------------- @@ -11429,7 +11429,7 @@ const extended::ZoneInfo kZoneAustralia_Broken_Hill ACE_TIME_PROGMEM = { // Zone name: Australia/Darwin // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -11463,7 +11463,7 @@ const extended::ZoneInfo kZoneAustralia_Darwin ACE_TIME_PROGMEM = { // Zone name: Australia/Eucla // Zone Eras: 1 // Strings (bytes): 28 -// Memory (8-bit): 51 +// Memory (8-bit): 50 // Memory (32-bit): 64 //--------------------------------------------------------------------------- @@ -11497,7 +11497,7 @@ const extended::ZoneInfo kZoneAustralia_Eucla ACE_TIME_PROGMEM = { // Zone name: Australia/Hobart // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -11531,7 +11531,7 @@ const extended::ZoneInfo kZoneAustralia_Hobart ACE_TIME_PROGMEM = { // Zone name: Australia/Lindeman // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -11565,7 +11565,7 @@ const extended::ZoneInfo kZoneAustralia_Lindeman ACE_TIME_PROGMEM = { // Zone name: Australia/Lord_Howe // Zone Eras: 1 // Strings (bytes): 30 -// Memory (8-bit): 53 +// Memory (8-bit): 52 // Memory (32-bit): 66 //--------------------------------------------------------------------------- @@ -11599,7 +11599,7 @@ const extended::ZoneInfo kZoneAustralia_Lord_Howe ACE_TIME_PROGMEM = { // Zone name: Australia/Melbourne // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -11633,7 +11633,7 @@ const extended::ZoneInfo kZoneAustralia_Melbourne ACE_TIME_PROGMEM = { // Zone name: Australia/Perth // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -11667,7 +11667,7 @@ const extended::ZoneInfo kZoneAustralia_Perth ACE_TIME_PROGMEM = { // Zone name: Australia/Sydney // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -11701,7 +11701,7 @@ const extended::ZoneInfo kZoneAustralia_Sydney ACE_TIME_PROGMEM = { // Zone name: CET // Zone Eras: 1 // Strings (bytes): 9 -// Memory (8-bit): 32 +// Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- @@ -11735,7 +11735,7 @@ const extended::ZoneInfo kZoneCET ACE_TIME_PROGMEM = { // Zone name: CST6CDT // Zone Eras: 1 // Strings (bytes): 12 -// Memory (8-bit): 35 +// Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -11769,7 +11769,7 @@ const extended::ZoneInfo kZoneCST6CDT ACE_TIME_PROGMEM = { // Zone name: EET // Zone Eras: 1 // Strings (bytes): 9 -// Memory (8-bit): 32 +// Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- @@ -11803,7 +11803,7 @@ const extended::ZoneInfo kZoneEET ACE_TIME_PROGMEM = { // Zone name: EST // Zone Eras: 1 // Strings (bytes): 8 -// Memory (8-bit): 31 +// Memory (8-bit): 30 // Memory (32-bit): 44 //--------------------------------------------------------------------------- @@ -11837,7 +11837,7 @@ const extended::ZoneInfo kZoneEST ACE_TIME_PROGMEM = { // Zone name: EST5EDT // Zone Eras: 1 // Strings (bytes): 12 -// Memory (8-bit): 35 +// Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -11871,7 +11871,7 @@ const extended::ZoneInfo kZoneEST5EDT ACE_TIME_PROGMEM = { // Zone name: Etc/GMT // Zone Eras: 1 // Strings (bytes): 12 -// Memory (8-bit): 35 +// Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -11905,7 +11905,7 @@ const extended::ZoneInfo kZoneEtc_GMT ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+1 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -11939,7 +11939,7 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_1 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+10 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -11973,7 +11973,7 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_10 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+11 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -12007,7 +12007,7 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_11 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+12 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -12041,7 +12041,7 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_12 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+2 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12075,7 +12075,7 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_2 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+3 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12109,7 +12109,7 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_3 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+4 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12143,7 +12143,7 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_4 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+5 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12177,7 +12177,7 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_5 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+6 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12211,7 +12211,7 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_6 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+7 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12245,7 +12245,7 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_7 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+8 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12279,7 +12279,7 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_8 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT+9 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12313,7 +12313,7 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_9 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-1 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12347,7 +12347,7 @@ const extended::ZoneInfo kZoneEtc_GMT_1 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-10 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -12381,7 +12381,7 @@ const extended::ZoneInfo kZoneEtc_GMT_10 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-11 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -12415,7 +12415,7 @@ const extended::ZoneInfo kZoneEtc_GMT_11 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-12 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -12449,7 +12449,7 @@ const extended::ZoneInfo kZoneEtc_GMT_12 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-13 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -12483,7 +12483,7 @@ const extended::ZoneInfo kZoneEtc_GMT_13 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-14 // Zone Eras: 1 // Strings (bytes): 15 -// Memory (8-bit): 38 +// Memory (8-bit): 37 // Memory (32-bit): 51 //--------------------------------------------------------------------------- @@ -12517,7 +12517,7 @@ const extended::ZoneInfo kZoneEtc_GMT_14 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-2 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12551,7 +12551,7 @@ const extended::ZoneInfo kZoneEtc_GMT_2 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-3 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12585,7 +12585,7 @@ const extended::ZoneInfo kZoneEtc_GMT_3 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-4 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12619,7 +12619,7 @@ const extended::ZoneInfo kZoneEtc_GMT_4 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-5 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12653,7 +12653,7 @@ const extended::ZoneInfo kZoneEtc_GMT_5 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-6 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12687,7 +12687,7 @@ const extended::ZoneInfo kZoneEtc_GMT_6 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-7 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12721,7 +12721,7 @@ const extended::ZoneInfo kZoneEtc_GMT_7 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-8 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12755,7 +12755,7 @@ const extended::ZoneInfo kZoneEtc_GMT_8 ACE_TIME_PROGMEM = { // Zone name: Etc/GMT-9 // Zone Eras: 1 // Strings (bytes): 14 -// Memory (8-bit): 37 +// Memory (8-bit): 36 // Memory (32-bit): 50 //--------------------------------------------------------------------------- @@ -12789,7 +12789,7 @@ const extended::ZoneInfo kZoneEtc_GMT_9 ACE_TIME_PROGMEM = { // Zone name: Etc/UTC // Zone Eras: 1 // Strings (bytes): 12 -// Memory (8-bit): 35 +// Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -12823,7 +12823,7 @@ const extended::ZoneInfo kZoneEtc_UTC ACE_TIME_PROGMEM = { // Zone name: Europe/Amsterdam // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -12857,7 +12857,7 @@ const extended::ZoneInfo kZoneEurope_Amsterdam ACE_TIME_PROGMEM = { // Zone name: Europe/Andorra // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -12891,7 +12891,7 @@ const extended::ZoneInfo kZoneEurope_Andorra ACE_TIME_PROGMEM = { // Zone name: Europe/Astrakhan // Zone Eras: 4 // Strings (bytes): 37 -// Memory (8-bit): 93 +// Memory (8-bit): 92 // Memory (32-bit): 121 //--------------------------------------------------------------------------- @@ -12961,7 +12961,7 @@ const extended::ZoneInfo kZoneEurope_Astrakhan ACE_TIME_PROGMEM = { // Zone name: Europe/Athens // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -12995,7 +12995,7 @@ const extended::ZoneInfo kZoneEurope_Athens ACE_TIME_PROGMEM = { // Zone name: Europe/Belgrade // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -13029,7 +13029,7 @@ const extended::ZoneInfo kZoneEurope_Belgrade ACE_TIME_PROGMEM = { // Zone name: Europe/Berlin // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -13063,7 +13063,7 @@ const extended::ZoneInfo kZoneEurope_Berlin ACE_TIME_PROGMEM = { // Zone name: Europe/Brussels // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -13097,7 +13097,7 @@ const extended::ZoneInfo kZoneEurope_Brussels ACE_TIME_PROGMEM = { // Zone name: Europe/Bucharest // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -13131,7 +13131,7 @@ const extended::ZoneInfo kZoneEurope_Bucharest ACE_TIME_PROGMEM = { // Zone name: Europe/Budapest // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -13165,7 +13165,7 @@ const extended::ZoneInfo kZoneEurope_Budapest ACE_TIME_PROGMEM = { // Zone name: Europe/Chisinau // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -13199,7 +13199,7 @@ const extended::ZoneInfo kZoneEurope_Chisinau ACE_TIME_PROGMEM = { // Zone name: Europe/Copenhagen // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -13233,7 +13233,7 @@ const extended::ZoneInfo kZoneEurope_Copenhagen ACE_TIME_PROGMEM = { // Zone name: Europe/Dublin // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -13267,7 +13267,7 @@ const extended::ZoneInfo kZoneEurope_Dublin ACE_TIME_PROGMEM = { // Zone name: Europe/Gibraltar // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -13301,7 +13301,7 @@ const extended::ZoneInfo kZoneEurope_Gibraltar ACE_TIME_PROGMEM = { // Zone name: Europe/Helsinki // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -13335,7 +13335,7 @@ const extended::ZoneInfo kZoneEurope_Helsinki ACE_TIME_PROGMEM = { // Zone name: Europe/Istanbul // Zone Eras: 9 // Strings (bytes): 58 -// Memory (8-bit): 169 +// Memory (8-bit): 168 // Memory (32-bit): 222 //--------------------------------------------------------------------------- @@ -13465,7 +13465,7 @@ const extended::ZoneInfo kZoneEurope_Istanbul ACE_TIME_PROGMEM = { // Zone name: Europe/Kaliningrad // Zone Eras: 3 // Strings (bytes): 32 -// Memory (8-bit): 77 +// Memory (8-bit): 76 // Memory (32-bit): 100 //--------------------------------------------------------------------------- @@ -13523,7 +13523,7 @@ const extended::ZoneInfo kZoneEurope_Kaliningrad ACE_TIME_PROGMEM = { // Zone name: Europe/Kiev // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -13557,7 +13557,7 @@ const extended::ZoneInfo kZoneEurope_Kiev ACE_TIME_PROGMEM = { // Zone name: Europe/Kirov // Zone Eras: 3 // Strings (bytes): 29 -// Memory (8-bit): 74 +// Memory (8-bit): 73 // Memory (32-bit): 97 //--------------------------------------------------------------------------- @@ -13615,7 +13615,7 @@ const extended::ZoneInfo kZoneEurope_Kirov ACE_TIME_PROGMEM = { // Zone name: Europe/Lisbon // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -13649,7 +13649,7 @@ const extended::ZoneInfo kZoneEurope_Lisbon ACE_TIME_PROGMEM = { // Zone name: Europe/London // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -13683,7 +13683,7 @@ const extended::ZoneInfo kZoneEurope_London ACE_TIME_PROGMEM = { // Zone name: Europe/Luxembourg // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -13717,7 +13717,7 @@ const extended::ZoneInfo kZoneEurope_Luxembourg ACE_TIME_PROGMEM = { // Zone name: Europe/Madrid // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -13751,7 +13751,7 @@ const extended::ZoneInfo kZoneEurope_Madrid ACE_TIME_PROGMEM = { // Zone name: Europe/Malta // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -13785,7 +13785,7 @@ const extended::ZoneInfo kZoneEurope_Malta ACE_TIME_PROGMEM = { // Zone name: Europe/Minsk // Zone Eras: 2 // Strings (bytes): 22 -// Memory (8-bit): 56 +// Memory (8-bit): 55 // Memory (32-bit): 74 //--------------------------------------------------------------------------- @@ -13831,7 +13831,7 @@ const extended::ZoneInfo kZoneEurope_Minsk ACE_TIME_PROGMEM = { // Zone name: Europe/Monaco // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -13865,7 +13865,7 @@ const extended::ZoneInfo kZoneEurope_Monaco ACE_TIME_PROGMEM = { // Zone name: Europe/Moscow // Zone Eras: 3 // Strings (bytes): 30 -// Memory (8-bit): 75 +// Memory (8-bit): 74 // Memory (32-bit): 98 //--------------------------------------------------------------------------- @@ -13923,7 +13923,7 @@ const extended::ZoneInfo kZoneEurope_Moscow ACE_TIME_PROGMEM = { // Zone name: Europe/Oslo // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -13957,7 +13957,7 @@ const extended::ZoneInfo kZoneEurope_Oslo ACE_TIME_PROGMEM = { // Zone name: Europe/Paris // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -13991,7 +13991,7 @@ const extended::ZoneInfo kZoneEurope_Paris ACE_TIME_PROGMEM = { // Zone name: Europe/Prague // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -14025,7 +14025,7 @@ const extended::ZoneInfo kZoneEurope_Prague ACE_TIME_PROGMEM = { // Zone name: Europe/Riga // Zone Eras: 3 // Strings (bytes): 26 -// Memory (8-bit): 71 +// Memory (8-bit): 70 // Memory (32-bit): 94 //--------------------------------------------------------------------------- @@ -14083,7 +14083,7 @@ const extended::ZoneInfo kZoneEurope_Riga ACE_TIME_PROGMEM = { // Zone name: Europe/Rome // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -14117,7 +14117,7 @@ const extended::ZoneInfo kZoneEurope_Rome ACE_TIME_PROGMEM = { // Zone name: Europe/Samara // Zone Eras: 3 // Strings (bytes): 34 -// Memory (8-bit): 79 +// Memory (8-bit): 78 // Memory (32-bit): 102 //--------------------------------------------------------------------------- @@ -14175,7 +14175,7 @@ const extended::ZoneInfo kZoneEurope_Samara ACE_TIME_PROGMEM = { // Zone name: Europe/Saratov // Zone Eras: 4 // Strings (bytes): 35 -// Memory (8-bit): 91 +// Memory (8-bit): 90 // Memory (32-bit): 119 //--------------------------------------------------------------------------- @@ -14245,7 +14245,7 @@ const extended::ZoneInfo kZoneEurope_Saratov ACE_TIME_PROGMEM = { // Zone name: Europe/Simferopol // Zone Eras: 3 // Strings (bytes): 31 -// Memory (8-bit): 76 +// Memory (8-bit): 75 // Memory (32-bit): 99 //--------------------------------------------------------------------------- @@ -14303,7 +14303,7 @@ const extended::ZoneInfo kZoneEurope_Simferopol ACE_TIME_PROGMEM = { // Zone name: Europe/Sofia // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -14337,7 +14337,7 @@ const extended::ZoneInfo kZoneEurope_Sofia ACE_TIME_PROGMEM = { // Zone name: Europe/Stockholm // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -14371,7 +14371,7 @@ const extended::ZoneInfo kZoneEurope_Stockholm ACE_TIME_PROGMEM = { // Zone name: Europe/Tallinn // Zone Eras: 3 // Strings (bytes): 29 -// Memory (8-bit): 74 +// Memory (8-bit): 73 // Memory (32-bit): 97 //--------------------------------------------------------------------------- @@ -14429,7 +14429,7 @@ const extended::ZoneInfo kZoneEurope_Tallinn ACE_TIME_PROGMEM = { // Zone name: Europe/Tirane // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -14463,7 +14463,7 @@ const extended::ZoneInfo kZoneEurope_Tirane ACE_TIME_PROGMEM = { // Zone name: Europe/Ulyanovsk // Zone Eras: 4 // Strings (bytes): 37 -// Memory (8-bit): 93 +// Memory (8-bit): 92 // Memory (32-bit): 121 //--------------------------------------------------------------------------- @@ -14533,7 +14533,7 @@ const extended::ZoneInfo kZoneEurope_Ulyanovsk ACE_TIME_PROGMEM = { // Zone name: Europe/Uzhgorod // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -14567,7 +14567,7 @@ const extended::ZoneInfo kZoneEurope_Uzhgorod ACE_TIME_PROGMEM = { // Zone name: Europe/Vienna // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -14601,7 +14601,7 @@ const extended::ZoneInfo kZoneEurope_Vienna ACE_TIME_PROGMEM = { // Zone name: Europe/Vilnius // Zone Eras: 3 // Strings (bytes): 29 -// Memory (8-bit): 74 +// Memory (8-bit): 73 // Memory (32-bit): 97 //--------------------------------------------------------------------------- @@ -14659,7 +14659,7 @@ const extended::ZoneInfo kZoneEurope_Vilnius ACE_TIME_PROGMEM = { // Zone name: Europe/Volgograd // Zone Eras: 5 // Strings (bytes): 41 -// Memory (8-bit): 108 +// Memory (8-bit): 107 // Memory (32-bit): 141 //--------------------------------------------------------------------------- @@ -14741,7 +14741,7 @@ const extended::ZoneInfo kZoneEurope_Volgograd ACE_TIME_PROGMEM = { // Zone name: Europe/Warsaw // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -14775,7 +14775,7 @@ const extended::ZoneInfo kZoneEurope_Warsaw ACE_TIME_PROGMEM = { // Zone name: Europe/Zaporozhye // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -14809,7 +14809,7 @@ const extended::ZoneInfo kZoneEurope_Zaporozhye ACE_TIME_PROGMEM = { // Zone name: Europe/Zurich // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -14843,7 +14843,7 @@ const extended::ZoneInfo kZoneEurope_Zurich ACE_TIME_PROGMEM = { // Zone name: HST // Zone Eras: 1 // Strings (bytes): 8 -// Memory (8-bit): 31 +// Memory (8-bit): 30 // Memory (32-bit): 44 //--------------------------------------------------------------------------- @@ -14877,7 +14877,7 @@ const extended::ZoneInfo kZoneHST ACE_TIME_PROGMEM = { // Zone name: Indian/Chagos // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -14911,7 +14911,7 @@ const extended::ZoneInfo kZoneIndian_Chagos ACE_TIME_PROGMEM = { // Zone name: Indian/Christmas // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -14945,7 +14945,7 @@ const extended::ZoneInfo kZoneIndian_Christmas ACE_TIME_PROGMEM = { // Zone name: Indian/Cocos // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -14979,7 +14979,7 @@ const extended::ZoneInfo kZoneIndian_Cocos ACE_TIME_PROGMEM = { // Zone name: Indian/Kerguelen // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -15013,7 +15013,7 @@ const extended::ZoneInfo kZoneIndian_Kerguelen ACE_TIME_PROGMEM = { // Zone name: Indian/Mahe // Zone Eras: 1 // Strings (bytes): 16 -// Memory (8-bit): 39 +// Memory (8-bit): 38 // Memory (32-bit): 52 //--------------------------------------------------------------------------- @@ -15047,7 +15047,7 @@ const extended::ZoneInfo kZoneIndian_Mahe ACE_TIME_PROGMEM = { // Zone name: Indian/Maldives // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -15081,7 +15081,7 @@ const extended::ZoneInfo kZoneIndian_Maldives ACE_TIME_PROGMEM = { // Zone name: Indian/Mauritius // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -15115,7 +15115,7 @@ const extended::ZoneInfo kZoneIndian_Mauritius ACE_TIME_PROGMEM = { // Zone name: Indian/Reunion // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -15149,7 +15149,7 @@ const extended::ZoneInfo kZoneIndian_Reunion ACE_TIME_PROGMEM = { // Zone name: MET // Zone Eras: 1 // Strings (bytes): 9 -// Memory (8-bit): 32 +// Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- @@ -15183,7 +15183,7 @@ const extended::ZoneInfo kZoneMET ACE_TIME_PROGMEM = { // Zone name: MST // Zone Eras: 1 // Strings (bytes): 8 -// Memory (8-bit): 31 +// Memory (8-bit): 30 // Memory (32-bit): 44 //--------------------------------------------------------------------------- @@ -15217,7 +15217,7 @@ const extended::ZoneInfo kZoneMST ACE_TIME_PROGMEM = { // Zone name: MST7MDT // Zone Eras: 1 // Strings (bytes): 12 -// Memory (8-bit): 35 +// Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -15251,7 +15251,7 @@ const extended::ZoneInfo kZoneMST7MDT ACE_TIME_PROGMEM = { // Zone name: PST8PDT // Zone Eras: 1 // Strings (bytes): 12 -// Memory (8-bit): 35 +// Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -15285,7 +15285,7 @@ const extended::ZoneInfo kZonePST8PDT ACE_TIME_PROGMEM = { // Zone name: Pacific/Apia // Zone Eras: 2 // Strings (bytes): 29 -// Memory (8-bit): 63 +// Memory (8-bit): 62 // Memory (32-bit): 81 //--------------------------------------------------------------------------- @@ -15331,7 +15331,7 @@ const extended::ZoneInfo kZonePacific_Apia ACE_TIME_PROGMEM = { // Zone name: Pacific/Auckland // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -15365,7 +15365,7 @@ const extended::ZoneInfo kZonePacific_Auckland ACE_TIME_PROGMEM = { // Zone name: Pacific/Bougainville // Zone Eras: 2 // Strings (bytes): 29 -// Memory (8-bit): 63 +// Memory (8-bit): 62 // Memory (32-bit): 81 //--------------------------------------------------------------------------- @@ -15411,7 +15411,7 @@ const extended::ZoneInfo kZonePacific_Bougainville ACE_TIME_PROGMEM = { // Zone name: Pacific/Chatham // Zone Eras: 1 // Strings (bytes): 28 -// Memory (8-bit): 51 +// Memory (8-bit): 50 // Memory (32-bit): 64 //--------------------------------------------------------------------------- @@ -15445,7 +15445,7 @@ const extended::ZoneInfo kZonePacific_Chatham ACE_TIME_PROGMEM = { // Zone name: Pacific/Chuuk // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -15479,7 +15479,7 @@ const extended::ZoneInfo kZonePacific_Chuuk ACE_TIME_PROGMEM = { // Zone name: Pacific/Easter // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -15513,7 +15513,7 @@ const extended::ZoneInfo kZonePacific_Easter ACE_TIME_PROGMEM = { // Zone name: Pacific/Efate // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -15547,7 +15547,7 @@ const extended::ZoneInfo kZonePacific_Efate ACE_TIME_PROGMEM = { // Zone name: Pacific/Enderbury // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -15581,7 +15581,7 @@ const extended::ZoneInfo kZonePacific_Enderbury ACE_TIME_PROGMEM = { // Zone name: Pacific/Fakaofo // Zone Eras: 2 // Strings (bytes): 24 -// Memory (8-bit): 58 +// Memory (8-bit): 57 // Memory (32-bit): 76 //--------------------------------------------------------------------------- @@ -15627,7 +15627,7 @@ const extended::ZoneInfo kZonePacific_Fakaofo ACE_TIME_PROGMEM = { // Zone name: Pacific/Fiji // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -15661,7 +15661,7 @@ const extended::ZoneInfo kZonePacific_Fiji ACE_TIME_PROGMEM = { // Zone name: Pacific/Funafuti // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -15695,7 +15695,7 @@ const extended::ZoneInfo kZonePacific_Funafuti ACE_TIME_PROGMEM = { // Zone name: Pacific/Galapagos // Zone Eras: 1 // Strings (bytes): 26 -// Memory (8-bit): 49 +// Memory (8-bit): 48 // Memory (32-bit): 62 //--------------------------------------------------------------------------- @@ -15729,7 +15729,7 @@ const extended::ZoneInfo kZonePacific_Galapagos ACE_TIME_PROGMEM = { // Zone name: Pacific/Gambier // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -15763,7 +15763,7 @@ const extended::ZoneInfo kZonePacific_Gambier ACE_TIME_PROGMEM = { // Zone name: Pacific/Guadalcanal // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -15797,7 +15797,7 @@ const extended::ZoneInfo kZonePacific_Guadalcanal ACE_TIME_PROGMEM = { // Zone name: Pacific/Guam // Zone Eras: 2 // Strings (bytes): 22 -// Memory (8-bit): 56 +// Memory (8-bit): 55 // Memory (32-bit): 74 //--------------------------------------------------------------------------- @@ -15843,7 +15843,7 @@ const extended::ZoneInfo kZonePacific_Guam ACE_TIME_PROGMEM = { // Zone name: Pacific/Honolulu // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -15877,7 +15877,7 @@ const extended::ZoneInfo kZonePacific_Honolulu ACE_TIME_PROGMEM = { // Zone name: Pacific/Kiritimati // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -15911,7 +15911,7 @@ const extended::ZoneInfo kZonePacific_Kiritimati ACE_TIME_PROGMEM = { // Zone name: Pacific/Kosrae // Zone Eras: 2 // Strings (bytes): 23 -// Memory (8-bit): 57 +// Memory (8-bit): 56 // Memory (32-bit): 75 //--------------------------------------------------------------------------- @@ -15957,7 +15957,7 @@ const extended::ZoneInfo kZonePacific_Kosrae ACE_TIME_PROGMEM = { // Zone name: Pacific/Kwajalein // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -15991,7 +15991,7 @@ const extended::ZoneInfo kZonePacific_Kwajalein ACE_TIME_PROGMEM = { // Zone name: Pacific/Majuro // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -16025,7 +16025,7 @@ const extended::ZoneInfo kZonePacific_Majuro ACE_TIME_PROGMEM = { // Zone name: Pacific/Marquesas // Zone Eras: 1 // Strings (bytes): 24 -// Memory (8-bit): 47 +// Memory (8-bit): 46 // Memory (32-bit): 60 //--------------------------------------------------------------------------- @@ -16059,7 +16059,7 @@ const extended::ZoneInfo kZonePacific_Marquesas ACE_TIME_PROGMEM = { // Zone name: Pacific/Nauru // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -16093,7 +16093,7 @@ const extended::ZoneInfo kZonePacific_Nauru ACE_TIME_PROGMEM = { // Zone name: Pacific/Niue // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -16127,7 +16127,7 @@ const extended::ZoneInfo kZonePacific_Niue ACE_TIME_PROGMEM = { // Zone name: Pacific/Norfolk // Zone Eras: 3 // Strings (bytes): 34 -// Memory (8-bit): 79 +// Memory (8-bit): 78 // Memory (32-bit): 102 //--------------------------------------------------------------------------- @@ -16185,7 +16185,7 @@ const extended::ZoneInfo kZonePacific_Norfolk ACE_TIME_PROGMEM = { // Zone name: Pacific/Noumea // Zone Eras: 1 // Strings (bytes): 23 -// Memory (8-bit): 46 +// Memory (8-bit): 45 // Memory (32-bit): 59 //--------------------------------------------------------------------------- @@ -16219,7 +16219,7 @@ const extended::ZoneInfo kZonePacific_Noumea ACE_TIME_PROGMEM = { // Zone name: Pacific/Pago_Pago // Zone Eras: 1 // Strings (bytes): 22 -// Memory (8-bit): 45 +// Memory (8-bit): 44 // Memory (32-bit): 58 //--------------------------------------------------------------------------- @@ -16253,7 +16253,7 @@ const extended::ZoneInfo kZonePacific_Pago_Pago ACE_TIME_PROGMEM = { // Zone name: Pacific/Palau // Zone Eras: 1 // Strings (bytes): 18 -// Memory (8-bit): 41 +// Memory (8-bit): 40 // Memory (32-bit): 54 //--------------------------------------------------------------------------- @@ -16287,7 +16287,7 @@ const extended::ZoneInfo kZonePacific_Palau ACE_TIME_PROGMEM = { // Zone name: Pacific/Pitcairn // Zone Eras: 1 // Strings (bytes): 21 -// Memory (8-bit): 44 +// Memory (8-bit): 43 // Memory (32-bit): 57 //--------------------------------------------------------------------------- @@ -16321,7 +16321,7 @@ const extended::ZoneInfo kZonePacific_Pitcairn ACE_TIME_PROGMEM = { // Zone name: Pacific/Pohnpei // Zone Eras: 1 // Strings (bytes): 20 -// Memory (8-bit): 43 +// Memory (8-bit): 42 // Memory (32-bit): 56 //--------------------------------------------------------------------------- @@ -16355,7 +16355,7 @@ const extended::ZoneInfo kZonePacific_Pohnpei ACE_TIME_PROGMEM = { // Zone name: Pacific/Port_Moresby // Zone Eras: 1 // Strings (bytes): 25 -// Memory (8-bit): 48 +// Memory (8-bit): 47 // Memory (32-bit): 61 //--------------------------------------------------------------------------- @@ -16389,7 +16389,7 @@ const extended::ZoneInfo kZonePacific_Port_Moresby ACE_TIME_PROGMEM = { // Zone name: Pacific/Rarotonga // Zone Eras: 1 // Strings (bytes): 28 -// Memory (8-bit): 51 +// Memory (8-bit): 50 // Memory (32-bit): 64 //--------------------------------------------------------------------------- @@ -16423,7 +16423,7 @@ const extended::ZoneInfo kZonePacific_Rarotonga ACE_TIME_PROGMEM = { // Zone name: Pacific/Tahiti // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -16457,7 +16457,7 @@ const extended::ZoneInfo kZonePacific_Tahiti ACE_TIME_PROGMEM = { // Zone name: Pacific/Tarawa // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -16491,7 +16491,7 @@ const extended::ZoneInfo kZonePacific_Tarawa ACE_TIME_PROGMEM = { // Zone name: Pacific/Tongatapu // Zone Eras: 2 // Strings (bytes): 30 -// Memory (8-bit): 64 +// Memory (8-bit): 63 // Memory (32-bit): 82 //--------------------------------------------------------------------------- @@ -16537,7 +16537,7 @@ const extended::ZoneInfo kZonePacific_Tongatapu ACE_TIME_PROGMEM = { // Zone name: Pacific/Wake // Zone Eras: 1 // Strings (bytes): 17 -// Memory (8-bit): 40 +// Memory (8-bit): 39 // Memory (32-bit): 53 //--------------------------------------------------------------------------- @@ -16571,7 +16571,7 @@ const extended::ZoneInfo kZonePacific_Wake ACE_TIME_PROGMEM = { // Zone name: Pacific/Wallis // Zone Eras: 1 // Strings (bytes): 19 -// Memory (8-bit): 42 +// Memory (8-bit): 41 // Memory (32-bit): 55 //--------------------------------------------------------------------------- @@ -16605,7 +16605,7 @@ const extended::ZoneInfo kZonePacific_Wallis ACE_TIME_PROGMEM = { // Zone name: WET // Zone Eras: 1 // Strings (bytes): 9 -// Memory (8-bit): 32 +// Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index 9cd3f33ea..f58a2dd00 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -642,7 +642,7 @@ class ZoneInfosGenerator: SIZEOF_ZONE_ERA_8 = 11 SIZEOF_ZONE_ERA_32 = 16 - SIZEOF_ZONE_INFO_8 = 12 + SIZEOF_ZONE_INFO_8 = 11 SIZEOF_ZONE_INFO_32 = 20 def __init__( From c38d8ca6ebb80aa07e90235562e09f3d0dac72e2 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 7 Jan 2021 10:20:40 -0800 Subject: [PATCH 25/74] tools/argenerator.py: Generate kZoneAndLinkRegistry[] array containing fat links --- tools/generator/argenerator.py | 74 +++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 9 deletions(-) diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index f58a2dd00..b9d5c964c 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -100,10 +100,13 @@ def __init__( invocation=wrapped_invocation, tz_files=wrapped_tzfiles, db_namespace=db_namespace, + fat_links=fat_links, tz_version=zidb['tz_version'], scope=zidb['scope'], zones_map=zidb['zones_map'], + links_map=zidb['links_map'], zone_ids=zidb['zone_ids'], + link_ids=zidb['link_ids'], ) def generate_files(self, output_dir: str) -> None: @@ -1028,6 +1031,14 @@ class ZoneRegistryGenerator: {zoneRegistryItems} }}; +//--------------------------------------------------------------------------- +// Zone and Link registry. Sorted by zoneId. +//--------------------------------------------------------------------------- +const {scope}::ZoneInfo* const kZoneAndLinkRegistry[{numZonesAndLinks}] \ +{progmem} = {{ +{zoneAndLinkRegistryItems} +}}; + }} }} """ @@ -1053,10 +1064,14 @@ class ZoneRegistryGenerator: namespace ace_time {{ namespace {dbNamespace} {{ +// Zones const uint16_t kZoneRegistrySize = {numZones}; - extern const {scope}::ZoneInfo* const kZoneRegistry[{numZones}]; +// Zones and Links +const uint16_t kZoneAndLinkRegistrySize = {numZonesAndLinks}; +extern const {scope}::ZoneInfo* const kZoneAndLinkRegistry[{numZonesAndLinks}]; + }} }} #endif @@ -1069,33 +1084,64 @@ def __init__( tz_files: str, scope: str, db_namespace: str, + fat_links: bool, zones_map: ZonesMap, + links_map: LinksMap, zone_ids: Dict[str, int], + link_ids: Dict[str, int], ): self.invocation = invocation self.tz_version = tz_version self.tz_files = tz_files self.scope = scope self.db_namespace = db_namespace + self.fat_links = fat_links self.zones_map = zones_map + self.links_map = links_map self.zone_ids = zone_ids + self.link_ids = link_ids self.db_header_namespace = self.db_namespace.upper() + self.zones_and_links = list(zones_map.keys()) + list(links_map.keys()) + self.zone_and_link_ids = zone_ids.copy() + self.zone_and_link_ids.update(link_ids) def generate_registry_cpp(self) -> str: - # Sort the zones by zoneId (instead of zoneName) to enable + # Generate only Zones, sorted by zoneId to enable # ZoneRegistrar::binarySearchById(). zone_registry_items = '' - for zone_name, eras in sorted( - self.zones_map.items(), - key=lambda x: self.zone_ids[x[0]], + for zone_name in sorted( + self.zones_map.keys(), + key=lambda x: self.zone_ids[x], ): - name = normalize_name(zone_name) + normalized_name = normalize_name(zone_name) zone_id = self.zone_ids[zone_name] zone_registry_items += f"""\ - &kZone{name}, // {zone_name} - 0x{zone_id:08x} + &kZone{normalized_name}, // 0x{zone_id:08x}, {zone_name} """ + # Generate Zones and Links, sorted by zoneId. + zone_and_link_registry_items = '' + if self.fat_links: + num_zones_and_links = len(self.zones_and_links) + for zone_name in sorted( + self.zones_and_links, + key=lambda x: self.zone_and_link_ids[x], + ): + normalized_name = normalize_name(zone_name) + zone_id = self.zone_and_link_ids[zone_name] + target_name = self.links_map.get(zone_name) + if target_name: + desc_name = f'{zone_name} -> {target_name}' + else: + desc_name = zone_name + + zone_and_link_registry_items += f"""\ + &kZone{normalized_name}, // 0x{zone_id:08x}, {desc_name} +""" + else: + num_zones_and_links = 0 + return self.ZONE_REGISTRY_CPP_FILE.format( invocation=self.invocation, tz_files=self.tz_files, @@ -1104,10 +1150,18 @@ def generate_registry_cpp(self) -> str: dbNamespace=self.db_namespace, dbHeaderNamespace=self.db_header_namespace, numZones=len(self.zones_map), + numZonesAndLinks=num_zones_and_links, zoneRegistryItems=zone_registry_items, - progmem='ACE_TIME_PROGMEM') + zoneAndLinkRegistryItems=zone_and_link_registry_items, + progmem='ACE_TIME_PROGMEM', + ) def generate_registry_h(self) -> str: + if self.fat_links: + num_zones_and_links = len(self.zones_and_links) + else: + num_zones_and_links = 0 + return self.ZONE_REGISTRY_H_FILE.format( invocation=self.invocation, tz_files=self.tz_files, @@ -1115,7 +1169,9 @@ def generate_registry_h(self) -> str: scope=self.scope, dbNamespace=self.db_namespace, dbHeaderNamespace=self.db_header_namespace, - numZones=len(self.zones_map)) + numZones=len(self.zones_map), + numZonesAndLinks=num_zones_and_links, + ) def _get_time_modifier_comment( From 758b702658d0f77718d3de796204d328aa308416 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 7 Jan 2021 12:31:39 -0800 Subject: [PATCH 26/74] tools/argenerator.py: Enable fat links by default, since they are segregated into kZoneAndLinkRegistry --- .../ZonedDateTimeBasicTest.ino | 4 + .../ZonedDateTimeExtendedTest.ino | 4 + tools/Makefile | 2 - tools/generator/argenerator.py | 183 ++++++++---------- tools/tzcompiler.py | 12 -- 5 files changed, 91 insertions(+), 114 deletions(-) diff --git a/tests/ZonedDateTimeBasicTest/ZonedDateTimeBasicTest.ino b/tests/ZonedDateTimeBasicTest/ZonedDateTimeBasicTest.ino index 86e4bb156..4e3b6caf6 100644 --- a/tests/ZonedDateTimeBasicTest/ZonedDateTimeBasicTest.ino +++ b/tests/ZonedDateTimeBasicTest/ZonedDateTimeBasicTest.ino @@ -133,9 +133,13 @@ test(ZonedDateTimeBasicTest, forComponents_afterOverlap) { } // Test the linked zones are same as the target zones. +// Commented out because this test does not work with "fat" Link which behave +// just like a normal Zone. TODO: Figure out how to detect fat links at runtime. +/* test(ZonedDateTimeBasicTest, linked_zones) { assertEqual(&zonedb::kZoneAmerica_Los_Angeles, &zonedb::kZoneUS_Pacific); } +*/ // -------------------------------------------------------------------------- diff --git a/tests/ZonedDateTimeExtendedTest/ZonedDateTimeExtendedTest.ino b/tests/ZonedDateTimeExtendedTest/ZonedDateTimeExtendedTest.ino index 626d1884e..b9341d764 100644 --- a/tests/ZonedDateTimeExtendedTest/ZonedDateTimeExtendedTest.ino +++ b/tests/ZonedDateTimeExtendedTest/ZonedDateTimeExtendedTest.ino @@ -134,9 +134,13 @@ test(ZonedDateTimeExtendedTest, forComponents_afterOverlap) { } // Test the linked zones are same as the target zones. +// Commented out because this test does not work with "fat" Link which behave +// just like a normal Zone. TODO: Figure out how to detect fat links at runtime. +/* test(ZonedDateTimeExtendedTest, linked_zones) { assertEqual(&zonedbx::kZoneAmerica_Los_Angeles, &zonedbx::kZoneUS_Pacific); } +*/ // -------------------------------------------------------------------------- // Validate some changes in tzdb 2020a diff --git a/tools/Makefile b/tools/Makefile index f23dccb6d..c5bf546ed 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -59,7 +59,6 @@ zonedb.json: $(SRC) $(TZ_VERSION) --input_dir $(TZ_VERSION) \ --scope basic \ --language json \ - --fat_links \ --json_file $@ \ --start_year 2000 \ --until_year 2050 @@ -71,7 +70,6 @@ zonedbx.json: $(SRC) $(TZ_VERSION) --input_dir $(TZ_VERSION) \ --scope extended \ --language json \ - --fat_links \ --json_file $@ \ --start_year 2000 \ --until_year 2050 diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index b9d5c964c..d2d830011 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -40,7 +40,6 @@ def __init__( invocation: str, db_namespace: str, zidb: ZoneInfoDatabase, - fat_links: bool, ): # If I add a backslash (\) at the end of each line (which is needed if I # want to copy and paste the shell command), the C++ compiler spews out @@ -78,7 +77,6 @@ def __init__( invocation=wrapped_invocation, tz_files=wrapped_tzfiles, db_namespace=db_namespace, - fat_links=fat_links, tz_version=zidb['tz_version'], scope=zidb['scope'], start_year=zidb['start_year'], @@ -100,7 +98,6 @@ def __init__( invocation=wrapped_invocation, tz_files=wrapped_tzfiles, db_namespace=db_namespace, - fat_links=fat_links, tz_version=zidb['tz_version'], scope=zidb['scope'], zones_map=zidb['zones_map'], @@ -563,9 +560,14 @@ class ZoneInfosGenerator: // // Zones: {numInfos} // Links: {numLinks} -// Strings (bytes): {stringLength} -// Memory (8-bit): {memory8} -// Memory (32-bit): {memory32} +// kZoneRegistry sizes (bytes): +// Strings: {zoneStringSize} +// Memory (8-bit): {zoneMemory8} +// Memory (32-bit): {zoneMemory32} +// kZoneAndLinkRegistry sizes (bytes): +// Strings: {zoneAndLinkStringSize} +// Memory (8-bit): {zoneAndLinkMemory8} +// Memory (32-bit): {zoneAndLinkMemory32} // // DO NOT EDIT @@ -652,7 +654,6 @@ def __init__( self, invocation: str, db_namespace: str, - fat_links: bool, tz_version: str, tz_files: str, scope: str, @@ -673,7 +674,6 @@ def __init__( ): self.invocation = invocation self.db_namespace = db_namespace - self.fat_links = fat_links self.tz_version = tz_version self.tz_files = tz_files self.scope = scope @@ -725,38 +725,26 @@ def generate_infos_h(self) -> str: bufSize=self.buf_sizes[zone_name], ) - ZONE_INFOS_H_FAT_LINK_ITEM = """\ + ZONE_INFOS_H_LINK_ITEM = """\ extern const {scope}::ZoneInfo kZone{linkNormalizedName}; \ // {linkFullName} -> {zoneFullName} """ ZONE_INFOS_H_LINK_ID = """\ const uint32_t kZoneId{linkNormalizedName} = 0x{linkId:08x}; // {linkFullName} -""" - ZONE_INFOS_H_LINK_ITEM = """\ -extern const {scope}::ZoneInfo& kZone{linkNormalizedName}; \ -// {linkFullName} -> {zoneFullName} """ link_items = '' link_ids = '' - if self.fat_links: - for link_name, zone_name in sorted(self.links_map.items()): - link_items += ZONE_INFOS_H_FAT_LINK_ITEM.format( - scope=self.scope, - linkNormalizedName=normalize_name(link_name), - linkFullName=link_name, - zoneFullName=zone_name) - link_ids += ZONE_INFOS_H_LINK_ID.format( - linkNormalizedName=normalize_name(link_name), - linkFullName=link_name, - linkId=self.link_ids[link_name], - ) - else: - for link_name, zone_name in sorted(self.links_map.items()): - link_items += ZONE_INFOS_H_LINK_ITEM.format( - scope=self.scope, - linkNormalizedName=normalize_name(link_name), - linkFullName=link_name, - zoneFullName=zone_name) + for link_name, zone_name in sorted(self.links_map.items()): + link_items += ZONE_INFOS_H_LINK_ITEM.format( + scope=self.scope, + linkNormalizedName=normalize_name(link_name), + linkFullName=link_name, + zoneFullName=zone_name) + link_ids += ZONE_INFOS_H_LINK_ID.format( + linkNormalizedName=normalize_name(link_name), + linkFullName=link_name, + linkId=self.link_ids[link_name], + ) ZONE_INFOS_H_REMOVED_INFO_ITEM = """\ // {zoneFullName} ({reason}) @@ -815,42 +803,53 @@ def generate_infos_h(self) -> str: ) def generate_infos_cpp(self) -> str: - string_length = 0 - # Generate the list of zone infos + zone_string_size = 0 info_items = '' num_eras = 0 for zone_name, eras in sorted(self.zones_map.items()): - info_item, info_string_length = self._generate_info_item( + info_item, string_length = self._generate_info_item( zone_name, eras) info_items += info_item - string_length += info_string_length + zone_string_size += string_length num_eras += len(eras) # Generate links references. + link_string_size = 0 link_items = '' for link_name, zone_name in sorted(self.links_map.items()): - link_item, link_string_length = self._generate_link_item( + link_item, string_length = self._generate_link_item( link_name, zone_name) link_items += link_item - string_length += link_string_length + link_string_size += string_length # Estimate size of entire zone info database. num_infos = len(self.zones_map) num_links = len(self.links_map) - memory8 = ( - string_length + zone_memory8 = ( + zone_string_size + num_eras * self.SIZEOF_ZONE_ERA_8 + num_infos * self.SIZEOF_ZONE_INFO_8 + + num_infos * 2 # sizeof(kZoneRegistry) ) - memory32 = ( - string_length + zone_memory32 = ( + zone_string_size + num_eras * self.SIZEOF_ZONE_ERA_32 + num_infos * self.SIZEOF_ZONE_INFO_32 + + num_infos * 4 # sizeof(kZoneRegistry) + ) + zone_and_link_memory8 = ( + zone_memory8 + + link_string_size + + num_links * self.SIZEOF_ZONE_INFO_8 + + num_links * 2 # sizeof(kZoneAndLinkRegistry) + ) + zone_and_link_memory32 = ( + zone_memory32 + + link_string_size + + num_links * self.SIZEOF_ZONE_INFO_32 + + num_links * 4 # sizeof(kZoneAndLinkRegistry) ) - if self.fat_links: - memory8 += num_links * self.SIZEOF_ZONE_INFO_8 - memory32 += num_links * self.SIZEOF_ZONE_INFO_32 return self.ZONE_INFOS_CPP_FILE.format( invocation=self.invocation, @@ -864,9 +863,12 @@ def generate_infos_cpp(self) -> str: numInfos=num_infos, numLinks=num_links, numEras=num_eras, - stringLength=string_length, - memory8=memory8, - memory32=memory32, + zoneStringSize=zone_string_size, + zoneMemory8=zone_memory8, + zoneMemory32=zone_memory32, + zoneAndLinkStringSize=(zone_string_size + link_string_size), + zoneAndLinkMemory8=zone_and_link_memory8, + zoneAndLinkMemory32=zone_and_link_memory32, infoItems=info_items, linkItems=link_items) @@ -954,12 +956,14 @@ def _generate_era_item( def _generate_link_item( self, link_name: str, zone_name: str, ) -> Tuple[str, int]: - """Return the Link item (whose format depends on --fat_link), - and the amount of string space consumed by this Link entry. + """Return the Link item and the amount of string space consumed by this + Link entry. """ - ZONE_INFOS_CPP_FAT_LINK_ITEM = """\ + ZONE_INFOS_CPP_LINK_ITEM = """\ //--------------------------------------------------------------------------- // Link name: {linkFullName} -> {zoneFullName} +// Memory (8-bit): {memory8} +// Memory (32-bit): {memory32} //--------------------------------------------------------------------------- static const char kZoneName{linkNormalizedName}[] {progmem} = "{linkFullName}"; @@ -972,32 +976,21 @@ def _generate_link_item( kZoneEra{zoneNormalizedName} /*eras*/, }}; -""" - ZONE_INFOS_CPP_LINK_ITEM = """\ -const {scope}::ZoneInfo& kZone{linkNormalizedName} = kZone{zoneNormalizedName}; """ - if self.fat_links: - link_item = ZONE_INFOS_CPP_FAT_LINK_ITEM.format( - scope=self.scope, - linkFullName=link_name, - linkNormalizedName=normalize_name(link_name), - linkId=self.link_ids[link_name], - zoneFullName=zone_name, - zoneNormalizedName=normalize_name(zone_name), - numEras=len(self.zones_map[zone_name]), - progmem='ACE_TIME_PROGMEM', - ) - string_length = len(link_name) + 1 - else: - link_item = ZONE_INFOS_CPP_LINK_ITEM.format( - scope=self.scope, - linkFullName=link_name, - linkNormalizedName=normalize_name(link_name), - zoneFullName=zone_name, - zoneNormalizedName=normalize_name(zone_name), - ) - string_length = 0 + link_item = ZONE_INFOS_CPP_LINK_ITEM.format( + scope=self.scope, + linkFullName=link_name, + linkNormalizedName=normalize_name(link_name), + linkId=self.link_ids[link_name], + zoneFullName=zone_name, + zoneNormalizedName=normalize_name(zone_name), + numEras=len(self.zones_map[zone_name]), + progmem='ACE_TIME_PROGMEM', + memory8=self.SIZEOF_ZONE_INFO_8, + memory32=self.SIZEOF_ZONE_INFO_32, + ) + string_length = len(link_name) + 1 return link_item, string_length @@ -1084,7 +1077,6 @@ def __init__( tz_files: str, scope: str, db_namespace: str, - fat_links: bool, zones_map: ZonesMap, links_map: LinksMap, zone_ids: Dict[str, int], @@ -1095,7 +1087,6 @@ def __init__( self.tz_files = tz_files self.scope = scope self.db_namespace = db_namespace - self.fat_links = fat_links self.zones_map = zones_map self.links_map = links_map self.zone_ids = zone_ids @@ -1122,25 +1113,22 @@ def generate_registry_cpp(self) -> str: # Generate Zones and Links, sorted by zoneId. zone_and_link_registry_items = '' - if self.fat_links: - num_zones_and_links = len(self.zones_and_links) - for zone_name in sorted( - self.zones_and_links, - key=lambda x: self.zone_and_link_ids[x], - ): - normalized_name = normalize_name(zone_name) - zone_id = self.zone_and_link_ids[zone_name] - target_name = self.links_map.get(zone_name) - if target_name: - desc_name = f'{zone_name} -> {target_name}' - else: - desc_name = zone_name - - zone_and_link_registry_items += f"""\ + num_zones_and_links = len(self.zones_and_links) + for zone_name in sorted( + self.zones_and_links, + key=lambda x: self.zone_and_link_ids[x], + ): + normalized_name = normalize_name(zone_name) + zone_id = self.zone_and_link_ids[zone_name] + target_name = self.links_map.get(zone_name) + if target_name: + desc_name = f'{zone_name} -> {target_name}' + else: + desc_name = zone_name + + zone_and_link_registry_items += f"""\ &kZone{normalized_name}, // 0x{zone_id:08x}, {desc_name} """ - else: - num_zones_and_links = 0 return self.ZONE_REGISTRY_CPP_FILE.format( invocation=self.invocation, @@ -1157,11 +1145,6 @@ def generate_registry_cpp(self) -> str: ) def generate_registry_h(self) -> str: - if self.fat_links: - num_zones_and_links = len(self.zones_and_links) - else: - num_zones_and_links = 0 - return self.ZONE_REGISTRY_H_FILE.format( invocation=self.invocation, tz_files=self.tz_files, @@ -1170,7 +1153,7 @@ def generate_registry_h(self) -> str: dbNamespace=self.db_namespace, dbHeaderNamespace=self.db_header_namespace, numZones=len(self.zones_map), - numZonesAndLinks=num_zones_and_links, + numZonesAndLinks=len(self.zones_and_links), ) diff --git a/tools/tzcompiler.py b/tools/tzcompiler.py index 5207b67f0..b697e3303 100755 --- a/tools/tzcompiler.py +++ b/tools/tzcompiler.py @@ -87,7 +87,6 @@ def generate_zonedb( output_dir: str, json_file: str, zidb: ZoneInfoDatabase, - fat_links: bool, ) -> None: """Generate the zonedb/ or zonedbx/ files for Python or Arduino, but probably mostly for Arduino. @@ -109,7 +108,6 @@ def generate_zonedb( invocation=invocation, db_namespace=db_namespace, zidb=zidb, - fat_links=fat_links, ) generator.generate_files(output_dir) @@ -268,15 +266,6 @@ def main() -> None: action='store_true', ) - # Enable fat links to create Link entries which have real ZoneInfo objects, - # instead of being just references to its corresponding Zone entry. The name - # of the Link is preserved, as well as an independent zoneId. - parser.add_argument( - '--fat_links', - help='Generate fat Link entries', - action='store_true', - ) - # Parse the command line arguments args = parser.parse_args() @@ -439,7 +428,6 @@ def main() -> None: output_dir=args.output_dir, zidb=zidb, json_file=args.json_file, - fat_links=args.fat_links, ) else: logging.error(f"Unrecognized action '{args.action}'") From 973b325365e8c14aba4b690418ae1e838deac1ae Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 7 Jan 2021 12:35:42 -0800 Subject: [PATCH 27/74] src/zonedb,zonedbx: Regenerate zonedb files with fat links in kZoneAndLinkRegistry --- src/ace_time/zonedb/zone_infos.cpp | 3122 +++++++++++++++++++-- src/ace_time/zonedb/zone_infos.h | 549 ++-- src/ace_time/zonedb/zone_registry.cpp | 988 +++++-- src/ace_time/zonedb/zone_registry.h | 6 +- src/ace_time/zonedbx/zone_infos.cpp | 3530 ++++++++++++++++++++++-- src/ace_time/zonedbx/zone_infos.h | 621 +++-- src/ace_time/zonedbx/zone_registry.cpp | 1372 ++++++--- src/ace_time/zonedbx/zone_registry.h | 6 +- 8 files changed, 8754 insertions(+), 1440 deletions(-) diff --git a/src/ace_time/zonedb/zone_infos.cpp b/src/ace_time/zonedb/zone_infos.cpp index b0a5eb3b8..dbdc73713 100644 --- a/src/ace_time/zonedb/zone_infos.cpp +++ b/src/ace_time/zonedb/zone_infos.cpp @@ -26,9 +26,14 @@ // // Zones: 266 // Links: 183 -// Strings (bytes): 5333 -// Memory (8-bit): 11328 -// Memory (32-bit): 15117 +// kZoneRegistry sizes (bytes): +// Strings: 5333 +// Memory (8-bit): 11860 +// Memory (32-bit): 16181 +// kZoneAndLinkRegistry sizes (bytes): +// Strings: 7888 +// Memory (8-bit): 16794 +// Memory (32-bit): 23128 // // DO NOT EDIT @@ -9261,189 +9266,2934 @@ const basic::ZoneInfo kZoneWET ACE_TIME_PROGMEM = { // Links: 183 //--------------------------------------------------------------------------- -const basic::ZoneInfo& kZoneAfrica_Addis_Ababa = kZoneAfrica_Nairobi; -const basic::ZoneInfo& kZoneAfrica_Asmara = kZoneAfrica_Nairobi; -const basic::ZoneInfo& kZoneAfrica_Asmera = kZoneAfrica_Nairobi; -const basic::ZoneInfo& kZoneAfrica_Bamako = kZoneAfrica_Abidjan; -const basic::ZoneInfo& kZoneAfrica_Bangui = kZoneAfrica_Lagos; -const basic::ZoneInfo& kZoneAfrica_Banjul = kZoneAfrica_Abidjan; -const basic::ZoneInfo& kZoneAfrica_Blantyre = kZoneAfrica_Maputo; -const basic::ZoneInfo& kZoneAfrica_Brazzaville = kZoneAfrica_Lagos; -const basic::ZoneInfo& kZoneAfrica_Bujumbura = kZoneAfrica_Maputo; -const basic::ZoneInfo& kZoneAfrica_Conakry = kZoneAfrica_Abidjan; -const basic::ZoneInfo& kZoneAfrica_Dakar = kZoneAfrica_Abidjan; -const basic::ZoneInfo& kZoneAfrica_Dar_es_Salaam = kZoneAfrica_Nairobi; -const basic::ZoneInfo& kZoneAfrica_Djibouti = kZoneAfrica_Nairobi; -const basic::ZoneInfo& kZoneAfrica_Douala = kZoneAfrica_Lagos; -const basic::ZoneInfo& kZoneAfrica_Freetown = kZoneAfrica_Abidjan; -const basic::ZoneInfo& kZoneAfrica_Gaborone = kZoneAfrica_Maputo; -const basic::ZoneInfo& kZoneAfrica_Harare = kZoneAfrica_Maputo; -const basic::ZoneInfo& kZoneAfrica_Kampala = kZoneAfrica_Nairobi; -const basic::ZoneInfo& kZoneAfrica_Kigali = kZoneAfrica_Maputo; -const basic::ZoneInfo& kZoneAfrica_Kinshasa = kZoneAfrica_Lagos; -const basic::ZoneInfo& kZoneAfrica_Libreville = kZoneAfrica_Lagos; -const basic::ZoneInfo& kZoneAfrica_Lome = kZoneAfrica_Abidjan; -const basic::ZoneInfo& kZoneAfrica_Luanda = kZoneAfrica_Lagos; -const basic::ZoneInfo& kZoneAfrica_Lubumbashi = kZoneAfrica_Maputo; -const basic::ZoneInfo& kZoneAfrica_Lusaka = kZoneAfrica_Maputo; -const basic::ZoneInfo& kZoneAfrica_Malabo = kZoneAfrica_Lagos; -const basic::ZoneInfo& kZoneAfrica_Maseru = kZoneAfrica_Johannesburg; -const basic::ZoneInfo& kZoneAfrica_Mbabane = kZoneAfrica_Johannesburg; -const basic::ZoneInfo& kZoneAfrica_Mogadishu = kZoneAfrica_Nairobi; -const basic::ZoneInfo& kZoneAfrica_Niamey = kZoneAfrica_Lagos; -const basic::ZoneInfo& kZoneAfrica_Nouakchott = kZoneAfrica_Abidjan; -const basic::ZoneInfo& kZoneAfrica_Ouagadougou = kZoneAfrica_Abidjan; -const basic::ZoneInfo& kZoneAfrica_Porto_Novo = kZoneAfrica_Lagos; -const basic::ZoneInfo& kZoneAfrica_Timbuktu = kZoneAfrica_Abidjan; -const basic::ZoneInfo& kZoneAmerica_Anguilla = kZoneAmerica_Port_of_Spain; -const basic::ZoneInfo& kZoneAmerica_Antigua = kZoneAmerica_Port_of_Spain; -const basic::ZoneInfo& kZoneAmerica_Aruba = kZoneAmerica_Curacao; -const basic::ZoneInfo& kZoneAmerica_Atka = kZoneAmerica_Adak; -const basic::ZoneInfo& kZoneAmerica_Cayman = kZoneAmerica_Panama; -const basic::ZoneInfo& kZoneAmerica_Coral_Harbour = kZoneAmerica_Atikokan; -const basic::ZoneInfo& kZoneAmerica_Dominica = kZoneAmerica_Port_of_Spain; -const basic::ZoneInfo& kZoneAmerica_Fort_Wayne = kZoneAmerica_Indiana_Indianapolis; -const basic::ZoneInfo& kZoneAmerica_Godthab = kZoneAmerica_Nuuk; -const basic::ZoneInfo& kZoneAmerica_Grenada = kZoneAmerica_Port_of_Spain; -const basic::ZoneInfo& kZoneAmerica_Guadeloupe = kZoneAmerica_Port_of_Spain; -const basic::ZoneInfo& kZoneAmerica_Indianapolis = kZoneAmerica_Indiana_Indianapolis; -const basic::ZoneInfo& kZoneAmerica_Kralendijk = kZoneAmerica_Curacao; -const basic::ZoneInfo& kZoneAmerica_Louisville = kZoneAmerica_Kentucky_Louisville; -const basic::ZoneInfo& kZoneAmerica_Lower_Princes = kZoneAmerica_Curacao; -const basic::ZoneInfo& kZoneAmerica_Marigot = kZoneAmerica_Port_of_Spain; -const basic::ZoneInfo& kZoneAmerica_Montreal = kZoneAmerica_Toronto; -const basic::ZoneInfo& kZoneAmerica_Montserrat = kZoneAmerica_Port_of_Spain; -const basic::ZoneInfo& kZoneAmerica_Shiprock = kZoneAmerica_Denver; -const basic::ZoneInfo& kZoneAmerica_St_Barthelemy = kZoneAmerica_Port_of_Spain; -const basic::ZoneInfo& kZoneAmerica_St_Kitts = kZoneAmerica_Port_of_Spain; -const basic::ZoneInfo& kZoneAmerica_St_Lucia = kZoneAmerica_Port_of_Spain; -const basic::ZoneInfo& kZoneAmerica_St_Thomas = kZoneAmerica_Port_of_Spain; -const basic::ZoneInfo& kZoneAmerica_St_Vincent = kZoneAmerica_Port_of_Spain; -const basic::ZoneInfo& kZoneAmerica_Tortola = kZoneAmerica_Port_of_Spain; -const basic::ZoneInfo& kZoneAmerica_Virgin = kZoneAmerica_Port_of_Spain; -const basic::ZoneInfo& kZoneAntarctica_McMurdo = kZonePacific_Auckland; -const basic::ZoneInfo& kZoneAntarctica_South_Pole = kZonePacific_Auckland; -const basic::ZoneInfo& kZoneArctic_Longyearbyen = kZoneEurope_Oslo; -const basic::ZoneInfo& kZoneAsia_Aden = kZoneAsia_Riyadh; -const basic::ZoneInfo& kZoneAsia_Ashkhabad = kZoneAsia_Ashgabat; -const basic::ZoneInfo& kZoneAsia_Bahrain = kZoneAsia_Qatar; -const basic::ZoneInfo& kZoneAsia_Calcutta = kZoneAsia_Kolkata; -const basic::ZoneInfo& kZoneAsia_Chongqing = kZoneAsia_Shanghai; -const basic::ZoneInfo& kZoneAsia_Chungking = kZoneAsia_Shanghai; -const basic::ZoneInfo& kZoneAsia_Dacca = kZoneAsia_Dhaka; -const basic::ZoneInfo& kZoneAsia_Harbin = kZoneAsia_Shanghai; -const basic::ZoneInfo& kZoneAsia_Kashgar = kZoneAsia_Urumqi; -const basic::ZoneInfo& kZoneAsia_Katmandu = kZoneAsia_Kathmandu; -const basic::ZoneInfo& kZoneAsia_Kuwait = kZoneAsia_Riyadh; -const basic::ZoneInfo& kZoneAsia_Macao = kZoneAsia_Macau; -const basic::ZoneInfo& kZoneAsia_Muscat = kZoneAsia_Dubai; -const basic::ZoneInfo& kZoneAsia_Phnom_Penh = kZoneAsia_Bangkok; -const basic::ZoneInfo& kZoneAsia_Rangoon = kZoneAsia_Yangon; -const basic::ZoneInfo& kZoneAsia_Saigon = kZoneAsia_Ho_Chi_Minh; -const basic::ZoneInfo& kZoneAsia_Tel_Aviv = kZoneAsia_Jerusalem; -const basic::ZoneInfo& kZoneAsia_Thimbu = kZoneAsia_Thimphu; -const basic::ZoneInfo& kZoneAsia_Ujung_Pandang = kZoneAsia_Makassar; -const basic::ZoneInfo& kZoneAsia_Ulan_Bator = kZoneAsia_Ulaanbaatar; -const basic::ZoneInfo& kZoneAsia_Vientiane = kZoneAsia_Bangkok; -const basic::ZoneInfo& kZoneAtlantic_Faeroe = kZoneAtlantic_Faroe; -const basic::ZoneInfo& kZoneAtlantic_Jan_Mayen = kZoneEurope_Oslo; -const basic::ZoneInfo& kZoneAtlantic_St_Helena = kZoneAfrica_Abidjan; -const basic::ZoneInfo& kZoneAustralia_ACT = kZoneAustralia_Sydney; -const basic::ZoneInfo& kZoneAustralia_Canberra = kZoneAustralia_Sydney; -const basic::ZoneInfo& kZoneAustralia_Currie = kZoneAustralia_Hobart; -const basic::ZoneInfo& kZoneAustralia_LHI = kZoneAustralia_Lord_Howe; -const basic::ZoneInfo& kZoneAustralia_NSW = kZoneAustralia_Sydney; -const basic::ZoneInfo& kZoneAustralia_North = kZoneAustralia_Darwin; -const basic::ZoneInfo& kZoneAustralia_Queensland = kZoneAustralia_Brisbane; -const basic::ZoneInfo& kZoneAustralia_South = kZoneAustralia_Adelaide; -const basic::ZoneInfo& kZoneAustralia_Tasmania = kZoneAustralia_Hobart; -const basic::ZoneInfo& kZoneAustralia_Victoria = kZoneAustralia_Melbourne; -const basic::ZoneInfo& kZoneAustralia_West = kZoneAustralia_Perth; -const basic::ZoneInfo& kZoneAustralia_Yancowinna = kZoneAustralia_Broken_Hill; -const basic::ZoneInfo& kZoneBrazil_East = kZoneAmerica_Sao_Paulo; -const basic::ZoneInfo& kZoneBrazil_West = kZoneAmerica_Manaus; -const basic::ZoneInfo& kZoneCanada_Atlantic = kZoneAmerica_Halifax; -const basic::ZoneInfo& kZoneCanada_Central = kZoneAmerica_Winnipeg; -const basic::ZoneInfo& kZoneCanada_Eastern = kZoneAmerica_Toronto; -const basic::ZoneInfo& kZoneCanada_Mountain = kZoneAmerica_Edmonton; -const basic::ZoneInfo& kZoneCanada_Pacific = kZoneAmerica_Vancouver; -const basic::ZoneInfo& kZoneCanada_Saskatchewan = kZoneAmerica_Regina; -const basic::ZoneInfo& kZoneChile_Continental = kZoneAmerica_Santiago; -const basic::ZoneInfo& kZoneChile_EasterIsland = kZonePacific_Easter; -const basic::ZoneInfo& kZoneCuba = kZoneAmerica_Havana; -const basic::ZoneInfo& kZoneEire = kZoneEurope_Dublin; -const basic::ZoneInfo& kZoneEtc_GMT_PLUS_0 = kZoneEtc_GMT; -const basic::ZoneInfo& kZoneEtc_GMT_0 = kZoneEtc_GMT; -const basic::ZoneInfo& kZoneEtc_GMT0 = kZoneEtc_GMT; -const basic::ZoneInfo& kZoneEtc_Greenwich = kZoneEtc_GMT; -const basic::ZoneInfo& kZoneEtc_UCT = kZoneEtc_UTC; -const basic::ZoneInfo& kZoneEtc_Universal = kZoneEtc_UTC; -const basic::ZoneInfo& kZoneEtc_Zulu = kZoneEtc_UTC; -const basic::ZoneInfo& kZoneEurope_Belfast = kZoneEurope_London; -const basic::ZoneInfo& kZoneEurope_Bratislava = kZoneEurope_Prague; -const basic::ZoneInfo& kZoneEurope_Busingen = kZoneEurope_Zurich; -const basic::ZoneInfo& kZoneEurope_Guernsey = kZoneEurope_London; -const basic::ZoneInfo& kZoneEurope_Isle_of_Man = kZoneEurope_London; -const basic::ZoneInfo& kZoneEurope_Jersey = kZoneEurope_London; -const basic::ZoneInfo& kZoneEurope_Ljubljana = kZoneEurope_Belgrade; -const basic::ZoneInfo& kZoneEurope_Mariehamn = kZoneEurope_Helsinki; -const basic::ZoneInfo& kZoneEurope_Nicosia = kZoneAsia_Nicosia; -const basic::ZoneInfo& kZoneEurope_Podgorica = kZoneEurope_Belgrade; -const basic::ZoneInfo& kZoneEurope_San_Marino = kZoneEurope_Rome; -const basic::ZoneInfo& kZoneEurope_Sarajevo = kZoneEurope_Belgrade; -const basic::ZoneInfo& kZoneEurope_Skopje = kZoneEurope_Belgrade; -const basic::ZoneInfo& kZoneEurope_Tiraspol = kZoneEurope_Chisinau; -const basic::ZoneInfo& kZoneEurope_Vaduz = kZoneEurope_Zurich; -const basic::ZoneInfo& kZoneEurope_Vatican = kZoneEurope_Rome; -const basic::ZoneInfo& kZoneEurope_Zagreb = kZoneEurope_Belgrade; -const basic::ZoneInfo& kZoneGB = kZoneEurope_London; -const basic::ZoneInfo& kZoneGB_Eire = kZoneEurope_London; -const basic::ZoneInfo& kZoneGMT = kZoneEtc_GMT; -const basic::ZoneInfo& kZoneGMT_PLUS_0 = kZoneEtc_GMT; -const basic::ZoneInfo& kZoneGMT_0 = kZoneEtc_GMT; -const basic::ZoneInfo& kZoneGMT0 = kZoneEtc_GMT; -const basic::ZoneInfo& kZoneGreenwich = kZoneEtc_GMT; -const basic::ZoneInfo& kZoneHongkong = kZoneAsia_Hong_Kong; -const basic::ZoneInfo& kZoneIceland = kZoneAtlantic_Reykjavik; -const basic::ZoneInfo& kZoneIndian_Antananarivo = kZoneAfrica_Nairobi; -const basic::ZoneInfo& kZoneIndian_Comoro = kZoneAfrica_Nairobi; -const basic::ZoneInfo& kZoneIndian_Mayotte = kZoneAfrica_Nairobi; -const basic::ZoneInfo& kZoneIran = kZoneAsia_Tehran; -const basic::ZoneInfo& kZoneIsrael = kZoneAsia_Jerusalem; -const basic::ZoneInfo& kZoneJamaica = kZoneAmerica_Jamaica; -const basic::ZoneInfo& kZoneJapan = kZoneAsia_Tokyo; -const basic::ZoneInfo& kZoneKwajalein = kZonePacific_Kwajalein; -const basic::ZoneInfo& kZoneMexico_BajaSur = kZoneAmerica_Mazatlan; -const basic::ZoneInfo& kZoneNZ = kZonePacific_Auckland; -const basic::ZoneInfo& kZoneNZ_CHAT = kZonePacific_Chatham; -const basic::ZoneInfo& kZoneNavajo = kZoneAmerica_Denver; -const basic::ZoneInfo& kZonePRC = kZoneAsia_Shanghai; -const basic::ZoneInfo& kZonePacific_Johnston = kZonePacific_Honolulu; -const basic::ZoneInfo& kZonePacific_Midway = kZonePacific_Pago_Pago; -const basic::ZoneInfo& kZonePacific_Ponape = kZonePacific_Pohnpei; -const basic::ZoneInfo& kZonePacific_Samoa = kZonePacific_Pago_Pago; -const basic::ZoneInfo& kZonePacific_Truk = kZonePacific_Chuuk; -const basic::ZoneInfo& kZonePacific_Yap = kZonePacific_Chuuk; -const basic::ZoneInfo& kZonePoland = kZoneEurope_Warsaw; -const basic::ZoneInfo& kZonePortugal = kZoneEurope_Lisbon; -const basic::ZoneInfo& kZoneROC = kZoneAsia_Taipei; -const basic::ZoneInfo& kZoneROK = kZoneAsia_Seoul; -const basic::ZoneInfo& kZoneSingapore = kZoneAsia_Singapore; -const basic::ZoneInfo& kZoneUCT = kZoneEtc_UTC; -const basic::ZoneInfo& kZoneUS_Alaska = kZoneAmerica_Anchorage; -const basic::ZoneInfo& kZoneUS_Aleutian = kZoneAmerica_Adak; -const basic::ZoneInfo& kZoneUS_Arizona = kZoneAmerica_Phoenix; -const basic::ZoneInfo& kZoneUS_Central = kZoneAmerica_Chicago; -const basic::ZoneInfo& kZoneUS_East_Indiana = kZoneAmerica_Indiana_Indianapolis; -const basic::ZoneInfo& kZoneUS_Eastern = kZoneAmerica_New_York; -const basic::ZoneInfo& kZoneUS_Hawaii = kZonePacific_Honolulu; -const basic::ZoneInfo& kZoneUS_Michigan = kZoneAmerica_Detroit; -const basic::ZoneInfo& kZoneUS_Mountain = kZoneAmerica_Denver; -const basic::ZoneInfo& kZoneUS_Pacific = kZoneAmerica_Los_Angeles; -const basic::ZoneInfo& kZoneUS_Samoa = kZonePacific_Pago_Pago; -const basic::ZoneInfo& kZoneUTC = kZoneEtc_UTC; -const basic::ZoneInfo& kZoneUniversal = kZoneEtc_UTC; -const basic::ZoneInfo& kZoneZulu = kZoneEtc_UTC; +//--------------------------------------------------------------------------- +// Link name: Africa/Addis_Ababa -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Addis_Ababa[] ACE_TIME_PROGMEM = "Africa/Addis_Ababa"; + +const basic::ZoneInfo kZoneAfrica_Addis_Ababa ACE_TIME_PROGMEM = { + kZoneNameAfrica_Addis_Ababa /*name*/, + 0x05ae1e65 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Asmara -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Asmara[] ACE_TIME_PROGMEM = "Africa/Asmara"; + +const basic::ZoneInfo kZoneAfrica_Asmara ACE_TIME_PROGMEM = { + kZoneNameAfrica_Asmara /*name*/, + 0x73b278ef /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Asmera -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Asmera[] ACE_TIME_PROGMEM = "Africa/Asmera"; + +const basic::ZoneInfo kZoneAfrica_Asmera ACE_TIME_PROGMEM = { + kZoneNameAfrica_Asmera /*name*/, + 0x73b289f3 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Bamako -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Bamako[] ACE_TIME_PROGMEM = "Africa/Bamako"; + +const basic::ZoneInfo kZoneAfrica_Bamako ACE_TIME_PROGMEM = { + kZoneNameAfrica_Bamako /*name*/, + 0x74c1e7a5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Bangui -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Bangui[] ACE_TIME_PROGMEM = "Africa/Bangui"; + +const basic::ZoneInfo kZoneAfrica_Bangui ACE_TIME_PROGMEM = { + kZoneNameAfrica_Bangui /*name*/, + 0x74c28ed0 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Banjul -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Banjul[] ACE_TIME_PROGMEM = "Africa/Banjul"; + +const basic::ZoneInfo kZoneAfrica_Banjul ACE_TIME_PROGMEM = { + kZoneNameAfrica_Banjul /*name*/, + 0x74c29b96 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Blantyre -> Africa/Maputo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Blantyre[] ACE_TIME_PROGMEM = "Africa/Blantyre"; + +const basic::ZoneInfo kZoneAfrica_Blantyre ACE_TIME_PROGMEM = { + kZoneNameAfrica_Blantyre /*name*/, + 0xe08d813b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Maputo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Brazzaville -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Brazzaville[] ACE_TIME_PROGMEM = "Africa/Brazzaville"; + +const basic::ZoneInfo kZoneAfrica_Brazzaville ACE_TIME_PROGMEM = { + kZoneNameAfrica_Brazzaville /*name*/, + 0x39cda760 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Bujumbura -> Africa/Maputo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Bujumbura[] ACE_TIME_PROGMEM = "Africa/Bujumbura"; + +const basic::ZoneInfo kZoneAfrica_Bujumbura ACE_TIME_PROGMEM = { + kZoneNameAfrica_Bujumbura /*name*/, + 0x05232a47 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Maputo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Conakry -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Conakry[] ACE_TIME_PROGMEM = "Africa/Conakry"; + +const basic::ZoneInfo kZoneAfrica_Conakry ACE_TIME_PROGMEM = { + kZoneNameAfrica_Conakry /*name*/, + 0x7ab36b31 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Dakar -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Dakar[] ACE_TIME_PROGMEM = "Africa/Dakar"; + +const basic::ZoneInfo kZoneAfrica_Dakar ACE_TIME_PROGMEM = { + kZoneNameAfrica_Dakar /*name*/, + 0x780b00fd /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Dar_es_Salaam -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Dar_es_Salaam[] ACE_TIME_PROGMEM = "Africa/Dar_es_Salaam"; + +const basic::ZoneInfo kZoneAfrica_Dar_es_Salaam ACE_TIME_PROGMEM = { + kZoneNameAfrica_Dar_es_Salaam /*name*/, + 0xa04c47b6 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Djibouti -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Djibouti[] ACE_TIME_PROGMEM = "Africa/Djibouti"; + +const basic::ZoneInfo kZoneAfrica_Djibouti ACE_TIME_PROGMEM = { + kZoneNameAfrica_Djibouti /*name*/, + 0x30ea01d4 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Douala -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Douala[] ACE_TIME_PROGMEM = "Africa/Douala"; + +const basic::ZoneInfo kZoneAfrica_Douala ACE_TIME_PROGMEM = { + kZoneNameAfrica_Douala /*name*/, + 0x7a6df310 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Freetown -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Freetown[] ACE_TIME_PROGMEM = "Africa/Freetown"; + +const basic::ZoneInfo kZoneAfrica_Freetown ACE_TIME_PROGMEM = { + kZoneNameAfrica_Freetown /*name*/, + 0x6823dd64 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Gaborone -> Africa/Maputo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Gaborone[] ACE_TIME_PROGMEM = "Africa/Gaborone"; + +const basic::ZoneInfo kZoneAfrica_Gaborone ACE_TIME_PROGMEM = { + kZoneNameAfrica_Gaborone /*name*/, + 0x317c0aa7 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Maputo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Harare -> Africa/Maputo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Harare[] ACE_TIME_PROGMEM = "Africa/Harare"; + +const basic::ZoneInfo kZoneAfrica_Harare ACE_TIME_PROGMEM = { + kZoneNameAfrica_Harare /*name*/, + 0x82c39a2d /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Maputo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Kampala -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Kampala[] ACE_TIME_PROGMEM = "Africa/Kampala"; + +const basic::ZoneInfo kZoneAfrica_Kampala ACE_TIME_PROGMEM = { + kZoneNameAfrica_Kampala /*name*/, + 0xc1d30e31 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Kigali -> Africa/Maputo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Kigali[] ACE_TIME_PROGMEM = "Africa/Kigali"; + +const basic::ZoneInfo kZoneAfrica_Kigali ACE_TIME_PROGMEM = { + kZoneNameAfrica_Kigali /*name*/, + 0x8a4dcf2b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Maputo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Kinshasa -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Kinshasa[] ACE_TIME_PROGMEM = "Africa/Kinshasa"; + +const basic::ZoneInfo kZoneAfrica_Kinshasa ACE_TIME_PROGMEM = { + kZoneNameAfrica_Kinshasa /*name*/, + 0x6695d70c /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Libreville -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Libreville[] ACE_TIME_PROGMEM = "Africa/Libreville"; + +const basic::ZoneInfo kZoneAfrica_Libreville ACE_TIME_PROGMEM = { + kZoneNameAfrica_Libreville /*name*/, + 0x01d96de4 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Lome -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Lome[] ACE_TIME_PROGMEM = "Africa/Lome"; + +const basic::ZoneInfo kZoneAfrica_Lome ACE_TIME_PROGMEM = { + kZoneNameAfrica_Lome /*name*/, + 0xd51c3a07 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Luanda -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Luanda[] ACE_TIME_PROGMEM = "Africa/Luanda"; + +const basic::ZoneInfo kZoneAfrica_Luanda ACE_TIME_PROGMEM = { + kZoneNameAfrica_Luanda /*name*/, + 0x8d7909cf /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Lubumbashi -> Africa/Maputo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Lubumbashi[] ACE_TIME_PROGMEM = "Africa/Lubumbashi"; + +const basic::ZoneInfo kZoneAfrica_Lubumbashi ACE_TIME_PROGMEM = { + kZoneNameAfrica_Lubumbashi /*name*/, + 0x6fd88566 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Maputo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Lusaka -> Africa/Maputo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Lusaka[] ACE_TIME_PROGMEM = "Africa/Lusaka"; + +const basic::ZoneInfo kZoneAfrica_Lusaka ACE_TIME_PROGMEM = { + kZoneNameAfrica_Lusaka /*name*/, + 0x8d82b23b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Maputo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Malabo -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Malabo[] ACE_TIME_PROGMEM = "Africa/Malabo"; + +const basic::ZoneInfo kZoneAfrica_Malabo ACE_TIME_PROGMEM = { + kZoneNameAfrica_Malabo /*name*/, + 0x8e6a1906 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Maseru -> Africa/Johannesburg +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Maseru[] ACE_TIME_PROGMEM = "Africa/Maseru"; + +const basic::ZoneInfo kZoneAfrica_Maseru ACE_TIME_PROGMEM = { + kZoneNameAfrica_Maseru /*name*/, + 0x8e6e02c7 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Johannesburg /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Mbabane -> Africa/Johannesburg +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Mbabane[] ACE_TIME_PROGMEM = "Africa/Mbabane"; + +const basic::ZoneInfo kZoneAfrica_Mbabane ACE_TIME_PROGMEM = { + kZoneNameAfrica_Mbabane /*name*/, + 0x5d3bdd40 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Johannesburg /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Mogadishu -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Mogadishu[] ACE_TIME_PROGMEM = "Africa/Mogadishu"; + +const basic::ZoneInfo kZoneAfrica_Mogadishu ACE_TIME_PROGMEM = { + kZoneNameAfrica_Mogadishu /*name*/, + 0x66bc159b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Niamey -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Niamey[] ACE_TIME_PROGMEM = "Africa/Niamey"; + +const basic::ZoneInfo kZoneAfrica_Niamey ACE_TIME_PROGMEM = { + kZoneNameAfrica_Niamey /*name*/, + 0x914a30fd /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Nouakchott -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Nouakchott[] ACE_TIME_PROGMEM = "Africa/Nouakchott"; + +const basic::ZoneInfo kZoneAfrica_Nouakchott ACE_TIME_PROGMEM = { + kZoneNameAfrica_Nouakchott /*name*/, + 0x3dc49dba /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Ouagadougou -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Ouagadougou[] ACE_TIME_PROGMEM = "Africa/Ouagadougou"; + +const basic::ZoneInfo kZoneAfrica_Ouagadougou ACE_TIME_PROGMEM = { + kZoneNameAfrica_Ouagadougou /*name*/, + 0x04d7219a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Porto-Novo -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Porto_Novo[] ACE_TIME_PROGMEM = "Africa/Porto-Novo"; + +const basic::ZoneInfo kZoneAfrica_Porto_Novo ACE_TIME_PROGMEM = { + kZoneNameAfrica_Porto_Novo /*name*/, + 0x3d1bf95d /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Timbuktu -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Timbuktu[] ACE_TIME_PROGMEM = "Africa/Timbuktu"; + +const basic::ZoneInfo kZoneAfrica_Timbuktu ACE_TIME_PROGMEM = { + kZoneNameAfrica_Timbuktu /*name*/, + 0xb164d56f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Anguilla -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Anguilla[] ACE_TIME_PROGMEM = "America/Anguilla"; + +const basic::ZoneInfo kZoneAmerica_Anguilla ACE_TIME_PROGMEM = { + kZoneNameAmerica_Anguilla /*name*/, + 0xafe31333 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Antigua -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Antigua[] ACE_TIME_PROGMEM = "America/Antigua"; + +const basic::ZoneInfo kZoneAmerica_Antigua ACE_TIME_PROGMEM = { + kZoneNameAmerica_Antigua /*name*/, + 0xc067a32f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Aruba -> America/Curacao +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Aruba[] ACE_TIME_PROGMEM = "America/Aruba"; + +const basic::ZoneInfo kZoneAmerica_Aruba ACE_TIME_PROGMEM = { + kZoneNameAmerica_Aruba /*name*/, + 0x97cf8651 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Curacao /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Atka -> America/Adak +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Atka[] ACE_TIME_PROGMEM = "America/Atka"; + +const basic::ZoneInfo kZoneAmerica_Atka ACE_TIME_PROGMEM = { + kZoneNameAmerica_Atka /*name*/, + 0x97fe8f27 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Adak /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Cayman -> America/Panama +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Cayman[] ACE_TIME_PROGMEM = "America/Cayman"; + +const basic::ZoneInfo kZoneAmerica_Cayman ACE_TIME_PROGMEM = { + kZoneNameAmerica_Cayman /*name*/, + 0x953961df /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Panama /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Coral_Harbour -> America/Atikokan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Coral_Harbour[] ACE_TIME_PROGMEM = "America/Coral_Harbour"; + +const basic::ZoneInfo kZoneAmerica_Coral_Harbour ACE_TIME_PROGMEM = { + kZoneNameAmerica_Coral_Harbour /*name*/, + 0xabcb7569 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Atikokan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Dominica -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Dominica[] ACE_TIME_PROGMEM = "America/Dominica"; + +const basic::ZoneInfo kZoneAmerica_Dominica ACE_TIME_PROGMEM = { + kZoneNameAmerica_Dominica /*name*/, + 0xcecb4c4a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Fort_Wayne -> America/Indiana/Indianapolis +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Fort_Wayne[] ACE_TIME_PROGMEM = "America/Fort_Wayne"; + +const basic::ZoneInfo kZoneAmerica_Fort_Wayne ACE_TIME_PROGMEM = { + kZoneNameAmerica_Fort_Wayne /*name*/, + 0x7eaaaf24 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAmerica_Indiana_Indianapolis /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Godthab -> America/Nuuk +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Godthab[] ACE_TIME_PROGMEM = "America/Godthab"; + +const basic::ZoneInfo kZoneAmerica_Godthab ACE_TIME_PROGMEM = { + kZoneNameAmerica_Godthab /*name*/, + 0x8f7eba1f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Nuuk /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Grenada -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Grenada[] ACE_TIME_PROGMEM = "America/Grenada"; + +const basic::ZoneInfo kZoneAmerica_Grenada ACE_TIME_PROGMEM = { + kZoneNameAmerica_Grenada /*name*/, + 0x968ce4d8 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Guadeloupe -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Guadeloupe[] ACE_TIME_PROGMEM = "America/Guadeloupe"; + +const basic::ZoneInfo kZoneAmerica_Guadeloupe ACE_TIME_PROGMEM = { + kZoneNameAmerica_Guadeloupe /*name*/, + 0xcd1f8a31 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Indianapolis -> America/Indiana/Indianapolis +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Indianapolis[] ACE_TIME_PROGMEM = "America/Indianapolis"; + +const basic::ZoneInfo kZoneAmerica_Indianapolis ACE_TIME_PROGMEM = { + kZoneNameAmerica_Indianapolis /*name*/, + 0x6a009ae1 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAmerica_Indiana_Indianapolis /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Kralendijk -> America/Curacao +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Kralendijk[] ACE_TIME_PROGMEM = "America/Kralendijk"; + +const basic::ZoneInfo kZoneAmerica_Kralendijk ACE_TIME_PROGMEM = { + kZoneNameAmerica_Kralendijk /*name*/, + 0xe7c456c5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Curacao /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Louisville -> America/Kentucky/Louisville +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Louisville[] ACE_TIME_PROGMEM = "America/Louisville"; + +const basic::ZoneInfo kZoneAmerica_Louisville ACE_TIME_PROGMEM = { + kZoneNameAmerica_Louisville /*name*/, + 0x3dcb47ee /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Kentucky_Louisville /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Lower_Princes -> America/Curacao +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Lower_Princes[] ACE_TIME_PROGMEM = "America/Lower_Princes"; + +const basic::ZoneInfo kZoneAmerica_Lower_Princes ACE_TIME_PROGMEM = { + kZoneNameAmerica_Lower_Princes /*name*/, + 0x6ae45b62 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Curacao /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Marigot -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Marigot[] ACE_TIME_PROGMEM = "America/Marigot"; + +const basic::ZoneInfo kZoneAmerica_Marigot ACE_TIME_PROGMEM = { + kZoneNameAmerica_Marigot /*name*/, + 0x3dab3a59 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Montreal -> America/Toronto +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Montreal[] ACE_TIME_PROGMEM = "America/Montreal"; + +const basic::ZoneInfo kZoneAmerica_Montreal ACE_TIME_PROGMEM = { + kZoneNameAmerica_Montreal /*name*/, + 0x203a1ea8 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Toronto /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Montserrat -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Montserrat[] ACE_TIME_PROGMEM = "America/Montserrat"; + +const basic::ZoneInfo kZoneAmerica_Montserrat ACE_TIME_PROGMEM = { + kZoneNameAmerica_Montserrat /*name*/, + 0x199b0a35 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Shiprock -> America/Denver +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Shiprock[] ACE_TIME_PROGMEM = "America/Shiprock"; + +const basic::ZoneInfo kZoneAmerica_Shiprock ACE_TIME_PROGMEM = { + kZoneNameAmerica_Shiprock /*name*/, + 0x82fb7049 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Denver /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/St_Barthelemy -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_St_Barthelemy[] ACE_TIME_PROGMEM = "America/St_Barthelemy"; + +const basic::ZoneInfo kZoneAmerica_St_Barthelemy ACE_TIME_PROGMEM = { + kZoneNameAmerica_St_Barthelemy /*name*/, + 0x054e6a79 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/St_Kitts -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_St_Kitts[] ACE_TIME_PROGMEM = "America/St_Kitts"; + +const basic::ZoneInfo kZoneAmerica_St_Kitts ACE_TIME_PROGMEM = { + kZoneNameAmerica_St_Kitts /*name*/, + 0x04c0507b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/St_Lucia -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_St_Lucia[] ACE_TIME_PROGMEM = "America/St_Lucia"; + +const basic::ZoneInfo kZoneAmerica_St_Lucia ACE_TIME_PROGMEM = { + kZoneNameAmerica_St_Lucia /*name*/, + 0x04d8b3ba /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/St_Thomas -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_St_Thomas[] ACE_TIME_PROGMEM = "America/St_Thomas"; + +const basic::ZoneInfo kZoneAmerica_St_Thomas ACE_TIME_PROGMEM = { + kZoneNameAmerica_St_Thomas /*name*/, + 0xb1b3d778 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/St_Vincent -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_St_Vincent[] ACE_TIME_PROGMEM = "America/St_Vincent"; + +const basic::ZoneInfo kZoneAmerica_St_Vincent ACE_TIME_PROGMEM = { + kZoneNameAmerica_St_Vincent /*name*/, + 0x8460e523 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Tortola -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Tortola[] ACE_TIME_PROGMEM = "America/Tortola"; + +const basic::ZoneInfo kZoneAmerica_Tortola ACE_TIME_PROGMEM = { + kZoneNameAmerica_Tortola /*name*/, + 0x7931462b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Virgin -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Virgin[] ACE_TIME_PROGMEM = "America/Virgin"; + +const basic::ZoneInfo kZoneAmerica_Virgin ACE_TIME_PROGMEM = { + kZoneNameAmerica_Virgin /*name*/, + 0xc2183ab5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Antarctica/McMurdo -> Pacific/Auckland +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAntarctica_McMurdo[] ACE_TIME_PROGMEM = "Antarctica/McMurdo"; + +const basic::ZoneInfo kZoneAntarctica_McMurdo ACE_TIME_PROGMEM = { + kZoneNameAntarctica_McMurdo /*name*/, + 0x6eeb5585 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Auckland /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Antarctica/South_Pole -> Pacific/Auckland +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAntarctica_South_Pole[] ACE_TIME_PROGMEM = "Antarctica/South_Pole"; + +const basic::ZoneInfo kZoneAntarctica_South_Pole ACE_TIME_PROGMEM = { + kZoneNameAntarctica_South_Pole /*name*/, + 0xcd96b290 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Auckland /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Arctic/Longyearbyen -> Europe/Oslo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameArctic_Longyearbyen[] ACE_TIME_PROGMEM = "Arctic/Longyearbyen"; + +const basic::ZoneInfo kZoneArctic_Longyearbyen ACE_TIME_PROGMEM = { + kZoneNameArctic_Longyearbyen /*name*/, + 0xd23e7859 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Oslo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Aden -> Asia/Riyadh +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Aden[] ACE_TIME_PROGMEM = "Asia/Aden"; + +const basic::ZoneInfo kZoneAsia_Aden ACE_TIME_PROGMEM = { + kZoneNameAsia_Aden /*name*/, + 0x1fa7084a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Riyadh /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Ashkhabad -> Asia/Ashgabat +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Ashkhabad[] ACE_TIME_PROGMEM = "Asia/Ashkhabad"; + +const basic::ZoneInfo kZoneAsia_Ashkhabad ACE_TIME_PROGMEM = { + kZoneNameAsia_Ashkhabad /*name*/, + 0x15454f09 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Ashgabat /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Bahrain -> Asia/Qatar +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Bahrain[] ACE_TIME_PROGMEM = "Asia/Bahrain"; + +const basic::ZoneInfo kZoneAsia_Bahrain ACE_TIME_PROGMEM = { + kZoneNameAsia_Bahrain /*name*/, + 0x9d078487 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Qatar /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Calcutta -> Asia/Kolkata +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Calcutta[] ACE_TIME_PROGMEM = "Asia/Calcutta"; + +const basic::ZoneInfo kZoneAsia_Calcutta ACE_TIME_PROGMEM = { + kZoneNameAsia_Calcutta /*name*/, + 0x328a44c3 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Kolkata /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Chongqing -> Asia/Shanghai +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Chongqing[] ACE_TIME_PROGMEM = "Asia/Chongqing"; + +const basic::ZoneInfo kZoneAsia_Chongqing ACE_TIME_PROGMEM = { + kZoneNameAsia_Chongqing /*name*/, + 0xf937fb90 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Shanghai /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Chungking -> Asia/Shanghai +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Chungking[] ACE_TIME_PROGMEM = "Asia/Chungking"; + +const basic::ZoneInfo kZoneAsia_Chungking ACE_TIME_PROGMEM = { + kZoneNameAsia_Chungking /*name*/, + 0xc7121dd0 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Shanghai /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Dacca -> Asia/Dhaka +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Dacca[] ACE_TIME_PROGMEM = "Asia/Dacca"; + +const basic::ZoneInfo kZoneAsia_Dacca ACE_TIME_PROGMEM = { + kZoneNameAsia_Dacca /*name*/, + 0x14bcac5e /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAsia_Dhaka /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Harbin -> Asia/Shanghai +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Harbin[] ACE_TIME_PROGMEM = "Asia/Harbin"; + +const basic::ZoneInfo kZoneAsia_Harbin ACE_TIME_PROGMEM = { + kZoneNameAsia_Harbin /*name*/, + 0xb5af1186 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Shanghai /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Kashgar -> Asia/Urumqi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Kashgar[] ACE_TIME_PROGMEM = "Asia/Kashgar"; + +const basic::ZoneInfo kZoneAsia_Kashgar ACE_TIME_PROGMEM = { + kZoneNameAsia_Kashgar /*name*/, + 0x52955193 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Urumqi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Katmandu -> Asia/Kathmandu +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Katmandu[] ACE_TIME_PROGMEM = "Asia/Katmandu"; + +const basic::ZoneInfo kZoneAsia_Katmandu ACE_TIME_PROGMEM = { + kZoneNameAsia_Katmandu /*name*/, + 0xa7ec12c7 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Kathmandu /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Kuwait -> Asia/Riyadh +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Kuwait[] ACE_TIME_PROGMEM = "Asia/Kuwait"; + +const basic::ZoneInfo kZoneAsia_Kuwait ACE_TIME_PROGMEM = { + kZoneNameAsia_Kuwait /*name*/, + 0xbe1b2f27 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Riyadh /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Macao -> Asia/Macau +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Macao[] ACE_TIME_PROGMEM = "Asia/Macao"; + +const basic::ZoneInfo kZoneAsia_Macao ACE_TIME_PROGMEM = { + kZoneNameAsia_Macao /*name*/, + 0x155f88b3 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Macau /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Muscat -> Asia/Dubai +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Muscat[] ACE_TIME_PROGMEM = "Asia/Muscat"; + +const basic::ZoneInfo kZoneAsia_Muscat ACE_TIME_PROGMEM = { + kZoneNameAsia_Muscat /*name*/, + 0xc2c3565f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Dubai /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Phnom_Penh -> Asia/Bangkok +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Phnom_Penh[] ACE_TIME_PROGMEM = "Asia/Phnom_Penh"; + +const basic::ZoneInfo kZoneAsia_Phnom_Penh ACE_TIME_PROGMEM = { + kZoneNameAsia_Phnom_Penh /*name*/, + 0xc224945e /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Bangkok /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Rangoon -> Asia/Yangon +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Rangoon[] ACE_TIME_PROGMEM = "Asia/Rangoon"; + +const basic::ZoneInfo kZoneAsia_Rangoon ACE_TIME_PROGMEM = { + kZoneNameAsia_Rangoon /*name*/, + 0x6d1217c6 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Yangon /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Saigon -> Asia/Ho_Chi_Minh +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Saigon[] ACE_TIME_PROGMEM = "Asia/Saigon"; + +const basic::ZoneInfo kZoneAsia_Saigon ACE_TIME_PROGMEM = { + kZoneNameAsia_Saigon /*name*/, + 0xcf52f713 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Ho_Chi_Minh /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Tel_Aviv -> Asia/Jerusalem +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Tel_Aviv[] ACE_TIME_PROGMEM = "Asia/Tel_Aviv"; + +const basic::ZoneInfo kZoneAsia_Tel_Aviv ACE_TIME_PROGMEM = { + kZoneNameAsia_Tel_Aviv /*name*/, + 0x166d7c2c /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Jerusalem /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Thimbu -> Asia/Thimphu +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Thimbu[] ACE_TIME_PROGMEM = "Asia/Thimbu"; + +const basic::ZoneInfo kZoneAsia_Thimbu ACE_TIME_PROGMEM = { + kZoneNameAsia_Thimbu /*name*/, + 0xd226e31b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Thimphu /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Ujung_Pandang -> Asia/Makassar +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Ujung_Pandang[] ACE_TIME_PROGMEM = "Asia/Ujung_Pandang"; + +const basic::ZoneInfo kZoneAsia_Ujung_Pandang ACE_TIME_PROGMEM = { + kZoneNameAsia_Ujung_Pandang /*name*/, + 0x5d001eb3 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Makassar /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Ulan_Bator -> Asia/Ulaanbaatar +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Ulan_Bator[] ACE_TIME_PROGMEM = "Asia/Ulan_Bator"; + +const basic::ZoneInfo kZoneAsia_Ulan_Bator ACE_TIME_PROGMEM = { + kZoneNameAsia_Ulan_Bator /*name*/, + 0x394db4d9 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Ulaanbaatar /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Vientiane -> Asia/Bangkok +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Vientiane[] ACE_TIME_PROGMEM = "Asia/Vientiane"; + +const basic::ZoneInfo kZoneAsia_Vientiane ACE_TIME_PROGMEM = { + kZoneNameAsia_Vientiane /*name*/, + 0x89d68d75 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Bangkok /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Atlantic/Faeroe -> Atlantic/Faroe +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAtlantic_Faeroe[] ACE_TIME_PROGMEM = "Atlantic/Faeroe"; + +const basic::ZoneInfo kZoneAtlantic_Faeroe ACE_TIME_PROGMEM = { + kZoneNameAtlantic_Faeroe /*name*/, + 0x031ec516 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAtlantic_Faroe /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Atlantic/Jan_Mayen -> Europe/Oslo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAtlantic_Jan_Mayen[] ACE_TIME_PROGMEM = "Atlantic/Jan_Mayen"; + +const basic::ZoneInfo kZoneAtlantic_Jan_Mayen ACE_TIME_PROGMEM = { + kZoneNameAtlantic_Jan_Mayen /*name*/, + 0x5a7535b6 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Oslo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Atlantic/St_Helena -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAtlantic_St_Helena[] ACE_TIME_PROGMEM = "Atlantic/St_Helena"; + +const basic::ZoneInfo kZoneAtlantic_St_Helena ACE_TIME_PROGMEM = { + kZoneNameAtlantic_St_Helena /*name*/, + 0x451fc5f7 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/ACT -> Australia/Sydney +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_ACT[] ACE_TIME_PROGMEM = "Australia/ACT"; + +const basic::ZoneInfo kZoneAustralia_ACT ACE_TIME_PROGMEM = { + kZoneNameAustralia_ACT /*name*/, + 0x8a970eb2 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Sydney /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/Canberra -> Australia/Sydney +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_Canberra[] ACE_TIME_PROGMEM = "Australia/Canberra"; + +const basic::ZoneInfo kZoneAustralia_Canberra ACE_TIME_PROGMEM = { + kZoneNameAustralia_Canberra /*name*/, + 0x2a09ae58 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Sydney /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/Currie -> Australia/Hobart +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_Currie[] ACE_TIME_PROGMEM = "Australia/Currie"; + +const basic::ZoneInfo kZoneAustralia_Currie ACE_TIME_PROGMEM = { + kZoneNameAustralia_Currie /*name*/, + 0x278b6a24 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Hobart /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/LHI -> Australia/Lord_Howe +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_LHI[] ACE_TIME_PROGMEM = "Australia/LHI"; + +const basic::ZoneInfo kZoneAustralia_LHI ACE_TIME_PROGMEM = { + kZoneNameAustralia_LHI /*name*/, + 0x8a973e17 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Lord_Howe /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/NSW -> Australia/Sydney +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_NSW[] ACE_TIME_PROGMEM = "Australia/NSW"; + +const basic::ZoneInfo kZoneAustralia_NSW ACE_TIME_PROGMEM = { + kZoneNameAustralia_NSW /*name*/, + 0x8a974812 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Sydney /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/North -> Australia/Darwin +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_North[] ACE_TIME_PROGMEM = "Australia/North"; + +const basic::ZoneInfo kZoneAustralia_North ACE_TIME_PROGMEM = { + kZoneNameAustralia_North /*name*/, + 0x8d997165 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Darwin /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/Queensland -> Australia/Brisbane +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_Queensland[] ACE_TIME_PROGMEM = "Australia/Queensland"; + +const basic::ZoneInfo kZoneAustralia_Queensland ACE_TIME_PROGMEM = { + kZoneNameAustralia_Queensland /*name*/, + 0xd326ed0a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Brisbane /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/South -> Australia/Adelaide +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_South[] ACE_TIME_PROGMEM = "Australia/South"; + +const basic::ZoneInfo kZoneAustralia_South ACE_TIME_PROGMEM = { + kZoneNameAustralia_South /*name*/, + 0x8df3f8ad /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Adelaide /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/Tasmania -> Australia/Hobart +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_Tasmania[] ACE_TIME_PROGMEM = "Australia/Tasmania"; + +const basic::ZoneInfo kZoneAustralia_Tasmania ACE_TIME_PROGMEM = { + kZoneNameAustralia_Tasmania /*name*/, + 0xe6d76648 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Hobart /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/Victoria -> Australia/Melbourne +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_Victoria[] ACE_TIME_PROGMEM = "Australia/Victoria"; + +const basic::ZoneInfo kZoneAustralia_Victoria ACE_TIME_PROGMEM = { + kZoneNameAustralia_Victoria /*name*/, + 0x0260d5db /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Melbourne /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/West -> Australia/Perth +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_West[] ACE_TIME_PROGMEM = "Australia/West"; + +const basic::ZoneInfo kZoneAustralia_West ACE_TIME_PROGMEM = { + kZoneNameAustralia_West /*name*/, + 0xdd858a5d /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Perth /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/Yancowinna -> Australia/Broken_Hill +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_Yancowinna[] ACE_TIME_PROGMEM = "Australia/Yancowinna"; + +const basic::ZoneInfo kZoneAustralia_Yancowinna ACE_TIME_PROGMEM = { + kZoneNameAustralia_Yancowinna /*name*/, + 0x90bac131 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAustralia_Broken_Hill /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Brazil/East -> America/Sao_Paulo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameBrazil_East[] ACE_TIME_PROGMEM = "Brazil/East"; + +const basic::ZoneInfo kZoneBrazil_East ACE_TIME_PROGMEM = { + kZoneNameBrazil_East /*name*/, + 0x669578c5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Sao_Paulo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Brazil/West -> America/Manaus +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameBrazil_West[] ACE_TIME_PROGMEM = "Brazil/West"; + +const basic::ZoneInfo kZoneBrazil_West ACE_TIME_PROGMEM = { + kZoneNameBrazil_West /*name*/, + 0x669f689b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Manaus /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Canada/Atlantic -> America/Halifax +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCanada_Atlantic[] ACE_TIME_PROGMEM = "Canada/Atlantic"; + +const basic::ZoneInfo kZoneCanada_Atlantic ACE_TIME_PROGMEM = { + kZoneNameCanada_Atlantic /*name*/, + 0x536b119c /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Halifax /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Canada/Central -> America/Winnipeg +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCanada_Central[] ACE_TIME_PROGMEM = "Canada/Central"; + +const basic::ZoneInfo kZoneCanada_Central ACE_TIME_PROGMEM = { + kZoneNameCanada_Central /*name*/, + 0x626710f5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAmerica_Winnipeg /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Canada/Eastern -> America/Toronto +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCanada_Eastern[] ACE_TIME_PROGMEM = "Canada/Eastern"; + +const basic::ZoneInfo kZoneCanada_Eastern ACE_TIME_PROGMEM = { + kZoneNameCanada_Eastern /*name*/, + 0xf3612d5e /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Toronto /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Canada/Mountain -> America/Edmonton +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCanada_Mountain[] ACE_TIME_PROGMEM = "Canada/Mountain"; + +const basic::ZoneInfo kZoneCanada_Mountain ACE_TIME_PROGMEM = { + kZoneNameCanada_Mountain /*name*/, + 0xfb8a8217 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Edmonton /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Canada/Pacific -> America/Vancouver +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCanada_Pacific[] ACE_TIME_PROGMEM = "Canada/Pacific"; + +const basic::ZoneInfo kZoneCanada_Pacific ACE_TIME_PROGMEM = { + kZoneNameCanada_Pacific /*name*/, + 0x40fa3c7b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Vancouver /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Canada/Saskatchewan -> America/Regina +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCanada_Saskatchewan[] ACE_TIME_PROGMEM = "Canada/Saskatchewan"; + +const basic::ZoneInfo kZoneCanada_Saskatchewan ACE_TIME_PROGMEM = { + kZoneNameCanada_Saskatchewan /*name*/, + 0x77311f49 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Regina /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Chile/Continental -> America/Santiago +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameChile_Continental[] ACE_TIME_PROGMEM = "Chile/Continental"; + +const basic::ZoneInfo kZoneChile_Continental ACE_TIME_PROGMEM = { + kZoneNameChile_Continental /*name*/, + 0x7e2bdb18 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Santiago /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Chile/EasterIsland -> Pacific/Easter +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameChile_EasterIsland[] ACE_TIME_PROGMEM = "Chile/EasterIsland"; + +const basic::ZoneInfo kZoneChile_EasterIsland ACE_TIME_PROGMEM = { + kZoneNameChile_EasterIsland /*name*/, + 0xb0982af8 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Easter /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Cuba -> America/Havana +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCuba[] ACE_TIME_PROGMEM = "Cuba"; + +const basic::ZoneInfo kZoneCuba ACE_TIME_PROGMEM = { + kZoneNameCuba /*name*/, + 0x7c83cba0 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Havana /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Eire -> Europe/Dublin +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEire[] ACE_TIME_PROGMEM = "Eire"; + +const basic::ZoneInfo kZoneEire ACE_TIME_PROGMEM = { + kZoneNameEire /*name*/, + 0x7c84b36a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Dublin /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Etc/GMT+0 -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEtc_GMT_PLUS_0[] ACE_TIME_PROGMEM = "Etc/GMT+0"; + +const basic::ZoneInfo kZoneEtc_GMT_PLUS_0 ACE_TIME_PROGMEM = { + kZoneNameEtc_GMT_PLUS_0 /*name*/, + 0x9d13da13 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Etc/GMT-0 -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEtc_GMT_0[] ACE_TIME_PROGMEM = "Etc/GMT-0"; + +const basic::ZoneInfo kZoneEtc_GMT_0 ACE_TIME_PROGMEM = { + kZoneNameEtc_GMT_0 /*name*/, + 0x9d13da55 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Etc/GMT0 -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEtc_GMT0[] ACE_TIME_PROGMEM = "Etc/GMT0"; + +const basic::ZoneInfo kZoneEtc_GMT0 ACE_TIME_PROGMEM = { + kZoneNameEtc_GMT0 /*name*/, + 0xf53ea988 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Etc/Greenwich -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEtc_Greenwich[] ACE_TIME_PROGMEM = "Etc/Greenwich"; + +const basic::ZoneInfo kZoneEtc_Greenwich ACE_TIME_PROGMEM = { + kZoneNameEtc_Greenwich /*name*/, + 0x26daa98c /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Etc/UCT -> Etc/UTC +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEtc_UCT[] ACE_TIME_PROGMEM = "Etc/UCT"; + +const basic::ZoneInfo kZoneEtc_UCT ACE_TIME_PROGMEM = { + kZoneNameEtc_UCT /*name*/, + 0xd8e3189c /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_UTC /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Etc/Universal -> Etc/UTC +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEtc_Universal[] ACE_TIME_PROGMEM = "Etc/Universal"; + +const basic::ZoneInfo kZoneEtc_Universal ACE_TIME_PROGMEM = { + kZoneNameEtc_Universal /*name*/, + 0x2f8cb9a9 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_UTC /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Etc/Zulu -> Etc/UTC +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEtc_Zulu[] ACE_TIME_PROGMEM = "Etc/Zulu"; + +const basic::ZoneInfo kZoneEtc_Zulu ACE_TIME_PROGMEM = { + kZoneNameEtc_Zulu /*name*/, + 0xf549c240 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_UTC /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Belfast -> Europe/London +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Belfast[] ACE_TIME_PROGMEM = "Europe/Belfast"; + +const basic::ZoneInfo kZoneEurope_Belfast ACE_TIME_PROGMEM = { + kZoneNameEurope_Belfast /*name*/, + 0xd07dd1e5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_London /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Bratislava -> Europe/Prague +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Bratislava[] ACE_TIME_PROGMEM = "Europe/Bratislava"; + +const basic::ZoneInfo kZoneEurope_Bratislava ACE_TIME_PROGMEM = { + kZoneNameEurope_Bratislava /*name*/, + 0xda493bed /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Prague /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Busingen -> Europe/Zurich +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Busingen[] ACE_TIME_PROGMEM = "Europe/Busingen"; + +const basic::ZoneInfo kZoneEurope_Busingen ACE_TIME_PROGMEM = { + kZoneNameEurope_Busingen /*name*/, + 0xc06d2cdf /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Zurich /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Guernsey -> Europe/London +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Guernsey[] ACE_TIME_PROGMEM = "Europe/Guernsey"; + +const basic::ZoneInfo kZoneEurope_Guernsey ACE_TIME_PROGMEM = { + kZoneNameEurope_Guernsey /*name*/, + 0x3db12c16 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_London /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Isle_of_Man -> Europe/London +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Isle_of_Man[] ACE_TIME_PROGMEM = "Europe/Isle_of_Man"; + +const basic::ZoneInfo kZoneEurope_Isle_of_Man ACE_TIME_PROGMEM = { + kZoneNameEurope_Isle_of_Man /*name*/, + 0xeaf84580 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_London /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Jersey -> Europe/London +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Jersey[] ACE_TIME_PROGMEM = "Europe/Jersey"; + +const basic::ZoneInfo kZoneEurope_Jersey ACE_TIME_PROGMEM = { + kZoneNameEurope_Jersey /*name*/, + 0x570dae76 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_London /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Ljubljana -> Europe/Belgrade +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Ljubljana[] ACE_TIME_PROGMEM = "Europe/Ljubljana"; + +const basic::ZoneInfo kZoneEurope_Ljubljana ACE_TIME_PROGMEM = { + kZoneNameEurope_Ljubljana /*name*/, + 0xbd98cdb7 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Belgrade /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Mariehamn -> Europe/Helsinki +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Mariehamn[] ACE_TIME_PROGMEM = "Europe/Mariehamn"; + +const basic::ZoneInfo kZoneEurope_Mariehamn ACE_TIME_PROGMEM = { + kZoneNameEurope_Mariehamn /*name*/, + 0x0caa6496 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Helsinki /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Nicosia -> Asia/Nicosia +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Nicosia[] ACE_TIME_PROGMEM = "Europe/Nicosia"; + +const basic::ZoneInfo kZoneEurope_Nicosia ACE_TIME_PROGMEM = { + kZoneNameEurope_Nicosia /*name*/, + 0x74efab8a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Nicosia /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Podgorica -> Europe/Belgrade +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Podgorica[] ACE_TIME_PROGMEM = "Europe/Podgorica"; + +const basic::ZoneInfo kZoneEurope_Podgorica ACE_TIME_PROGMEM = { + kZoneNameEurope_Podgorica /*name*/, + 0x1c1a499c /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Belgrade /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/San_Marino -> Europe/Rome +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_San_Marino[] ACE_TIME_PROGMEM = "Europe/San_Marino"; + +const basic::ZoneInfo kZoneEurope_San_Marino ACE_TIME_PROGMEM = { + kZoneNameEurope_San_Marino /*name*/, + 0xcef7724b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Rome /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Sarajevo -> Europe/Belgrade +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Sarajevo[] ACE_TIME_PROGMEM = "Europe/Sarajevo"; + +const basic::ZoneInfo kZoneEurope_Sarajevo ACE_TIME_PROGMEM = { + kZoneNameEurope_Sarajevo /*name*/, + 0x6a576c3f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Belgrade /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Skopje -> Europe/Belgrade +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Skopje[] ACE_TIME_PROGMEM = "Europe/Skopje"; + +const basic::ZoneInfo kZoneEurope_Skopje ACE_TIME_PROGMEM = { + kZoneNameEurope_Skopje /*name*/, + 0x6c76fdd0 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Belgrade /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Tiraspol -> Europe/Chisinau +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Tiraspol[] ACE_TIME_PROGMEM = "Europe/Tiraspol"; + +const basic::ZoneInfo kZoneEurope_Tiraspol ACE_TIME_PROGMEM = { + kZoneNameEurope_Tiraspol /*name*/, + 0xbe704472 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Chisinau /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Vaduz -> Europe/Zurich +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Vaduz[] ACE_TIME_PROGMEM = "Europe/Vaduz"; + +const basic::ZoneInfo kZoneEurope_Vaduz ACE_TIME_PROGMEM = { + kZoneNameEurope_Vaduz /*name*/, + 0xfbb81bae /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Zurich /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Vatican -> Europe/Rome +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Vatican[] ACE_TIME_PROGMEM = "Europe/Vatican"; + +const basic::ZoneInfo kZoneEurope_Vatican ACE_TIME_PROGMEM = { + kZoneNameEurope_Vatican /*name*/, + 0xcb485dca /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Rome /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Zagreb -> Europe/Belgrade +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Zagreb[] ACE_TIME_PROGMEM = "Europe/Zagreb"; + +const basic::ZoneInfo kZoneEurope_Zagreb ACE_TIME_PROGMEM = { + kZoneNameEurope_Zagreb /*name*/, + 0x7c11c9ff /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Belgrade /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: GB -> Europe/London +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameGB[] ACE_TIME_PROGMEM = "GB"; + +const basic::ZoneInfo kZoneGB ACE_TIME_PROGMEM = { + kZoneNameGB /*name*/, + 0x005973ae /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_London /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: GB-Eire -> Europe/London +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameGB_Eire[] ACE_TIME_PROGMEM = "GB-Eire"; + +const basic::ZoneInfo kZoneGB_Eire ACE_TIME_PROGMEM = { + kZoneNameGB_Eire /*name*/, + 0xfa70e300 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_London /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: GMT -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameGMT[] ACE_TIME_PROGMEM = "GMT"; + +const basic::ZoneInfo kZoneGMT ACE_TIME_PROGMEM = { + kZoneNameGMT /*name*/, + 0x0b87eb2d /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: GMT+0 -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameGMT_PLUS_0[] ACE_TIME_PROGMEM = "GMT+0"; + +const basic::ZoneInfo kZoneGMT_PLUS_0 ACE_TIME_PROGMEM = { + kZoneNameGMT_PLUS_0 /*name*/, + 0x0d2f7028 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: GMT-0 -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameGMT_0[] ACE_TIME_PROGMEM = "GMT-0"; + +const basic::ZoneInfo kZoneGMT_0 ACE_TIME_PROGMEM = { + kZoneNameGMT_0 /*name*/, + 0x0d2f706a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: GMT0 -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameGMT0[] ACE_TIME_PROGMEM = "GMT0"; + +const basic::ZoneInfo kZoneGMT0 ACE_TIME_PROGMEM = { + kZoneNameGMT0 /*name*/, + 0x7c8550fd /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Greenwich -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameGreenwich[] ACE_TIME_PROGMEM = "Greenwich"; + +const basic::ZoneInfo kZoneGreenwich ACE_TIME_PROGMEM = { + kZoneNameGreenwich /*name*/, + 0xc84d4221 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Hongkong -> Asia/Hong_Kong +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameHongkong[] ACE_TIME_PROGMEM = "Hongkong"; + +const basic::ZoneInfo kZoneHongkong ACE_TIME_PROGMEM = { + kZoneNameHongkong /*name*/, + 0x56d36560 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Hong_Kong /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Iceland -> Atlantic/Reykjavik +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameIceland[] ACE_TIME_PROGMEM = "Iceland"; + +const basic::ZoneInfo kZoneIceland ACE_TIME_PROGMEM = { + kZoneNameIceland /*name*/, + 0xe56a35b5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAtlantic_Reykjavik /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Indian/Antananarivo -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameIndian_Antananarivo[] ACE_TIME_PROGMEM = "Indian/Antananarivo"; + +const basic::ZoneInfo kZoneIndian_Antananarivo ACE_TIME_PROGMEM = { + kZoneNameIndian_Antananarivo /*name*/, + 0x9ebf5289 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Indian/Comoro -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameIndian_Comoro[] ACE_TIME_PROGMEM = "Indian/Comoro"; + +const basic::ZoneInfo kZoneIndian_Comoro ACE_TIME_PROGMEM = { + kZoneNameIndian_Comoro /*name*/, + 0x45f4deb6 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Indian/Mayotte -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameIndian_Mayotte[] ACE_TIME_PROGMEM = "Indian/Mayotte"; + +const basic::ZoneInfo kZoneIndian_Mayotte ACE_TIME_PROGMEM = { + kZoneNameIndian_Mayotte /*name*/, + 0xe6880bca /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Iran -> Asia/Tehran +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameIran[] ACE_TIME_PROGMEM = "Iran"; + +const basic::ZoneInfo kZoneIran ACE_TIME_PROGMEM = { + kZoneNameIran /*name*/, + 0x7c87090f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Tehran /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Israel -> Asia/Jerusalem +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameIsrael[] ACE_TIME_PROGMEM = "Israel"; + +const basic::ZoneInfo kZoneIsrael ACE_TIME_PROGMEM = { + kZoneNameIsrael /*name*/, + 0xba88c9e5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Jerusalem /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Jamaica -> America/Jamaica +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameJamaica[] ACE_TIME_PROGMEM = "Jamaica"; + +const basic::ZoneInfo kZoneJamaica ACE_TIME_PROGMEM = { + kZoneNameJamaica /*name*/, + 0x2e44fdab /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Jamaica /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Japan -> Asia/Tokyo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameJapan[] ACE_TIME_PROGMEM = "Japan"; + +const basic::ZoneInfo kZoneJapan ACE_TIME_PROGMEM = { + kZoneNameJapan /*name*/, + 0x0d712f8f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Tokyo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Kwajalein -> Pacific/Kwajalein +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameKwajalein[] ACE_TIME_PROGMEM = "Kwajalein"; + +const basic::ZoneInfo kZoneKwajalein ACE_TIME_PROGMEM = { + kZoneNameKwajalein /*name*/, + 0x0e57afbb /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Kwajalein /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Mexico/BajaSur -> America/Mazatlan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameMexico_BajaSur[] ACE_TIME_PROGMEM = "Mexico/BajaSur"; + +const basic::ZoneInfo kZoneMexico_BajaSur ACE_TIME_PROGMEM = { + kZoneNameMexico_BajaSur /*name*/, + 0x08ee3641 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Mazatlan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: NZ -> Pacific/Auckland +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameNZ[] ACE_TIME_PROGMEM = "NZ"; + +const basic::ZoneInfo kZoneNZ ACE_TIME_PROGMEM = { + kZoneNameNZ /*name*/, + 0x005974ad /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Auckland /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: NZ-CHAT -> Pacific/Chatham +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameNZ_CHAT[] ACE_TIME_PROGMEM = "NZ-CHAT"; + +const basic::ZoneInfo kZoneNZ_CHAT ACE_TIME_PROGMEM = { + kZoneNameNZ_CHAT /*name*/, + 0x4d42afda /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Chatham /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Navajo -> America/Denver +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameNavajo[] ACE_TIME_PROGMEM = "Navajo"; + +const basic::ZoneInfo kZoneNavajo ACE_TIME_PROGMEM = { + kZoneNameNavajo /*name*/, + 0xc4ef0e24 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Denver /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: PRC -> Asia/Shanghai +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePRC[] ACE_TIME_PROGMEM = "PRC"; + +const basic::ZoneInfo kZonePRC ACE_TIME_PROGMEM = { + kZoneNamePRC /*name*/, + 0x0b88120a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Shanghai /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Pacific/Johnston -> Pacific/Honolulu +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePacific_Johnston[] ACE_TIME_PROGMEM = "Pacific/Johnston"; + +const basic::ZoneInfo kZonePacific_Johnston ACE_TIME_PROGMEM = { + kZoneNamePacific_Johnston /*name*/, + 0xb15d7b36 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Honolulu /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Pacific/Midway -> Pacific/Pago_Pago +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePacific_Midway[] ACE_TIME_PROGMEM = "Pacific/Midway"; + +const basic::ZoneInfo kZonePacific_Midway ACE_TIME_PROGMEM = { + kZoneNamePacific_Midway /*name*/, + 0xe286d38e /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Pago_Pago /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Pacific/Ponape -> Pacific/Pohnpei +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePacific_Ponape[] ACE_TIME_PROGMEM = "Pacific/Ponape"; + +const basic::ZoneInfo kZonePacific_Ponape ACE_TIME_PROGMEM = { + kZoneNamePacific_Ponape /*name*/, + 0xe9f80086 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Pohnpei /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Pacific/Samoa -> Pacific/Pago_Pago +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePacific_Samoa[] ACE_TIME_PROGMEM = "Pacific/Samoa"; + +const basic::ZoneInfo kZonePacific_Samoa ACE_TIME_PROGMEM = { + kZoneNamePacific_Samoa /*name*/, + 0x8b2699b4 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Pago_Pago /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Pacific/Truk -> Pacific/Chuuk +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePacific_Truk[] ACE_TIME_PROGMEM = "Pacific/Truk"; + +const basic::ZoneInfo kZonePacific_Truk ACE_TIME_PROGMEM = { + kZoneNamePacific_Truk /*name*/, + 0x234010a9 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Chuuk /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Pacific/Yap -> Pacific/Chuuk +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePacific_Yap[] ACE_TIME_PROGMEM = "Pacific/Yap"; + +const basic::ZoneInfo kZonePacific_Yap ACE_TIME_PROGMEM = { + kZoneNamePacific_Yap /*name*/, + 0xbb40138d /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Chuuk /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Poland -> Europe/Warsaw +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePoland[] ACE_TIME_PROGMEM = "Poland"; + +const basic::ZoneInfo kZonePoland ACE_TIME_PROGMEM = { + kZoneNamePoland /*name*/, + 0xca913b23 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Warsaw /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Portugal -> Europe/Lisbon +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePortugal[] ACE_TIME_PROGMEM = "Portugal"; + +const basic::ZoneInfo kZonePortugal ACE_TIME_PROGMEM = { + kZoneNamePortugal /*name*/, + 0xc3274593 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Lisbon /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: ROC -> Asia/Taipei +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameROC[] ACE_TIME_PROGMEM = "ROC"; + +const basic::ZoneInfo kZoneROC ACE_TIME_PROGMEM = { + kZoneNameROC /*name*/, + 0x0b881a29 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Taipei /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: ROK -> Asia/Seoul +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameROK[] ACE_TIME_PROGMEM = "ROK"; + +const basic::ZoneInfo kZoneROK ACE_TIME_PROGMEM = { + kZoneNameROK /*name*/, + 0x0b881a31 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Seoul /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Singapore -> Asia/Singapore +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameSingapore[] ACE_TIME_PROGMEM = "Singapore"; + +const basic::ZoneInfo kZoneSingapore ACE_TIME_PROGMEM = { + kZoneNameSingapore /*name*/, + 0xa8598c8d /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Singapore /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: UCT -> Etc/UTC +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUCT[] ACE_TIME_PROGMEM = "UCT"; + +const basic::ZoneInfo kZoneUCT ACE_TIME_PROGMEM = { + kZoneNameUCT /*name*/, + 0x0b882571 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_UTC /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Alaska -> America/Anchorage +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Alaska[] ACE_TIME_PROGMEM = "US/Alaska"; + +const basic::ZoneInfo kZoneUS_Alaska ACE_TIME_PROGMEM = { + kZoneNameUS_Alaska /*name*/, + 0xfa300bc9 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Anchorage /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Aleutian -> America/Adak +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Aleutian[] ACE_TIME_PROGMEM = "US/Aleutian"; + +const basic::ZoneInfo kZoneUS_Aleutian ACE_TIME_PROGMEM = { + kZoneNameUS_Aleutian /*name*/, + 0x4fe013ef /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Adak /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Arizona -> America/Phoenix +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Arizona[] ACE_TIME_PROGMEM = "US/Arizona"; + +const basic::ZoneInfo kZoneUS_Arizona ACE_TIME_PROGMEM = { + kZoneNameUS_Arizona /*name*/, + 0x4ec52670 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Phoenix /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Central -> America/Chicago +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Central[] ACE_TIME_PROGMEM = "US/Central"; + +const basic::ZoneInfo kZoneUS_Central ACE_TIME_PROGMEM = { + kZoneNameUS_Central /*name*/, + 0xcabdcb25 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Chicago /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/East-Indiana -> America/Indiana/Indianapolis +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_East_Indiana[] ACE_TIME_PROGMEM = "US/East-Indiana"; + +const basic::ZoneInfo kZoneUS_East_Indiana ACE_TIME_PROGMEM = { + kZoneNameUS_East_Indiana /*name*/, + 0x6dcf558a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAmerica_Indiana_Indianapolis /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Eastern -> America/New_York +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Eastern[] ACE_TIME_PROGMEM = "US/Eastern"; + +const basic::ZoneInfo kZoneUS_Eastern ACE_TIME_PROGMEM = { + kZoneNameUS_Eastern /*name*/, + 0x5bb7e78e /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_New_York /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Hawaii -> Pacific/Honolulu +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Hawaii[] ACE_TIME_PROGMEM = "US/Hawaii"; + +const basic::ZoneInfo kZoneUS_Hawaii ACE_TIME_PROGMEM = { + kZoneNameUS_Hawaii /*name*/, + 0x09c8de2f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Honolulu /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Michigan -> America/Detroit +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Michigan[] ACE_TIME_PROGMEM = "US/Michigan"; + +const basic::ZoneInfo kZoneUS_Michigan ACE_TIME_PROGMEM = { + kZoneNameUS_Michigan /*name*/, + 0x766bb7bc /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Detroit /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Mountain -> America/Denver +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Mountain[] ACE_TIME_PROGMEM = "US/Mountain"; + +const basic::ZoneInfo kZoneUS_Mountain ACE_TIME_PROGMEM = { + kZoneNameUS_Mountain /*name*/, + 0x6eb88247 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Denver /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Pacific -> America/Los_Angeles +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Pacific[] ACE_TIME_PROGMEM = "US/Pacific"; + +const basic::ZoneInfo kZoneUS_Pacific ACE_TIME_PROGMEM = { + kZoneNameUS_Pacific /*name*/, + 0xa950f6ab /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Los_Angeles /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Samoa -> Pacific/Pago_Pago +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Samoa[] ACE_TIME_PROGMEM = "US/Samoa"; + +const basic::ZoneInfo kZoneUS_Samoa ACE_TIME_PROGMEM = { + kZoneNameUS_Samoa /*name*/, + 0x566821cd /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Pago_Pago /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: UTC -> Etc/UTC +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUTC[] ACE_TIME_PROGMEM = "UTC"; + +const basic::ZoneInfo kZoneUTC ACE_TIME_PROGMEM = { + kZoneNameUTC /*name*/, + 0x0b882791 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_UTC /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Universal -> Etc/UTC +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUniversal[] ACE_TIME_PROGMEM = "Universal"; + +const basic::ZoneInfo kZoneUniversal ACE_TIME_PROGMEM = { + kZoneNameUniversal /*name*/, + 0xd0ff523e /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_UTC /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Zulu -> Etc/UTC +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameZulu[] ACE_TIME_PROGMEM = "Zulu"; + +const basic::ZoneInfo kZoneZulu ACE_TIME_PROGMEM = { + kZoneNameZulu /*name*/, + 0x7c9069b5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_UTC /*eras*/, +}; + } } diff --git a/src/ace_time/zonedb/zone_infos.h b/src/ace_time/zonedb/zone_infos.h index 5b1100b97..43ef41700 100644 --- a/src/ace_time/zonedb/zone_infos.h +++ b/src/ace_time/zonedb/zone_infos.h @@ -588,191 +588,374 @@ const uint32_t kZoneIdWET = 0x0b882e35; // WET // Supported links: 183 //--------------------------------------------------------------------------- -extern const basic::ZoneInfo& kZoneAfrica_Addis_Ababa; // Africa/Addis_Ababa -> Africa/Nairobi -extern const basic::ZoneInfo& kZoneAfrica_Asmara; // Africa/Asmara -> Africa/Nairobi -extern const basic::ZoneInfo& kZoneAfrica_Asmera; // Africa/Asmera -> Africa/Nairobi -extern const basic::ZoneInfo& kZoneAfrica_Bamako; // Africa/Bamako -> Africa/Abidjan -extern const basic::ZoneInfo& kZoneAfrica_Bangui; // Africa/Bangui -> Africa/Lagos -extern const basic::ZoneInfo& kZoneAfrica_Banjul; // Africa/Banjul -> Africa/Abidjan -extern const basic::ZoneInfo& kZoneAfrica_Blantyre; // Africa/Blantyre -> Africa/Maputo -extern const basic::ZoneInfo& kZoneAfrica_Brazzaville; // Africa/Brazzaville -> Africa/Lagos -extern const basic::ZoneInfo& kZoneAfrica_Bujumbura; // Africa/Bujumbura -> Africa/Maputo -extern const basic::ZoneInfo& kZoneAfrica_Conakry; // Africa/Conakry -> Africa/Abidjan -extern const basic::ZoneInfo& kZoneAfrica_Dakar; // Africa/Dakar -> Africa/Abidjan -extern const basic::ZoneInfo& kZoneAfrica_Dar_es_Salaam; // Africa/Dar_es_Salaam -> Africa/Nairobi -extern const basic::ZoneInfo& kZoneAfrica_Djibouti; // Africa/Djibouti -> Africa/Nairobi -extern const basic::ZoneInfo& kZoneAfrica_Douala; // Africa/Douala -> Africa/Lagos -extern const basic::ZoneInfo& kZoneAfrica_Freetown; // Africa/Freetown -> Africa/Abidjan -extern const basic::ZoneInfo& kZoneAfrica_Gaborone; // Africa/Gaborone -> Africa/Maputo -extern const basic::ZoneInfo& kZoneAfrica_Harare; // Africa/Harare -> Africa/Maputo -extern const basic::ZoneInfo& kZoneAfrica_Kampala; // Africa/Kampala -> Africa/Nairobi -extern const basic::ZoneInfo& kZoneAfrica_Kigali; // Africa/Kigali -> Africa/Maputo -extern const basic::ZoneInfo& kZoneAfrica_Kinshasa; // Africa/Kinshasa -> Africa/Lagos -extern const basic::ZoneInfo& kZoneAfrica_Libreville; // Africa/Libreville -> Africa/Lagos -extern const basic::ZoneInfo& kZoneAfrica_Lome; // Africa/Lome -> Africa/Abidjan -extern const basic::ZoneInfo& kZoneAfrica_Luanda; // Africa/Luanda -> Africa/Lagos -extern const basic::ZoneInfo& kZoneAfrica_Lubumbashi; // Africa/Lubumbashi -> Africa/Maputo -extern const basic::ZoneInfo& kZoneAfrica_Lusaka; // Africa/Lusaka -> Africa/Maputo -extern const basic::ZoneInfo& kZoneAfrica_Malabo; // Africa/Malabo -> Africa/Lagos -extern const basic::ZoneInfo& kZoneAfrica_Maseru; // Africa/Maseru -> Africa/Johannesburg -extern const basic::ZoneInfo& kZoneAfrica_Mbabane; // Africa/Mbabane -> Africa/Johannesburg -extern const basic::ZoneInfo& kZoneAfrica_Mogadishu; // Africa/Mogadishu -> Africa/Nairobi -extern const basic::ZoneInfo& kZoneAfrica_Niamey; // Africa/Niamey -> Africa/Lagos -extern const basic::ZoneInfo& kZoneAfrica_Nouakchott; // Africa/Nouakchott -> Africa/Abidjan -extern const basic::ZoneInfo& kZoneAfrica_Ouagadougou; // Africa/Ouagadougou -> Africa/Abidjan -extern const basic::ZoneInfo& kZoneAfrica_Porto_Novo; // Africa/Porto-Novo -> Africa/Lagos -extern const basic::ZoneInfo& kZoneAfrica_Timbuktu; // Africa/Timbuktu -> Africa/Abidjan -extern const basic::ZoneInfo& kZoneAmerica_Anguilla; // America/Anguilla -> America/Port_of_Spain -extern const basic::ZoneInfo& kZoneAmerica_Antigua; // America/Antigua -> America/Port_of_Spain -extern const basic::ZoneInfo& kZoneAmerica_Aruba; // America/Aruba -> America/Curacao -extern const basic::ZoneInfo& kZoneAmerica_Atka; // America/Atka -> America/Adak -extern const basic::ZoneInfo& kZoneAmerica_Cayman; // America/Cayman -> America/Panama -extern const basic::ZoneInfo& kZoneAmerica_Coral_Harbour; // America/Coral_Harbour -> America/Atikokan -extern const basic::ZoneInfo& kZoneAmerica_Dominica; // America/Dominica -> America/Port_of_Spain -extern const basic::ZoneInfo& kZoneAmerica_Fort_Wayne; // America/Fort_Wayne -> America/Indiana/Indianapolis -extern const basic::ZoneInfo& kZoneAmerica_Godthab; // America/Godthab -> America/Nuuk -extern const basic::ZoneInfo& kZoneAmerica_Grenada; // America/Grenada -> America/Port_of_Spain -extern const basic::ZoneInfo& kZoneAmerica_Guadeloupe; // America/Guadeloupe -> America/Port_of_Spain -extern const basic::ZoneInfo& kZoneAmerica_Indianapolis; // America/Indianapolis -> America/Indiana/Indianapolis -extern const basic::ZoneInfo& kZoneAmerica_Kralendijk; // America/Kralendijk -> America/Curacao -extern const basic::ZoneInfo& kZoneAmerica_Louisville; // America/Louisville -> America/Kentucky/Louisville -extern const basic::ZoneInfo& kZoneAmerica_Lower_Princes; // America/Lower_Princes -> America/Curacao -extern const basic::ZoneInfo& kZoneAmerica_Marigot; // America/Marigot -> America/Port_of_Spain -extern const basic::ZoneInfo& kZoneAmerica_Montreal; // America/Montreal -> America/Toronto -extern const basic::ZoneInfo& kZoneAmerica_Montserrat; // America/Montserrat -> America/Port_of_Spain -extern const basic::ZoneInfo& kZoneAmerica_Shiprock; // America/Shiprock -> America/Denver -extern const basic::ZoneInfo& kZoneAmerica_St_Barthelemy; // America/St_Barthelemy -> America/Port_of_Spain -extern const basic::ZoneInfo& kZoneAmerica_St_Kitts; // America/St_Kitts -> America/Port_of_Spain -extern const basic::ZoneInfo& kZoneAmerica_St_Lucia; // America/St_Lucia -> America/Port_of_Spain -extern const basic::ZoneInfo& kZoneAmerica_St_Thomas; // America/St_Thomas -> America/Port_of_Spain -extern const basic::ZoneInfo& kZoneAmerica_St_Vincent; // America/St_Vincent -> America/Port_of_Spain -extern const basic::ZoneInfo& kZoneAmerica_Tortola; // America/Tortola -> America/Port_of_Spain -extern const basic::ZoneInfo& kZoneAmerica_Virgin; // America/Virgin -> America/Port_of_Spain -extern const basic::ZoneInfo& kZoneAntarctica_McMurdo; // Antarctica/McMurdo -> Pacific/Auckland -extern const basic::ZoneInfo& kZoneAntarctica_South_Pole; // Antarctica/South_Pole -> Pacific/Auckland -extern const basic::ZoneInfo& kZoneArctic_Longyearbyen; // Arctic/Longyearbyen -> Europe/Oslo -extern const basic::ZoneInfo& kZoneAsia_Aden; // Asia/Aden -> Asia/Riyadh -extern const basic::ZoneInfo& kZoneAsia_Ashkhabad; // Asia/Ashkhabad -> Asia/Ashgabat -extern const basic::ZoneInfo& kZoneAsia_Bahrain; // Asia/Bahrain -> Asia/Qatar -extern const basic::ZoneInfo& kZoneAsia_Calcutta; // Asia/Calcutta -> Asia/Kolkata -extern const basic::ZoneInfo& kZoneAsia_Chongqing; // Asia/Chongqing -> Asia/Shanghai -extern const basic::ZoneInfo& kZoneAsia_Chungking; // Asia/Chungking -> Asia/Shanghai -extern const basic::ZoneInfo& kZoneAsia_Dacca; // Asia/Dacca -> Asia/Dhaka -extern const basic::ZoneInfo& kZoneAsia_Harbin; // Asia/Harbin -> Asia/Shanghai -extern const basic::ZoneInfo& kZoneAsia_Kashgar; // Asia/Kashgar -> Asia/Urumqi -extern const basic::ZoneInfo& kZoneAsia_Katmandu; // Asia/Katmandu -> Asia/Kathmandu -extern const basic::ZoneInfo& kZoneAsia_Kuwait; // Asia/Kuwait -> Asia/Riyadh -extern const basic::ZoneInfo& kZoneAsia_Macao; // Asia/Macao -> Asia/Macau -extern const basic::ZoneInfo& kZoneAsia_Muscat; // Asia/Muscat -> Asia/Dubai -extern const basic::ZoneInfo& kZoneAsia_Phnom_Penh; // Asia/Phnom_Penh -> Asia/Bangkok -extern const basic::ZoneInfo& kZoneAsia_Rangoon; // Asia/Rangoon -> Asia/Yangon -extern const basic::ZoneInfo& kZoneAsia_Saigon; // Asia/Saigon -> Asia/Ho_Chi_Minh -extern const basic::ZoneInfo& kZoneAsia_Tel_Aviv; // Asia/Tel_Aviv -> Asia/Jerusalem -extern const basic::ZoneInfo& kZoneAsia_Thimbu; // Asia/Thimbu -> Asia/Thimphu -extern const basic::ZoneInfo& kZoneAsia_Ujung_Pandang; // Asia/Ujung_Pandang -> Asia/Makassar -extern const basic::ZoneInfo& kZoneAsia_Ulan_Bator; // Asia/Ulan_Bator -> Asia/Ulaanbaatar -extern const basic::ZoneInfo& kZoneAsia_Vientiane; // Asia/Vientiane -> Asia/Bangkok -extern const basic::ZoneInfo& kZoneAtlantic_Faeroe; // Atlantic/Faeroe -> Atlantic/Faroe -extern const basic::ZoneInfo& kZoneAtlantic_Jan_Mayen; // Atlantic/Jan_Mayen -> Europe/Oslo -extern const basic::ZoneInfo& kZoneAtlantic_St_Helena; // Atlantic/St_Helena -> Africa/Abidjan -extern const basic::ZoneInfo& kZoneAustralia_ACT; // Australia/ACT -> Australia/Sydney -extern const basic::ZoneInfo& kZoneAustralia_Canberra; // Australia/Canberra -> Australia/Sydney -extern const basic::ZoneInfo& kZoneAustralia_Currie; // Australia/Currie -> Australia/Hobart -extern const basic::ZoneInfo& kZoneAustralia_LHI; // Australia/LHI -> Australia/Lord_Howe -extern const basic::ZoneInfo& kZoneAustralia_NSW; // Australia/NSW -> Australia/Sydney -extern const basic::ZoneInfo& kZoneAustralia_North; // Australia/North -> Australia/Darwin -extern const basic::ZoneInfo& kZoneAustralia_Queensland; // Australia/Queensland -> Australia/Brisbane -extern const basic::ZoneInfo& kZoneAustralia_South; // Australia/South -> Australia/Adelaide -extern const basic::ZoneInfo& kZoneAustralia_Tasmania; // Australia/Tasmania -> Australia/Hobart -extern const basic::ZoneInfo& kZoneAustralia_Victoria; // Australia/Victoria -> Australia/Melbourne -extern const basic::ZoneInfo& kZoneAustralia_West; // Australia/West -> Australia/Perth -extern const basic::ZoneInfo& kZoneAustralia_Yancowinna; // Australia/Yancowinna -> Australia/Broken_Hill -extern const basic::ZoneInfo& kZoneBrazil_East; // Brazil/East -> America/Sao_Paulo -extern const basic::ZoneInfo& kZoneBrazil_West; // Brazil/West -> America/Manaus -extern const basic::ZoneInfo& kZoneCanada_Atlantic; // Canada/Atlantic -> America/Halifax -extern const basic::ZoneInfo& kZoneCanada_Central; // Canada/Central -> America/Winnipeg -extern const basic::ZoneInfo& kZoneCanada_Eastern; // Canada/Eastern -> America/Toronto -extern const basic::ZoneInfo& kZoneCanada_Mountain; // Canada/Mountain -> America/Edmonton -extern const basic::ZoneInfo& kZoneCanada_Pacific; // Canada/Pacific -> America/Vancouver -extern const basic::ZoneInfo& kZoneCanada_Saskatchewan; // Canada/Saskatchewan -> America/Regina -extern const basic::ZoneInfo& kZoneChile_Continental; // Chile/Continental -> America/Santiago -extern const basic::ZoneInfo& kZoneChile_EasterIsland; // Chile/EasterIsland -> Pacific/Easter -extern const basic::ZoneInfo& kZoneCuba; // Cuba -> America/Havana -extern const basic::ZoneInfo& kZoneEire; // Eire -> Europe/Dublin -extern const basic::ZoneInfo& kZoneEtc_GMT_PLUS_0; // Etc/GMT+0 -> Etc/GMT -extern const basic::ZoneInfo& kZoneEtc_GMT_0; // Etc/GMT-0 -> Etc/GMT -extern const basic::ZoneInfo& kZoneEtc_GMT0; // Etc/GMT0 -> Etc/GMT -extern const basic::ZoneInfo& kZoneEtc_Greenwich; // Etc/Greenwich -> Etc/GMT -extern const basic::ZoneInfo& kZoneEtc_UCT; // Etc/UCT -> Etc/UTC -extern const basic::ZoneInfo& kZoneEtc_Universal; // Etc/Universal -> Etc/UTC -extern const basic::ZoneInfo& kZoneEtc_Zulu; // Etc/Zulu -> Etc/UTC -extern const basic::ZoneInfo& kZoneEurope_Belfast; // Europe/Belfast -> Europe/London -extern const basic::ZoneInfo& kZoneEurope_Bratislava; // Europe/Bratislava -> Europe/Prague -extern const basic::ZoneInfo& kZoneEurope_Busingen; // Europe/Busingen -> Europe/Zurich -extern const basic::ZoneInfo& kZoneEurope_Guernsey; // Europe/Guernsey -> Europe/London -extern const basic::ZoneInfo& kZoneEurope_Isle_of_Man; // Europe/Isle_of_Man -> Europe/London -extern const basic::ZoneInfo& kZoneEurope_Jersey; // Europe/Jersey -> Europe/London -extern const basic::ZoneInfo& kZoneEurope_Ljubljana; // Europe/Ljubljana -> Europe/Belgrade -extern const basic::ZoneInfo& kZoneEurope_Mariehamn; // Europe/Mariehamn -> Europe/Helsinki -extern const basic::ZoneInfo& kZoneEurope_Nicosia; // Europe/Nicosia -> Asia/Nicosia -extern const basic::ZoneInfo& kZoneEurope_Podgorica; // Europe/Podgorica -> Europe/Belgrade -extern const basic::ZoneInfo& kZoneEurope_San_Marino; // Europe/San_Marino -> Europe/Rome -extern const basic::ZoneInfo& kZoneEurope_Sarajevo; // Europe/Sarajevo -> Europe/Belgrade -extern const basic::ZoneInfo& kZoneEurope_Skopje; // Europe/Skopje -> Europe/Belgrade -extern const basic::ZoneInfo& kZoneEurope_Tiraspol; // Europe/Tiraspol -> Europe/Chisinau -extern const basic::ZoneInfo& kZoneEurope_Vaduz; // Europe/Vaduz -> Europe/Zurich -extern const basic::ZoneInfo& kZoneEurope_Vatican; // Europe/Vatican -> Europe/Rome -extern const basic::ZoneInfo& kZoneEurope_Zagreb; // Europe/Zagreb -> Europe/Belgrade -extern const basic::ZoneInfo& kZoneGB; // GB -> Europe/London -extern const basic::ZoneInfo& kZoneGB_Eire; // GB-Eire -> Europe/London -extern const basic::ZoneInfo& kZoneGMT; // GMT -> Etc/GMT -extern const basic::ZoneInfo& kZoneGMT_PLUS_0; // GMT+0 -> Etc/GMT -extern const basic::ZoneInfo& kZoneGMT_0; // GMT-0 -> Etc/GMT -extern const basic::ZoneInfo& kZoneGMT0; // GMT0 -> Etc/GMT -extern const basic::ZoneInfo& kZoneGreenwich; // Greenwich -> Etc/GMT -extern const basic::ZoneInfo& kZoneHongkong; // Hongkong -> Asia/Hong_Kong -extern const basic::ZoneInfo& kZoneIceland; // Iceland -> Atlantic/Reykjavik -extern const basic::ZoneInfo& kZoneIndian_Antananarivo; // Indian/Antananarivo -> Africa/Nairobi -extern const basic::ZoneInfo& kZoneIndian_Comoro; // Indian/Comoro -> Africa/Nairobi -extern const basic::ZoneInfo& kZoneIndian_Mayotte; // Indian/Mayotte -> Africa/Nairobi -extern const basic::ZoneInfo& kZoneIran; // Iran -> Asia/Tehran -extern const basic::ZoneInfo& kZoneIsrael; // Israel -> Asia/Jerusalem -extern const basic::ZoneInfo& kZoneJamaica; // Jamaica -> America/Jamaica -extern const basic::ZoneInfo& kZoneJapan; // Japan -> Asia/Tokyo -extern const basic::ZoneInfo& kZoneKwajalein; // Kwajalein -> Pacific/Kwajalein -extern const basic::ZoneInfo& kZoneMexico_BajaSur; // Mexico/BajaSur -> America/Mazatlan -extern const basic::ZoneInfo& kZoneNZ; // NZ -> Pacific/Auckland -extern const basic::ZoneInfo& kZoneNZ_CHAT; // NZ-CHAT -> Pacific/Chatham -extern const basic::ZoneInfo& kZoneNavajo; // Navajo -> America/Denver -extern const basic::ZoneInfo& kZonePRC; // PRC -> Asia/Shanghai -extern const basic::ZoneInfo& kZonePacific_Johnston; // Pacific/Johnston -> Pacific/Honolulu -extern const basic::ZoneInfo& kZonePacific_Midway; // Pacific/Midway -> Pacific/Pago_Pago -extern const basic::ZoneInfo& kZonePacific_Ponape; // Pacific/Ponape -> Pacific/Pohnpei -extern const basic::ZoneInfo& kZonePacific_Samoa; // Pacific/Samoa -> Pacific/Pago_Pago -extern const basic::ZoneInfo& kZonePacific_Truk; // Pacific/Truk -> Pacific/Chuuk -extern const basic::ZoneInfo& kZonePacific_Yap; // Pacific/Yap -> Pacific/Chuuk -extern const basic::ZoneInfo& kZonePoland; // Poland -> Europe/Warsaw -extern const basic::ZoneInfo& kZonePortugal; // Portugal -> Europe/Lisbon -extern const basic::ZoneInfo& kZoneROC; // ROC -> Asia/Taipei -extern const basic::ZoneInfo& kZoneROK; // ROK -> Asia/Seoul -extern const basic::ZoneInfo& kZoneSingapore; // Singapore -> Asia/Singapore -extern const basic::ZoneInfo& kZoneUCT; // UCT -> Etc/UTC -extern const basic::ZoneInfo& kZoneUS_Alaska; // US/Alaska -> America/Anchorage -extern const basic::ZoneInfo& kZoneUS_Aleutian; // US/Aleutian -> America/Adak -extern const basic::ZoneInfo& kZoneUS_Arizona; // US/Arizona -> America/Phoenix -extern const basic::ZoneInfo& kZoneUS_Central; // US/Central -> America/Chicago -extern const basic::ZoneInfo& kZoneUS_East_Indiana; // US/East-Indiana -> America/Indiana/Indianapolis -extern const basic::ZoneInfo& kZoneUS_Eastern; // US/Eastern -> America/New_York -extern const basic::ZoneInfo& kZoneUS_Hawaii; // US/Hawaii -> Pacific/Honolulu -extern const basic::ZoneInfo& kZoneUS_Michigan; // US/Michigan -> America/Detroit -extern const basic::ZoneInfo& kZoneUS_Mountain; // US/Mountain -> America/Denver -extern const basic::ZoneInfo& kZoneUS_Pacific; // US/Pacific -> America/Los_Angeles -extern const basic::ZoneInfo& kZoneUS_Samoa; // US/Samoa -> Pacific/Pago_Pago -extern const basic::ZoneInfo& kZoneUTC; // UTC -> Etc/UTC -extern const basic::ZoneInfo& kZoneUniversal; // Universal -> Etc/UTC -extern const basic::ZoneInfo& kZoneZulu; // Zulu -> Etc/UTC +extern const basic::ZoneInfo kZoneAfrica_Addis_Ababa; // Africa/Addis_Ababa -> Africa/Nairobi +extern const basic::ZoneInfo kZoneAfrica_Asmara; // Africa/Asmara -> Africa/Nairobi +extern const basic::ZoneInfo kZoneAfrica_Asmera; // Africa/Asmera -> Africa/Nairobi +extern const basic::ZoneInfo kZoneAfrica_Bamako; // Africa/Bamako -> Africa/Abidjan +extern const basic::ZoneInfo kZoneAfrica_Bangui; // Africa/Bangui -> Africa/Lagos +extern const basic::ZoneInfo kZoneAfrica_Banjul; // Africa/Banjul -> Africa/Abidjan +extern const basic::ZoneInfo kZoneAfrica_Blantyre; // Africa/Blantyre -> Africa/Maputo +extern const basic::ZoneInfo kZoneAfrica_Brazzaville; // Africa/Brazzaville -> Africa/Lagos +extern const basic::ZoneInfo kZoneAfrica_Bujumbura; // Africa/Bujumbura -> Africa/Maputo +extern const basic::ZoneInfo kZoneAfrica_Conakry; // Africa/Conakry -> Africa/Abidjan +extern const basic::ZoneInfo kZoneAfrica_Dakar; // Africa/Dakar -> Africa/Abidjan +extern const basic::ZoneInfo kZoneAfrica_Dar_es_Salaam; // Africa/Dar_es_Salaam -> Africa/Nairobi +extern const basic::ZoneInfo kZoneAfrica_Djibouti; // Africa/Djibouti -> Africa/Nairobi +extern const basic::ZoneInfo kZoneAfrica_Douala; // Africa/Douala -> Africa/Lagos +extern const basic::ZoneInfo kZoneAfrica_Freetown; // Africa/Freetown -> Africa/Abidjan +extern const basic::ZoneInfo kZoneAfrica_Gaborone; // Africa/Gaborone -> Africa/Maputo +extern const basic::ZoneInfo kZoneAfrica_Harare; // Africa/Harare -> Africa/Maputo +extern const basic::ZoneInfo kZoneAfrica_Kampala; // Africa/Kampala -> Africa/Nairobi +extern const basic::ZoneInfo kZoneAfrica_Kigali; // Africa/Kigali -> Africa/Maputo +extern const basic::ZoneInfo kZoneAfrica_Kinshasa; // Africa/Kinshasa -> Africa/Lagos +extern const basic::ZoneInfo kZoneAfrica_Libreville; // Africa/Libreville -> Africa/Lagos +extern const basic::ZoneInfo kZoneAfrica_Lome; // Africa/Lome -> Africa/Abidjan +extern const basic::ZoneInfo kZoneAfrica_Luanda; // Africa/Luanda -> Africa/Lagos +extern const basic::ZoneInfo kZoneAfrica_Lubumbashi; // Africa/Lubumbashi -> Africa/Maputo +extern const basic::ZoneInfo kZoneAfrica_Lusaka; // Africa/Lusaka -> Africa/Maputo +extern const basic::ZoneInfo kZoneAfrica_Malabo; // Africa/Malabo -> Africa/Lagos +extern const basic::ZoneInfo kZoneAfrica_Maseru; // Africa/Maseru -> Africa/Johannesburg +extern const basic::ZoneInfo kZoneAfrica_Mbabane; // Africa/Mbabane -> Africa/Johannesburg +extern const basic::ZoneInfo kZoneAfrica_Mogadishu; // Africa/Mogadishu -> Africa/Nairobi +extern const basic::ZoneInfo kZoneAfrica_Niamey; // Africa/Niamey -> Africa/Lagos +extern const basic::ZoneInfo kZoneAfrica_Nouakchott; // Africa/Nouakchott -> Africa/Abidjan +extern const basic::ZoneInfo kZoneAfrica_Ouagadougou; // Africa/Ouagadougou -> Africa/Abidjan +extern const basic::ZoneInfo kZoneAfrica_Porto_Novo; // Africa/Porto-Novo -> Africa/Lagos +extern const basic::ZoneInfo kZoneAfrica_Timbuktu; // Africa/Timbuktu -> Africa/Abidjan +extern const basic::ZoneInfo kZoneAmerica_Anguilla; // America/Anguilla -> America/Port_of_Spain +extern const basic::ZoneInfo kZoneAmerica_Antigua; // America/Antigua -> America/Port_of_Spain +extern const basic::ZoneInfo kZoneAmerica_Aruba; // America/Aruba -> America/Curacao +extern const basic::ZoneInfo kZoneAmerica_Atka; // America/Atka -> America/Adak +extern const basic::ZoneInfo kZoneAmerica_Cayman; // America/Cayman -> America/Panama +extern const basic::ZoneInfo kZoneAmerica_Coral_Harbour; // America/Coral_Harbour -> America/Atikokan +extern const basic::ZoneInfo kZoneAmerica_Dominica; // America/Dominica -> America/Port_of_Spain +extern const basic::ZoneInfo kZoneAmerica_Fort_Wayne; // America/Fort_Wayne -> America/Indiana/Indianapolis +extern const basic::ZoneInfo kZoneAmerica_Godthab; // America/Godthab -> America/Nuuk +extern const basic::ZoneInfo kZoneAmerica_Grenada; // America/Grenada -> America/Port_of_Spain +extern const basic::ZoneInfo kZoneAmerica_Guadeloupe; // America/Guadeloupe -> America/Port_of_Spain +extern const basic::ZoneInfo kZoneAmerica_Indianapolis; // America/Indianapolis -> America/Indiana/Indianapolis +extern const basic::ZoneInfo kZoneAmerica_Kralendijk; // America/Kralendijk -> America/Curacao +extern const basic::ZoneInfo kZoneAmerica_Louisville; // America/Louisville -> America/Kentucky/Louisville +extern const basic::ZoneInfo kZoneAmerica_Lower_Princes; // America/Lower_Princes -> America/Curacao +extern const basic::ZoneInfo kZoneAmerica_Marigot; // America/Marigot -> America/Port_of_Spain +extern const basic::ZoneInfo kZoneAmerica_Montreal; // America/Montreal -> America/Toronto +extern const basic::ZoneInfo kZoneAmerica_Montserrat; // America/Montserrat -> America/Port_of_Spain +extern const basic::ZoneInfo kZoneAmerica_Shiprock; // America/Shiprock -> America/Denver +extern const basic::ZoneInfo kZoneAmerica_St_Barthelemy; // America/St_Barthelemy -> America/Port_of_Spain +extern const basic::ZoneInfo kZoneAmerica_St_Kitts; // America/St_Kitts -> America/Port_of_Spain +extern const basic::ZoneInfo kZoneAmerica_St_Lucia; // America/St_Lucia -> America/Port_of_Spain +extern const basic::ZoneInfo kZoneAmerica_St_Thomas; // America/St_Thomas -> America/Port_of_Spain +extern const basic::ZoneInfo kZoneAmerica_St_Vincent; // America/St_Vincent -> America/Port_of_Spain +extern const basic::ZoneInfo kZoneAmerica_Tortola; // America/Tortola -> America/Port_of_Spain +extern const basic::ZoneInfo kZoneAmerica_Virgin; // America/Virgin -> America/Port_of_Spain +extern const basic::ZoneInfo kZoneAntarctica_McMurdo; // Antarctica/McMurdo -> Pacific/Auckland +extern const basic::ZoneInfo kZoneAntarctica_South_Pole; // Antarctica/South_Pole -> Pacific/Auckland +extern const basic::ZoneInfo kZoneArctic_Longyearbyen; // Arctic/Longyearbyen -> Europe/Oslo +extern const basic::ZoneInfo kZoneAsia_Aden; // Asia/Aden -> Asia/Riyadh +extern const basic::ZoneInfo kZoneAsia_Ashkhabad; // Asia/Ashkhabad -> Asia/Ashgabat +extern const basic::ZoneInfo kZoneAsia_Bahrain; // Asia/Bahrain -> Asia/Qatar +extern const basic::ZoneInfo kZoneAsia_Calcutta; // Asia/Calcutta -> Asia/Kolkata +extern const basic::ZoneInfo kZoneAsia_Chongqing; // Asia/Chongqing -> Asia/Shanghai +extern const basic::ZoneInfo kZoneAsia_Chungking; // Asia/Chungking -> Asia/Shanghai +extern const basic::ZoneInfo kZoneAsia_Dacca; // Asia/Dacca -> Asia/Dhaka +extern const basic::ZoneInfo kZoneAsia_Harbin; // Asia/Harbin -> Asia/Shanghai +extern const basic::ZoneInfo kZoneAsia_Kashgar; // Asia/Kashgar -> Asia/Urumqi +extern const basic::ZoneInfo kZoneAsia_Katmandu; // Asia/Katmandu -> Asia/Kathmandu +extern const basic::ZoneInfo kZoneAsia_Kuwait; // Asia/Kuwait -> Asia/Riyadh +extern const basic::ZoneInfo kZoneAsia_Macao; // Asia/Macao -> Asia/Macau +extern const basic::ZoneInfo kZoneAsia_Muscat; // Asia/Muscat -> Asia/Dubai +extern const basic::ZoneInfo kZoneAsia_Phnom_Penh; // Asia/Phnom_Penh -> Asia/Bangkok +extern const basic::ZoneInfo kZoneAsia_Rangoon; // Asia/Rangoon -> Asia/Yangon +extern const basic::ZoneInfo kZoneAsia_Saigon; // Asia/Saigon -> Asia/Ho_Chi_Minh +extern const basic::ZoneInfo kZoneAsia_Tel_Aviv; // Asia/Tel_Aviv -> Asia/Jerusalem +extern const basic::ZoneInfo kZoneAsia_Thimbu; // Asia/Thimbu -> Asia/Thimphu +extern const basic::ZoneInfo kZoneAsia_Ujung_Pandang; // Asia/Ujung_Pandang -> Asia/Makassar +extern const basic::ZoneInfo kZoneAsia_Ulan_Bator; // Asia/Ulan_Bator -> Asia/Ulaanbaatar +extern const basic::ZoneInfo kZoneAsia_Vientiane; // Asia/Vientiane -> Asia/Bangkok +extern const basic::ZoneInfo kZoneAtlantic_Faeroe; // Atlantic/Faeroe -> Atlantic/Faroe +extern const basic::ZoneInfo kZoneAtlantic_Jan_Mayen; // Atlantic/Jan_Mayen -> Europe/Oslo +extern const basic::ZoneInfo kZoneAtlantic_St_Helena; // Atlantic/St_Helena -> Africa/Abidjan +extern const basic::ZoneInfo kZoneAustralia_ACT; // Australia/ACT -> Australia/Sydney +extern const basic::ZoneInfo kZoneAustralia_Canberra; // Australia/Canberra -> Australia/Sydney +extern const basic::ZoneInfo kZoneAustralia_Currie; // Australia/Currie -> Australia/Hobart +extern const basic::ZoneInfo kZoneAustralia_LHI; // Australia/LHI -> Australia/Lord_Howe +extern const basic::ZoneInfo kZoneAustralia_NSW; // Australia/NSW -> Australia/Sydney +extern const basic::ZoneInfo kZoneAustralia_North; // Australia/North -> Australia/Darwin +extern const basic::ZoneInfo kZoneAustralia_Queensland; // Australia/Queensland -> Australia/Brisbane +extern const basic::ZoneInfo kZoneAustralia_South; // Australia/South -> Australia/Adelaide +extern const basic::ZoneInfo kZoneAustralia_Tasmania; // Australia/Tasmania -> Australia/Hobart +extern const basic::ZoneInfo kZoneAustralia_Victoria; // Australia/Victoria -> Australia/Melbourne +extern const basic::ZoneInfo kZoneAustralia_West; // Australia/West -> Australia/Perth +extern const basic::ZoneInfo kZoneAustralia_Yancowinna; // Australia/Yancowinna -> Australia/Broken_Hill +extern const basic::ZoneInfo kZoneBrazil_East; // Brazil/East -> America/Sao_Paulo +extern const basic::ZoneInfo kZoneBrazil_West; // Brazil/West -> America/Manaus +extern const basic::ZoneInfo kZoneCanada_Atlantic; // Canada/Atlantic -> America/Halifax +extern const basic::ZoneInfo kZoneCanada_Central; // Canada/Central -> America/Winnipeg +extern const basic::ZoneInfo kZoneCanada_Eastern; // Canada/Eastern -> America/Toronto +extern const basic::ZoneInfo kZoneCanada_Mountain; // Canada/Mountain -> America/Edmonton +extern const basic::ZoneInfo kZoneCanada_Pacific; // Canada/Pacific -> America/Vancouver +extern const basic::ZoneInfo kZoneCanada_Saskatchewan; // Canada/Saskatchewan -> America/Regina +extern const basic::ZoneInfo kZoneChile_Continental; // Chile/Continental -> America/Santiago +extern const basic::ZoneInfo kZoneChile_EasterIsland; // Chile/EasterIsland -> Pacific/Easter +extern const basic::ZoneInfo kZoneCuba; // Cuba -> America/Havana +extern const basic::ZoneInfo kZoneEire; // Eire -> Europe/Dublin +extern const basic::ZoneInfo kZoneEtc_GMT_PLUS_0; // Etc/GMT+0 -> Etc/GMT +extern const basic::ZoneInfo kZoneEtc_GMT_0; // Etc/GMT-0 -> Etc/GMT +extern const basic::ZoneInfo kZoneEtc_GMT0; // Etc/GMT0 -> Etc/GMT +extern const basic::ZoneInfo kZoneEtc_Greenwich; // Etc/Greenwich -> Etc/GMT +extern const basic::ZoneInfo kZoneEtc_UCT; // Etc/UCT -> Etc/UTC +extern const basic::ZoneInfo kZoneEtc_Universal; // Etc/Universal -> Etc/UTC +extern const basic::ZoneInfo kZoneEtc_Zulu; // Etc/Zulu -> Etc/UTC +extern const basic::ZoneInfo kZoneEurope_Belfast; // Europe/Belfast -> Europe/London +extern const basic::ZoneInfo kZoneEurope_Bratislava; // Europe/Bratislava -> Europe/Prague +extern const basic::ZoneInfo kZoneEurope_Busingen; // Europe/Busingen -> Europe/Zurich +extern const basic::ZoneInfo kZoneEurope_Guernsey; // Europe/Guernsey -> Europe/London +extern const basic::ZoneInfo kZoneEurope_Isle_of_Man; // Europe/Isle_of_Man -> Europe/London +extern const basic::ZoneInfo kZoneEurope_Jersey; // Europe/Jersey -> Europe/London +extern const basic::ZoneInfo kZoneEurope_Ljubljana; // Europe/Ljubljana -> Europe/Belgrade +extern const basic::ZoneInfo kZoneEurope_Mariehamn; // Europe/Mariehamn -> Europe/Helsinki +extern const basic::ZoneInfo kZoneEurope_Nicosia; // Europe/Nicosia -> Asia/Nicosia +extern const basic::ZoneInfo kZoneEurope_Podgorica; // Europe/Podgorica -> Europe/Belgrade +extern const basic::ZoneInfo kZoneEurope_San_Marino; // Europe/San_Marino -> Europe/Rome +extern const basic::ZoneInfo kZoneEurope_Sarajevo; // Europe/Sarajevo -> Europe/Belgrade +extern const basic::ZoneInfo kZoneEurope_Skopje; // Europe/Skopje -> Europe/Belgrade +extern const basic::ZoneInfo kZoneEurope_Tiraspol; // Europe/Tiraspol -> Europe/Chisinau +extern const basic::ZoneInfo kZoneEurope_Vaduz; // Europe/Vaduz -> Europe/Zurich +extern const basic::ZoneInfo kZoneEurope_Vatican; // Europe/Vatican -> Europe/Rome +extern const basic::ZoneInfo kZoneEurope_Zagreb; // Europe/Zagreb -> Europe/Belgrade +extern const basic::ZoneInfo kZoneGB; // GB -> Europe/London +extern const basic::ZoneInfo kZoneGB_Eire; // GB-Eire -> Europe/London +extern const basic::ZoneInfo kZoneGMT; // GMT -> Etc/GMT +extern const basic::ZoneInfo kZoneGMT_PLUS_0; // GMT+0 -> Etc/GMT +extern const basic::ZoneInfo kZoneGMT_0; // GMT-0 -> Etc/GMT +extern const basic::ZoneInfo kZoneGMT0; // GMT0 -> Etc/GMT +extern const basic::ZoneInfo kZoneGreenwich; // Greenwich -> Etc/GMT +extern const basic::ZoneInfo kZoneHongkong; // Hongkong -> Asia/Hong_Kong +extern const basic::ZoneInfo kZoneIceland; // Iceland -> Atlantic/Reykjavik +extern const basic::ZoneInfo kZoneIndian_Antananarivo; // Indian/Antananarivo -> Africa/Nairobi +extern const basic::ZoneInfo kZoneIndian_Comoro; // Indian/Comoro -> Africa/Nairobi +extern const basic::ZoneInfo kZoneIndian_Mayotte; // Indian/Mayotte -> Africa/Nairobi +extern const basic::ZoneInfo kZoneIran; // Iran -> Asia/Tehran +extern const basic::ZoneInfo kZoneIsrael; // Israel -> Asia/Jerusalem +extern const basic::ZoneInfo kZoneJamaica; // Jamaica -> America/Jamaica +extern const basic::ZoneInfo kZoneJapan; // Japan -> Asia/Tokyo +extern const basic::ZoneInfo kZoneKwajalein; // Kwajalein -> Pacific/Kwajalein +extern const basic::ZoneInfo kZoneMexico_BajaSur; // Mexico/BajaSur -> America/Mazatlan +extern const basic::ZoneInfo kZoneNZ; // NZ -> Pacific/Auckland +extern const basic::ZoneInfo kZoneNZ_CHAT; // NZ-CHAT -> Pacific/Chatham +extern const basic::ZoneInfo kZoneNavajo; // Navajo -> America/Denver +extern const basic::ZoneInfo kZonePRC; // PRC -> Asia/Shanghai +extern const basic::ZoneInfo kZonePacific_Johnston; // Pacific/Johnston -> Pacific/Honolulu +extern const basic::ZoneInfo kZonePacific_Midway; // Pacific/Midway -> Pacific/Pago_Pago +extern const basic::ZoneInfo kZonePacific_Ponape; // Pacific/Ponape -> Pacific/Pohnpei +extern const basic::ZoneInfo kZonePacific_Samoa; // Pacific/Samoa -> Pacific/Pago_Pago +extern const basic::ZoneInfo kZonePacific_Truk; // Pacific/Truk -> Pacific/Chuuk +extern const basic::ZoneInfo kZonePacific_Yap; // Pacific/Yap -> Pacific/Chuuk +extern const basic::ZoneInfo kZonePoland; // Poland -> Europe/Warsaw +extern const basic::ZoneInfo kZonePortugal; // Portugal -> Europe/Lisbon +extern const basic::ZoneInfo kZoneROC; // ROC -> Asia/Taipei +extern const basic::ZoneInfo kZoneROK; // ROK -> Asia/Seoul +extern const basic::ZoneInfo kZoneSingapore; // Singapore -> Asia/Singapore +extern const basic::ZoneInfo kZoneUCT; // UCT -> Etc/UTC +extern const basic::ZoneInfo kZoneUS_Alaska; // US/Alaska -> America/Anchorage +extern const basic::ZoneInfo kZoneUS_Aleutian; // US/Aleutian -> America/Adak +extern const basic::ZoneInfo kZoneUS_Arizona; // US/Arizona -> America/Phoenix +extern const basic::ZoneInfo kZoneUS_Central; // US/Central -> America/Chicago +extern const basic::ZoneInfo kZoneUS_East_Indiana; // US/East-Indiana -> America/Indiana/Indianapolis +extern const basic::ZoneInfo kZoneUS_Eastern; // US/Eastern -> America/New_York +extern const basic::ZoneInfo kZoneUS_Hawaii; // US/Hawaii -> Pacific/Honolulu +extern const basic::ZoneInfo kZoneUS_Michigan; // US/Michigan -> America/Detroit +extern const basic::ZoneInfo kZoneUS_Mountain; // US/Mountain -> America/Denver +extern const basic::ZoneInfo kZoneUS_Pacific; // US/Pacific -> America/Los_Angeles +extern const basic::ZoneInfo kZoneUS_Samoa; // US/Samoa -> Pacific/Pago_Pago +extern const basic::ZoneInfo kZoneUTC; // UTC -> Etc/UTC +extern const basic::ZoneInfo kZoneUniversal; // Universal -> Etc/UTC +extern const basic::ZoneInfo kZoneZulu; // Zulu -> Etc/UTC +const uint32_t kZoneIdAfrica_Addis_Ababa = 0x05ae1e65; // Africa/Addis_Ababa +const uint32_t kZoneIdAfrica_Asmara = 0x73b278ef; // Africa/Asmara +const uint32_t kZoneIdAfrica_Asmera = 0x73b289f3; // Africa/Asmera +const uint32_t kZoneIdAfrica_Bamako = 0x74c1e7a5; // Africa/Bamako +const uint32_t kZoneIdAfrica_Bangui = 0x74c28ed0; // Africa/Bangui +const uint32_t kZoneIdAfrica_Banjul = 0x74c29b96; // Africa/Banjul +const uint32_t kZoneIdAfrica_Blantyre = 0xe08d813b; // Africa/Blantyre +const uint32_t kZoneIdAfrica_Brazzaville = 0x39cda760; // Africa/Brazzaville +const uint32_t kZoneIdAfrica_Bujumbura = 0x05232a47; // Africa/Bujumbura +const uint32_t kZoneIdAfrica_Conakry = 0x7ab36b31; // Africa/Conakry +const uint32_t kZoneIdAfrica_Dakar = 0x780b00fd; // Africa/Dakar +const uint32_t kZoneIdAfrica_Dar_es_Salaam = 0xa04c47b6; // Africa/Dar_es_Salaam +const uint32_t kZoneIdAfrica_Djibouti = 0x30ea01d4; // Africa/Djibouti +const uint32_t kZoneIdAfrica_Douala = 0x7a6df310; // Africa/Douala +const uint32_t kZoneIdAfrica_Freetown = 0x6823dd64; // Africa/Freetown +const uint32_t kZoneIdAfrica_Gaborone = 0x317c0aa7; // Africa/Gaborone +const uint32_t kZoneIdAfrica_Harare = 0x82c39a2d; // Africa/Harare +const uint32_t kZoneIdAfrica_Kampala = 0xc1d30e31; // Africa/Kampala +const uint32_t kZoneIdAfrica_Kigali = 0x8a4dcf2b; // Africa/Kigali +const uint32_t kZoneIdAfrica_Kinshasa = 0x6695d70c; // Africa/Kinshasa +const uint32_t kZoneIdAfrica_Libreville = 0x01d96de4; // Africa/Libreville +const uint32_t kZoneIdAfrica_Lome = 0xd51c3a07; // Africa/Lome +const uint32_t kZoneIdAfrica_Luanda = 0x8d7909cf; // Africa/Luanda +const uint32_t kZoneIdAfrica_Lubumbashi = 0x6fd88566; // Africa/Lubumbashi +const uint32_t kZoneIdAfrica_Lusaka = 0x8d82b23b; // Africa/Lusaka +const uint32_t kZoneIdAfrica_Malabo = 0x8e6a1906; // Africa/Malabo +const uint32_t kZoneIdAfrica_Maseru = 0x8e6e02c7; // Africa/Maseru +const uint32_t kZoneIdAfrica_Mbabane = 0x5d3bdd40; // Africa/Mbabane +const uint32_t kZoneIdAfrica_Mogadishu = 0x66bc159b; // Africa/Mogadishu +const uint32_t kZoneIdAfrica_Niamey = 0x914a30fd; // Africa/Niamey +const uint32_t kZoneIdAfrica_Nouakchott = 0x3dc49dba; // Africa/Nouakchott +const uint32_t kZoneIdAfrica_Ouagadougou = 0x04d7219a; // Africa/Ouagadougou +const uint32_t kZoneIdAfrica_Porto_Novo = 0x3d1bf95d; // Africa/Porto-Novo +const uint32_t kZoneIdAfrica_Timbuktu = 0xb164d56f; // Africa/Timbuktu +const uint32_t kZoneIdAmerica_Anguilla = 0xafe31333; // America/Anguilla +const uint32_t kZoneIdAmerica_Antigua = 0xc067a32f; // America/Antigua +const uint32_t kZoneIdAmerica_Aruba = 0x97cf8651; // America/Aruba +const uint32_t kZoneIdAmerica_Atka = 0x97fe8f27; // America/Atka +const uint32_t kZoneIdAmerica_Cayman = 0x953961df; // America/Cayman +const uint32_t kZoneIdAmerica_Coral_Harbour = 0xabcb7569; // America/Coral_Harbour +const uint32_t kZoneIdAmerica_Dominica = 0xcecb4c4a; // America/Dominica +const uint32_t kZoneIdAmerica_Fort_Wayne = 0x7eaaaf24; // America/Fort_Wayne +const uint32_t kZoneIdAmerica_Godthab = 0x8f7eba1f; // America/Godthab +const uint32_t kZoneIdAmerica_Grenada = 0x968ce4d8; // America/Grenada +const uint32_t kZoneIdAmerica_Guadeloupe = 0xcd1f8a31; // America/Guadeloupe +const uint32_t kZoneIdAmerica_Indianapolis = 0x6a009ae1; // America/Indianapolis +const uint32_t kZoneIdAmerica_Kralendijk = 0xe7c456c5; // America/Kralendijk +const uint32_t kZoneIdAmerica_Louisville = 0x3dcb47ee; // America/Louisville +const uint32_t kZoneIdAmerica_Lower_Princes = 0x6ae45b62; // America/Lower_Princes +const uint32_t kZoneIdAmerica_Marigot = 0x3dab3a59; // America/Marigot +const uint32_t kZoneIdAmerica_Montreal = 0x203a1ea8; // America/Montreal +const uint32_t kZoneIdAmerica_Montserrat = 0x199b0a35; // America/Montserrat +const uint32_t kZoneIdAmerica_Shiprock = 0x82fb7049; // America/Shiprock +const uint32_t kZoneIdAmerica_St_Barthelemy = 0x054e6a79; // America/St_Barthelemy +const uint32_t kZoneIdAmerica_St_Kitts = 0x04c0507b; // America/St_Kitts +const uint32_t kZoneIdAmerica_St_Lucia = 0x04d8b3ba; // America/St_Lucia +const uint32_t kZoneIdAmerica_St_Thomas = 0xb1b3d778; // America/St_Thomas +const uint32_t kZoneIdAmerica_St_Vincent = 0x8460e523; // America/St_Vincent +const uint32_t kZoneIdAmerica_Tortola = 0x7931462b; // America/Tortola +const uint32_t kZoneIdAmerica_Virgin = 0xc2183ab5; // America/Virgin +const uint32_t kZoneIdAntarctica_McMurdo = 0x6eeb5585; // Antarctica/McMurdo +const uint32_t kZoneIdAntarctica_South_Pole = 0xcd96b290; // Antarctica/South_Pole +const uint32_t kZoneIdArctic_Longyearbyen = 0xd23e7859; // Arctic/Longyearbyen +const uint32_t kZoneIdAsia_Aden = 0x1fa7084a; // Asia/Aden +const uint32_t kZoneIdAsia_Ashkhabad = 0x15454f09; // Asia/Ashkhabad +const uint32_t kZoneIdAsia_Bahrain = 0x9d078487; // Asia/Bahrain +const uint32_t kZoneIdAsia_Calcutta = 0x328a44c3; // Asia/Calcutta +const uint32_t kZoneIdAsia_Chongqing = 0xf937fb90; // Asia/Chongqing +const uint32_t kZoneIdAsia_Chungking = 0xc7121dd0; // Asia/Chungking +const uint32_t kZoneIdAsia_Dacca = 0x14bcac5e; // Asia/Dacca +const uint32_t kZoneIdAsia_Harbin = 0xb5af1186; // Asia/Harbin +const uint32_t kZoneIdAsia_Kashgar = 0x52955193; // Asia/Kashgar +const uint32_t kZoneIdAsia_Katmandu = 0xa7ec12c7; // Asia/Katmandu +const uint32_t kZoneIdAsia_Kuwait = 0xbe1b2f27; // Asia/Kuwait +const uint32_t kZoneIdAsia_Macao = 0x155f88b3; // Asia/Macao +const uint32_t kZoneIdAsia_Muscat = 0xc2c3565f; // Asia/Muscat +const uint32_t kZoneIdAsia_Phnom_Penh = 0xc224945e; // Asia/Phnom_Penh +const uint32_t kZoneIdAsia_Rangoon = 0x6d1217c6; // Asia/Rangoon +const uint32_t kZoneIdAsia_Saigon = 0xcf52f713; // Asia/Saigon +const uint32_t kZoneIdAsia_Tel_Aviv = 0x166d7c2c; // Asia/Tel_Aviv +const uint32_t kZoneIdAsia_Thimbu = 0xd226e31b; // Asia/Thimbu +const uint32_t kZoneIdAsia_Ujung_Pandang = 0x5d001eb3; // Asia/Ujung_Pandang +const uint32_t kZoneIdAsia_Ulan_Bator = 0x394db4d9; // Asia/Ulan_Bator +const uint32_t kZoneIdAsia_Vientiane = 0x89d68d75; // Asia/Vientiane +const uint32_t kZoneIdAtlantic_Faeroe = 0x031ec516; // Atlantic/Faeroe +const uint32_t kZoneIdAtlantic_Jan_Mayen = 0x5a7535b6; // Atlantic/Jan_Mayen +const uint32_t kZoneIdAtlantic_St_Helena = 0x451fc5f7; // Atlantic/St_Helena +const uint32_t kZoneIdAustralia_ACT = 0x8a970eb2; // Australia/ACT +const uint32_t kZoneIdAustralia_Canberra = 0x2a09ae58; // Australia/Canberra +const uint32_t kZoneIdAustralia_Currie = 0x278b6a24; // Australia/Currie +const uint32_t kZoneIdAustralia_LHI = 0x8a973e17; // Australia/LHI +const uint32_t kZoneIdAustralia_NSW = 0x8a974812; // Australia/NSW +const uint32_t kZoneIdAustralia_North = 0x8d997165; // Australia/North +const uint32_t kZoneIdAustralia_Queensland = 0xd326ed0a; // Australia/Queensland +const uint32_t kZoneIdAustralia_South = 0x8df3f8ad; // Australia/South +const uint32_t kZoneIdAustralia_Tasmania = 0xe6d76648; // Australia/Tasmania +const uint32_t kZoneIdAustralia_Victoria = 0x0260d5db; // Australia/Victoria +const uint32_t kZoneIdAustralia_West = 0xdd858a5d; // Australia/West +const uint32_t kZoneIdAustralia_Yancowinna = 0x90bac131; // Australia/Yancowinna +const uint32_t kZoneIdBrazil_East = 0x669578c5; // Brazil/East +const uint32_t kZoneIdBrazil_West = 0x669f689b; // Brazil/West +const uint32_t kZoneIdCanada_Atlantic = 0x536b119c; // Canada/Atlantic +const uint32_t kZoneIdCanada_Central = 0x626710f5; // Canada/Central +const uint32_t kZoneIdCanada_Eastern = 0xf3612d5e; // Canada/Eastern +const uint32_t kZoneIdCanada_Mountain = 0xfb8a8217; // Canada/Mountain +const uint32_t kZoneIdCanada_Pacific = 0x40fa3c7b; // Canada/Pacific +const uint32_t kZoneIdCanada_Saskatchewan = 0x77311f49; // Canada/Saskatchewan +const uint32_t kZoneIdChile_Continental = 0x7e2bdb18; // Chile/Continental +const uint32_t kZoneIdChile_EasterIsland = 0xb0982af8; // Chile/EasterIsland +const uint32_t kZoneIdCuba = 0x7c83cba0; // Cuba +const uint32_t kZoneIdEire = 0x7c84b36a; // Eire +const uint32_t kZoneIdEtc_GMT_PLUS_0 = 0x9d13da13; // Etc/GMT+0 +const uint32_t kZoneIdEtc_GMT_0 = 0x9d13da55; // Etc/GMT-0 +const uint32_t kZoneIdEtc_GMT0 = 0xf53ea988; // Etc/GMT0 +const uint32_t kZoneIdEtc_Greenwich = 0x26daa98c; // Etc/Greenwich +const uint32_t kZoneIdEtc_UCT = 0xd8e3189c; // Etc/UCT +const uint32_t kZoneIdEtc_Universal = 0x2f8cb9a9; // Etc/Universal +const uint32_t kZoneIdEtc_Zulu = 0xf549c240; // Etc/Zulu +const uint32_t kZoneIdEurope_Belfast = 0xd07dd1e5; // Europe/Belfast +const uint32_t kZoneIdEurope_Bratislava = 0xda493bed; // Europe/Bratislava +const uint32_t kZoneIdEurope_Busingen = 0xc06d2cdf; // Europe/Busingen +const uint32_t kZoneIdEurope_Guernsey = 0x3db12c16; // Europe/Guernsey +const uint32_t kZoneIdEurope_Isle_of_Man = 0xeaf84580; // Europe/Isle_of_Man +const uint32_t kZoneIdEurope_Jersey = 0x570dae76; // Europe/Jersey +const uint32_t kZoneIdEurope_Ljubljana = 0xbd98cdb7; // Europe/Ljubljana +const uint32_t kZoneIdEurope_Mariehamn = 0x0caa6496; // Europe/Mariehamn +const uint32_t kZoneIdEurope_Nicosia = 0x74efab8a; // Europe/Nicosia +const uint32_t kZoneIdEurope_Podgorica = 0x1c1a499c; // Europe/Podgorica +const uint32_t kZoneIdEurope_San_Marino = 0xcef7724b; // Europe/San_Marino +const uint32_t kZoneIdEurope_Sarajevo = 0x6a576c3f; // Europe/Sarajevo +const uint32_t kZoneIdEurope_Skopje = 0x6c76fdd0; // Europe/Skopje +const uint32_t kZoneIdEurope_Tiraspol = 0xbe704472; // Europe/Tiraspol +const uint32_t kZoneIdEurope_Vaduz = 0xfbb81bae; // Europe/Vaduz +const uint32_t kZoneIdEurope_Vatican = 0xcb485dca; // Europe/Vatican +const uint32_t kZoneIdEurope_Zagreb = 0x7c11c9ff; // Europe/Zagreb +const uint32_t kZoneIdGB = 0x005973ae; // GB +const uint32_t kZoneIdGB_Eire = 0xfa70e300; // GB-Eire +const uint32_t kZoneIdGMT = 0x0b87eb2d; // GMT +const uint32_t kZoneIdGMT_PLUS_0 = 0x0d2f7028; // GMT+0 +const uint32_t kZoneIdGMT_0 = 0x0d2f706a; // GMT-0 +const uint32_t kZoneIdGMT0 = 0x7c8550fd; // GMT0 +const uint32_t kZoneIdGreenwich = 0xc84d4221; // Greenwich +const uint32_t kZoneIdHongkong = 0x56d36560; // Hongkong +const uint32_t kZoneIdIceland = 0xe56a35b5; // Iceland +const uint32_t kZoneIdIndian_Antananarivo = 0x9ebf5289; // Indian/Antananarivo +const uint32_t kZoneIdIndian_Comoro = 0x45f4deb6; // Indian/Comoro +const uint32_t kZoneIdIndian_Mayotte = 0xe6880bca; // Indian/Mayotte +const uint32_t kZoneIdIran = 0x7c87090f; // Iran +const uint32_t kZoneIdIsrael = 0xba88c9e5; // Israel +const uint32_t kZoneIdJamaica = 0x2e44fdab; // Jamaica +const uint32_t kZoneIdJapan = 0x0d712f8f; // Japan +const uint32_t kZoneIdKwajalein = 0x0e57afbb; // Kwajalein +const uint32_t kZoneIdMexico_BajaSur = 0x08ee3641; // Mexico/BajaSur +const uint32_t kZoneIdNZ = 0x005974ad; // NZ +const uint32_t kZoneIdNZ_CHAT = 0x4d42afda; // NZ-CHAT +const uint32_t kZoneIdNavajo = 0xc4ef0e24; // Navajo +const uint32_t kZoneIdPRC = 0x0b88120a; // PRC +const uint32_t kZoneIdPacific_Johnston = 0xb15d7b36; // Pacific/Johnston +const uint32_t kZoneIdPacific_Midway = 0xe286d38e; // Pacific/Midway +const uint32_t kZoneIdPacific_Ponape = 0xe9f80086; // Pacific/Ponape +const uint32_t kZoneIdPacific_Samoa = 0x8b2699b4; // Pacific/Samoa +const uint32_t kZoneIdPacific_Truk = 0x234010a9; // Pacific/Truk +const uint32_t kZoneIdPacific_Yap = 0xbb40138d; // Pacific/Yap +const uint32_t kZoneIdPoland = 0xca913b23; // Poland +const uint32_t kZoneIdPortugal = 0xc3274593; // Portugal +const uint32_t kZoneIdROC = 0x0b881a29; // ROC +const uint32_t kZoneIdROK = 0x0b881a31; // ROK +const uint32_t kZoneIdSingapore = 0xa8598c8d; // Singapore +const uint32_t kZoneIdUCT = 0x0b882571; // UCT +const uint32_t kZoneIdUS_Alaska = 0xfa300bc9; // US/Alaska +const uint32_t kZoneIdUS_Aleutian = 0x4fe013ef; // US/Aleutian +const uint32_t kZoneIdUS_Arizona = 0x4ec52670; // US/Arizona +const uint32_t kZoneIdUS_Central = 0xcabdcb25; // US/Central +const uint32_t kZoneIdUS_East_Indiana = 0x6dcf558a; // US/East-Indiana +const uint32_t kZoneIdUS_Eastern = 0x5bb7e78e; // US/Eastern +const uint32_t kZoneIdUS_Hawaii = 0x09c8de2f; // US/Hawaii +const uint32_t kZoneIdUS_Michigan = 0x766bb7bc; // US/Michigan +const uint32_t kZoneIdUS_Mountain = 0x6eb88247; // US/Mountain +const uint32_t kZoneIdUS_Pacific = 0xa950f6ab; // US/Pacific +const uint32_t kZoneIdUS_Samoa = 0x566821cd; // US/Samoa +const uint32_t kZoneIdUTC = 0x0b882791; // UTC +const uint32_t kZoneIdUniversal = 0xd0ff523e; // Universal +const uint32_t kZoneIdZulu = 0x7c9069b5; // Zulu //--------------------------------------------------------------------------- diff --git a/src/ace_time/zonedb/zone_registry.cpp b/src/ace_time/zonedb/zone_registry.cpp index d7719ae4b..021549301 100644 --- a/src/ace_time/zonedb/zone_registry.cpp +++ b/src/ace_time/zonedb/zone_registry.cpp @@ -37,272 +37,728 @@ namespace zonedb { // Zone registry. Sorted by zoneId. //--------------------------------------------------------------------------- const basic::ZoneInfo* const kZoneRegistry[266] ACE_TIME_PROGMEM = { - &kZoneAsia_Kuala_Lumpur, // Asia/Kuala_Lumpur - 0x014763c4 - &kZoneIndian_Cocos, // Indian/Cocos - 0x021e86de - &kZoneAsia_Jakarta, // Asia/Jakarta - 0x0506ab50 - &kZoneAmerica_Mazatlan, // America/Mazatlan - 0x0532189e - &kZoneAmerica_Hermosillo, // America/Hermosillo - 0x065d21c4 - &kZoneCET, // CET - 0x0b87d921 - &kZoneEET, // EET - 0x0b87e1a3 - &kZoneEST, // EST - 0x0b87e371 - &kZoneHST, // HST - 0x0b87f034 - &kZoneMET, // MET - 0x0b8803ab - &kZoneMST, // MST - 0x0b880579 - &kZoneWET, // WET - 0x0b882e35 - &kZoneAmerica_Guatemala, // America/Guatemala - 0x0c8259f7 - &kZoneAfrica_Monrovia, // Africa/Monrovia - 0x0ce90385 - &kZoneAntarctica_Rothera, // Antarctica/Rothera - 0x0e86d203 - &kZoneAmerica_Yellowknife, // America/Yellowknife - 0x0f76c76f - &kZoneAustralia_Melbourne, // Australia/Melbourne - 0x0fe559a3 - &kZoneAmerica_Sao_Paulo, // America/Sao_Paulo - 0x1063bfc9 - &kZoneEurope_Amsterdam, // Europe/Amsterdam - 0x109395c2 - &kZoneAmerica_Indiana_Vevay, // America/Indiana/Vevay - 0x10aca054 - &kZoneAmerica_Scoresbysund, // America/Scoresbysund - 0x123f8d2a - &kZoneAsia_Samarkand, // Asia/Samarkand - 0x13ae5104 - &kZoneAsia_Amman, // Asia/Amman - 0x148d21bc - &kZoneAsia_Dhaka, // Asia/Dhaka - 0x14c07b8b - &kZoneAsia_Dubai, // Asia/Dubai - 0x14c79f77 - &kZoneAsia_Kabul, // Asia/Kabul - 0x153b5601 - &kZoneAsia_Macau, // Asia/Macau - 0x155f88b9 - &kZoneAsia_Qatar, // Asia/Qatar - 0x15a8330b - &kZoneAsia_Seoul, // Asia/Seoul - 0x15ce82da - &kZoneAsia_Tokyo, // Asia/Tokyo - 0x15e606a8 - &kZoneAsia_Thimphu, // Asia/Thimphu - 0x170380d1 - &kZoneAmerica_Guayaquil, // America/Guayaquil - 0x17e64958 - &kZoneAmerica_Kentucky_Louisville, // America/Kentucky/Louisville - 0x1a21024b - &kZoneAsia_Pontianak, // Asia/Pontianak - 0x1a76c057 - &kZoneAtlantic_Reykjavik, // Atlantic/Reykjavik - 0x1c2b4f74 - &kZoneAmerica_New_York, // America/New_York - 0x1e2a7654 - &kZoneEurope_Luxembourg, // Europe/Luxembourg - 0x1f8bc6ce - &kZoneAsia_Baku, // Asia/Baku - 0x1fa788b5 - &kZoneAsia_Hovd, // Asia/Hovd - 0x1fab0fe3 - &kZoneAsia_Ho_Chi_Minh, // Asia/Ho_Chi_Minh - 0x20f2d127 - &kZoneAsia_Damascus, // Asia/Damascus - 0x20fbb063 - &kZonePacific_Fiji, // Pacific/Fiji - 0x23383ba5 - &kZonePacific_Niue, // Pacific/Niue - 0x233ca014 - &kZonePacific_Wake, // Pacific/Wake - 0x23416c2b - &kZoneAustralia_Adelaide, // Australia/Adelaide - 0x2428e8a3 - &kZonePacific_Auckland, // Pacific/Auckland - 0x25062f86 - &kZonePacific_Tongatapu, // Pacific/Tongatapu - 0x262ca836 - &kZoneAmerica_Monterrey, // America/Monterrey - 0x269a1deb - &kZoneAustralia_Darwin, // Australia/Darwin - 0x2876bdff - &kZonePacific_Pohnpei, // Pacific/Pohnpei - 0x28929f96 - &kZoneAmerica_Indiana_Indianapolis, // America/Indiana/Indianapolis - 0x28a669a4 - &kZoneAmerica_Vancouver, // America/Vancouver - 0x2c6f6b1f - &kZonePacific_Chatham, // Pacific/Chatham - 0x2f0de999 - &kZoneAmerica_Indiana_Marengo, // America/Indiana/Marengo - 0x2feeee72 - &kZoneAsia_Ulaanbaatar, // Asia/Ulaanbaatar - 0x30f0cc4e - &kZoneAustralia_Hobart, // Australia/Hobart - 0x32bf951a - &kZoneAsia_Dushanbe, // Asia/Dushanbe - 0x32fc5c3c - &kZoneAtlantic_South_Georgia, // Atlantic/South_Georgia - 0x33013174 - &kZoneAmerica_Phoenix, // America/Phoenix - 0x34b5af01 - &kZoneAmerica_Cayenne, // America/Cayenne - 0x3c617269 - &kZoneAtlantic_Bermuda, // Atlantic/Bermuda - 0x3d4bb1c4 - &kZoneAmerica_Managua, // America/Managua - 0x3d5e7600 - &kZoneEtc_GMT_PLUS_10, // Etc/GMT+10 - 0x3f8f1cc4 - &kZoneEtc_GMT_PLUS_11, // Etc/GMT+11 - 0x3f8f1cc5 - &kZoneEtc_GMT_PLUS_12, // Etc/GMT+12 - 0x3f8f1cc6 - &kZoneEtc_GMT_10, // Etc/GMT-10 - 0x3f8f2546 - &kZoneEtc_GMT_11, // Etc/GMT-11 - 0x3f8f2547 - &kZoneEtc_GMT_12, // Etc/GMT-12 - 0x3f8f2548 - &kZoneEtc_GMT_13, // Etc/GMT-13 - 0x3f8f2549 - &kZoneEtc_GMT_14, // Etc/GMT-14 - 0x3f8f254a - &kZoneEurope_Athens, // Europe/Athens - 0x4318fa27 - &kZoneIndian_Kerguelen, // Indian/Kerguelen - 0x4351b389 - &kZoneEurope_Berlin, // Europe/Berlin - 0x44644c20 - &kZoneIndian_Chagos, // Indian/Chagos - 0x456f7c3c - &kZoneIndian_Mahe, // Indian/Mahe - 0x45e725e2 - &kZoneEurope_Dublin, // Europe/Dublin - 0x4a275f62 - &kZoneAsia_Nicosia, // Asia/Nicosia - 0x4b0fcf78 - &kZoneAmerica_Chicago, // America/Chicago - 0x4b92b5d4 - &kZoneAustralia_Sydney, // Australia/Sydney - 0x4d1e9776 - &kZoneAntarctica_Vostok, // Antarctica/Vostok - 0x4f966fd4 - &kZoneAustralia_Brisbane, // Australia/Brisbane - 0x4fedc9c0 - &kZoneAmerica_Asuncion, // America/Asuncion - 0x50ec79a6 - &kZoneAsia_Karachi, // Asia/Karachi - 0x527f5245 - &kZonePacific_Gambier, // Pacific/Gambier - 0x53720c3a - &kZoneAmerica_Martinique, // America/Martinique - 0x551e84c5 - &kZoneAmerica_Jamaica, // America/Jamaica - 0x565dad6c - &kZoneAsia_Hong_Kong, // Asia/Hong_Kong - 0x577f28ac - &kZonePacific_Marquesas, // Pacific/Marquesas - 0x57ca7135 - &kZoneAmerica_Miquelon, // America/Miquelon - 0x59674330 - &kZoneAntarctica_DumontDUrville, // Antarctica/DumontDUrville - 0x5a3c656c - &kZoneAmerica_Anchorage, // America/Anchorage - 0x5a79260e - &kZoneAsia_Jerusalem, // Asia/Jerusalem - 0x5becd23a - &kZoneEurope_Stockholm, // Europe/Stockholm - 0x5bf6fbb8 - &kZoneEurope_Lisbon, // Europe/Lisbon - 0x5c00a70b - &kZoneAtlantic_Cape_Verde, // Atlantic/Cape_Verde - 0x5c5e1772 - &kZoneEurope_London, // Europe/London - 0x5c6a84ae - &kZoneEurope_Madrid, // Europe/Madrid - 0x5dbd1535 - &kZoneAmerica_Moncton, // America/Moncton - 0x5e07fe24 - &kZoneEurope_Monaco, // Europe/Monaco - 0x5ebf9f01 - &kZonePacific_Pago_Pago, // Pacific/Pago_Pago - 0x603aebd0 - &kZonePacific_Enderbury, // Pacific/Enderbury - 0x61599a93 - &kZoneAmerica_Creston, // America/Creston - 0x62a70204 - &kZoneAmerica_Costa_Rica, // America/Costa_Rica - 0x63ff66be - &kZoneEurope_Prague, // Europe/Prague - 0x65ee5d48 - &kZoneAmerica_Puerto_Rico, // America/Puerto_Rico - 0x6752ca31 - &kZoneIndian_Christmas, // Indian/Christmas - 0x68c207d5 - &kZoneAmerica_Curacao, // America/Curacao - 0x6a879184 - &kZoneAsia_Makassar, // Asia/Makassar - 0x6aa21c85 - &kZoneEurope_Helsinki, // Europe/Helsinki - 0x6ab2975b - &kZoneAmerica_Porto_Velho, // America/Porto_Velho - 0x6b1aac77 - &kZoneAmerica_Edmonton, // America/Edmonton - 0x6cb9484a - &kZoneAmerica_Dawson_Creek, // America/Dawson_Creek - 0x6cf24e5b - &kZoneAmerica_Blanc_Sablon, // America/Blanc-Sablon - 0x6e299892 - &kZoneEurope_Tirane, // Europe/Tirane - 0x6ea95b47 - &kZoneIndian_Reunion, // Indian/Reunion - 0x7076c047 - &kZoneAsia_Kolkata, // Asia/Kolkata - 0x72c06cd9 - &kZoneEurope_Vienna, // Europe/Vienna - 0x734cc2e5 - &kZoneAmerica_Santiago, // America/Santiago - 0x7410c9bc - &kZoneEurope_Warsaw, // Europe/Warsaw - 0x75185c19 - &kZoneAmerica_El_Salvador, // America/El_Salvador - 0x752ad652 - &kZoneAfrica_Bissau, // Africa/Bissau - 0x75564141 - &kZoneAfrica_Ceuta, // Africa/Ceuta - 0x77fb46ec - &kZoneAfrica_Lagos, // Africa/Lagos - 0x789bb5d0 - &kZoneAmerica_Toronto, // America/Toronto - 0x792e851b - &kZoneAfrica_Tunis, // Africa/Tunis - 0x79378e6d - &kZoneIndian_Mauritius, // Indian/Mauritius - 0x7b09c02a - &kZoneEurope_Zurich, // Europe/Zurich - 0x7d8195b9 - &kZoneAsia_Kuching, // Asia/Kuching - 0x801b003b - &kZoneAtlantic_Madeira, // Atlantic/Madeira - 0x81b5c037 - &kZoneAmerica_Atikokan, // America/Atikokan - 0x81b92098 - &kZonePacific_Kiritimati, // Pacific/Kiritimati - 0x8305073a - &kZoneAmerica_Chihuahua, // America/Chihuahua - 0x8827d776 - &kZonePacific_Pitcairn, // Pacific/Pitcairn - 0x8837d8bd - &kZonePacific_Chuuk, // Pacific/Chuuk - 0x8a090b23 - &kZonePacific_Efate, // Pacific/Efate - 0x8a2bce28 - &kZonePacific_Nauru, // Pacific/Nauru - 0x8acc41ae - &kZoneEST5EDT, // EST5EDT - 0x8adc72a3 - &kZonePacific_Palau, // Pacific/Palau - 0x8af04a36 - &kZoneAmerica_Winnipeg, // America/Winnipeg - 0x8c7dafc7 - &kZoneAustralia_Eucla, // Australia/Eucla - 0x8cf99e44 - &kZoneAustralia_Perth, // Australia/Perth - 0x8db8269d - &kZonePacific_Kwajalein, // Pacific/Kwajalein - 0x8e216759 - &kZoneAmerica_Port_au_Prince, // America/Port-au-Prince - 0x8e4a7bdc - &kZoneAfrica_Maputo, // Africa/Maputo - 0x8e6ca1f0 - &kZoneAsia_Yerevan, // Asia/Yerevan - 0x9185c8cc - &kZoneAmerica_Detroit, // America/Detroit - 0x925cfbc1 - &kZoneAmerica_Bogota, // America/Bogota - 0x93d7bc62 - &kZoneAmerica_Glace_Bay, // America/Glace_Bay - 0x9681f8dd - &kZoneAmerica_Denver, // America/Denver - 0x97d10b2a - &kZoneAmerica_Belem, // America/Belem - 0x97da580b - &kZoneAmerica_Boise, // America/Boise - 0x97dfc8d8 - &kZoneEurope_Andorra, // Europe/Andorra - 0x97f6764b - &kZoneAmerica_Adak, // America/Adak - 0x97fe49d7 - &kZoneAmerica_Lima, // America/Lima - 0x980468c9 - &kZoneAmerica_Nome, // America/Nome - 0x98059b15 - &kZoneAmerica_Nuuk, // America/Nuuk - 0x9805b5a9 - &kZoneIndian_Maldives, // Indian/Maldives - 0x9869681c - &kZoneAmerica_Sitka, // America/Sitka - 0x99104ce2 - &kZoneAmerica_Thule, // America/Thule - 0x9921dd68 - &kZonePacific_Rarotonga, // Pacific/Rarotonga - 0x9981a3b0 - &kZoneAsia_Kathmandu, // Asia/Kathmandu - 0x9a96ce6f - &kZoneAmerica_Rainy_River, // America/Rainy_River - 0x9cd58a10 - &kZoneEurope_Budapest, // Europe/Budapest - 0x9ce0197c - &kZoneAsia_Baghdad, // Asia/Baghdad - 0x9ceffbed - &kZoneEtc_GMT_PLUS_1, // Etc/GMT+1 - 0x9d13da14 - &kZoneEtc_GMT_PLUS_2, // Etc/GMT+2 - 0x9d13da15 - &kZoneEtc_GMT_PLUS_3, // Etc/GMT+3 - 0x9d13da16 - &kZoneEtc_GMT_PLUS_4, // Etc/GMT+4 - 0x9d13da17 - &kZoneEtc_GMT_PLUS_5, // Etc/GMT+5 - 0x9d13da18 - &kZoneEtc_GMT_PLUS_6, // Etc/GMT+6 - 0x9d13da19 - &kZoneEtc_GMT_PLUS_7, // Etc/GMT+7 - 0x9d13da1a - &kZoneEtc_GMT_PLUS_8, // Etc/GMT+8 - 0x9d13da1b - &kZoneEtc_GMT_PLUS_9, // Etc/GMT+9 - 0x9d13da1c - &kZoneEtc_GMT_1, // Etc/GMT-1 - 0x9d13da56 - &kZoneEtc_GMT_2, // Etc/GMT-2 - 0x9d13da57 - &kZoneEtc_GMT_3, // Etc/GMT-3 - 0x9d13da58 - &kZoneEtc_GMT_4, // Etc/GMT-4 - 0x9d13da59 - &kZoneEtc_GMT_5, // Etc/GMT-5 - 0x9d13da5a - &kZoneEtc_GMT_6, // Etc/GMT-6 - 0x9d13da5b - &kZoneEtc_GMT_7, // Etc/GMT-7 - 0x9d13da5c - &kZoneEtc_GMT_8, // Etc/GMT-8 - 0x9d13da5d - &kZoneEtc_GMT_9, // Etc/GMT-9 - 0x9d13da5e - &kZoneAmerica_Nipigon, // America/Nipigon - 0x9d2a8b1a - &kZoneAsia_Bangkok, // Asia/Bangkok - 0x9d6e3aaf - &kZoneAmerica_North_Dakota_Center, // America/North_Dakota/Center - 0x9da42814 - &kZoneAfrica_Ndjamena, // Africa/Ndjamena - 0x9fe09898 - &kZoneAmerica_Guyana, // America/Guyana - 0x9ff7bd0b - &kZoneAmerica_Havana, // America/Havana - 0xa0e15675 - &kZoneEurope_Kiev, // Europe/Kiev - 0xa2c19eb3 - &kZoneEurope_Oslo, // Europe/Oslo - 0xa2c3fba1 - &kZoneEurope_Rome, // Europe/Rome - 0xa2c58fd7 - &kZoneAmerica_Inuvik, // America/Inuvik - 0xa42189fc - &kZoneAmerica_Juneau, // America/Juneau - 0xa6f13e2e - &kZoneAustralia_Lord_Howe, // Australia/Lord_Howe - 0xa748b67d - &kZonePacific_Port_Moresby, // Pacific/Port_Moresby - 0xa7ba7f68 - &kZoneAsia_Beirut, // Asia/Beirut - 0xa7f3d5fd - &kZoneAfrica_Nairobi, // Africa/Nairobi - 0xa87ab57e - &kZoneAsia_Brunei, // Asia/Brunei - 0xa8e595f7 - &kZonePacific_Galapagos, // Pacific/Galapagos - 0xa952f752 - &kZoneAmerica_La_Paz, // America/La_Paz - 0xaa29125d - &kZoneAmerica_Manaus, // America/Manaus - 0xac86bf8b - &kZoneAmerica_Merida, // America/Merida - 0xacd172d8 - &kZoneEurope_Chisinau, // Europe/Chisinau - 0xad58aa18 - &kZoneAmerica_Nassau, // America/Nassau - 0xaedef011 - &kZoneEurope_Uzhgorod, // Europe/Uzhgorod - 0xb066f5d6 - &kZoneAustralia_Broken_Hill, // Australia/Broken_Hill - 0xb06eada3 - &kZoneAmerica_Paramaribo, // America/Paramaribo - 0xb319e4c4 - &kZoneAmerica_Panama, // America/Panama - 0xb3863854 - &kZoneAmerica_Los_Angeles, // America/Los_Angeles - 0xb7f7e8f2 - &kZoneAmerica_Regina, // America/Regina - 0xb875371c - &kZoneAsia_Ashgabat, // Asia/Ashgabat - 0xba87598d - &kZoneAmerica_Halifax, // America/Halifax - 0xbc5b7183 - &kZoneAmerica_Tegucigalpa, // America/Tegucigalpa - 0xbfd6fd4c - &kZoneAsia_Manila, // Asia/Manila - 0xc156c944 - &kZoneAfrica_Abidjan, // Africa/Abidjan - 0xc21305a3 - &kZoneAsia_Jayapura, // Asia/Jayapura - 0xc6833c2f - &kZoneAmerica_Barbados, // America/Barbados - 0xcbbc3b04 - &kZoneAsia_Riyadh, // Asia/Riyadh - 0xcd973d93 - &kZonePacific_Easter, // Pacific/Easter - 0xcf54f7e7 - &kZoneAsia_Singapore, // Asia/Singapore - 0xcf8581fa - &kZoneAsia_Taipei, // Asia/Taipei - 0xd1a844ae - &kZoneAsia_Tehran, // Asia/Tehran - 0xd1f02254 - &kZoneAsia_Urumqi, // Asia/Urumqi - 0xd5379735 - &kZoneAfrica_Johannesburg, // Africa/Johannesburg - 0xd5d157a0 - &kZoneAmerica_Port_of_Spain, // America/Port_of_Spain - 0xd8b28d59 - &kZoneEtc_GMT, // Etc/GMT - 0xd8e2de58 - &kZoneEtc_UTC, // Etc/UTC - 0xd8e31abc - &kZoneAmerica_Yakutat, // America/Yakutat - 0xd8ee31e9 - &kZoneAfrica_Algiers, // Africa/Algiers - 0xd94515c1 - &kZonePST8PDT, // PST8PDT - 0xd99ee2dc - &kZonePacific_Funafuti, // Pacific/Funafuti - 0xdb402d65 - &kZoneAmerica_Matamoros, // America/Matamoros - 0xdd1b0259 - &kZoneAsia_Yangon, // Asia/Yangon - 0xdd54a8be - &kZonePacific_Kosrae, // Pacific/Kosrae - 0xde5139a8 - &kZoneEurope_Brussels, // Europe/Brussels - 0xdee07337 - &kZoneAmerica_Swift_Current, // America/Swift_Current - 0xdef98e55 - &kZoneAustralia_Lindeman, // Australia/Lindeman - 0xe05029e2 - &kZoneEurope_Belgrade, // Europe/Belgrade - 0xe0532b3a - &kZoneAmerica_Menominee, // America/Menominee - 0xe0e9c583 - &kZoneEurope_Copenhagen, // Europe/Copenhagen - 0xe0ed30bc - &kZoneAtlantic_Faroe, // Atlantic/Faroe - 0xe110a971 - &kZonePacific_Majuro, // Pacific/Majuro - 0xe1f95371 - &kZoneAntarctica_Syowa, // Antarctica/Syowa - 0xe330c7e1 - &kZonePacific_Noumea, // Pacific/Noumea - 0xe551b788 - &kZonePacific_Honolulu, // Pacific/Honolulu - 0xe6e70af9 - &kZoneEurope_Zaporozhye, // Europe/Zaporozhye - 0xeab9767f - &kZoneAmerica_Ojinaga, // America/Ojinaga - 0xebfde83f - &kZoneCST6CDT, // CST6CDT - 0xf0e87d00 - &kZonePacific_Tahiti, // Pacific/Tahiti - 0xf24c2446 - &kZonePacific_Tarawa, // Pacific/Tarawa - 0xf2517e63 - &kZoneMST7MDT, // MST7MDT - 0xf2af9375 - &kZoneAsia_Tashkent, // Asia/Tashkent - 0xf3924254 - &kZonePacific_Guadalcanal, // Pacific/Guadalcanal - 0xf4dd25f0 - &kZoneAmerica_Danmarkshavn, // America/Danmarkshavn - 0xf554d204 - &kZoneAsia_Shanghai, // Asia/Shanghai - 0xf895a7f5 - &kZoneEurope_Gibraltar, // Europe/Gibraltar - 0xf8e325fc - &kZoneAtlantic_Azores, // Atlantic/Azores - 0xf93ed918 - &kZonePacific_Wallis, // Pacific/Wallis - 0xf94ddb0f - &kZoneAmerica_Thunder_Bay, // America/Thunder_Bay - 0xf962e71b - &kZoneAmerica_Montevideo, // America/Montevideo - 0xfa214780 - &kZoneEurope_Malta, // Europe/Malta - 0xfb1560f3 - &kZoneEurope_Bucharest, // Europe/Bucharest - 0xfb349ec5 - &kZoneEurope_Paris, // Europe/Paris - 0xfb4bc2a3 - &kZoneEurope_Sofia, // Europe/Sofia - 0xfb898656 - &kZoneAtlantic_Canary, // Atlantic/Canary - 0xfc23f2c2 - &kZoneAmerica_Campo_Grande, // America/Campo_Grande - 0xfec3e7a6 + &kZoneAsia_Kuala_Lumpur, // 0x014763c4, Asia/Kuala_Lumpur + &kZoneIndian_Cocos, // 0x021e86de, Indian/Cocos + &kZoneAsia_Jakarta, // 0x0506ab50, Asia/Jakarta + &kZoneAmerica_Mazatlan, // 0x0532189e, America/Mazatlan + &kZoneAmerica_Hermosillo, // 0x065d21c4, America/Hermosillo + &kZoneCET, // 0x0b87d921, CET + &kZoneEET, // 0x0b87e1a3, EET + &kZoneEST, // 0x0b87e371, EST + &kZoneHST, // 0x0b87f034, HST + &kZoneMET, // 0x0b8803ab, MET + &kZoneMST, // 0x0b880579, MST + &kZoneWET, // 0x0b882e35, WET + &kZoneAmerica_Guatemala, // 0x0c8259f7, America/Guatemala + &kZoneAfrica_Monrovia, // 0x0ce90385, Africa/Monrovia + &kZoneAntarctica_Rothera, // 0x0e86d203, Antarctica/Rothera + &kZoneAmerica_Yellowknife, // 0x0f76c76f, America/Yellowknife + &kZoneAustralia_Melbourne, // 0x0fe559a3, Australia/Melbourne + &kZoneAmerica_Sao_Paulo, // 0x1063bfc9, America/Sao_Paulo + &kZoneEurope_Amsterdam, // 0x109395c2, Europe/Amsterdam + &kZoneAmerica_Indiana_Vevay, // 0x10aca054, America/Indiana/Vevay + &kZoneAmerica_Scoresbysund, // 0x123f8d2a, America/Scoresbysund + &kZoneAsia_Samarkand, // 0x13ae5104, Asia/Samarkand + &kZoneAsia_Amman, // 0x148d21bc, Asia/Amman + &kZoneAsia_Dhaka, // 0x14c07b8b, Asia/Dhaka + &kZoneAsia_Dubai, // 0x14c79f77, Asia/Dubai + &kZoneAsia_Kabul, // 0x153b5601, Asia/Kabul + &kZoneAsia_Macau, // 0x155f88b9, Asia/Macau + &kZoneAsia_Qatar, // 0x15a8330b, Asia/Qatar + &kZoneAsia_Seoul, // 0x15ce82da, Asia/Seoul + &kZoneAsia_Tokyo, // 0x15e606a8, Asia/Tokyo + &kZoneAsia_Thimphu, // 0x170380d1, Asia/Thimphu + &kZoneAmerica_Guayaquil, // 0x17e64958, America/Guayaquil + &kZoneAmerica_Kentucky_Louisville, // 0x1a21024b, America/Kentucky/Louisville + &kZoneAsia_Pontianak, // 0x1a76c057, Asia/Pontianak + &kZoneAtlantic_Reykjavik, // 0x1c2b4f74, Atlantic/Reykjavik + &kZoneAmerica_New_York, // 0x1e2a7654, America/New_York + &kZoneEurope_Luxembourg, // 0x1f8bc6ce, Europe/Luxembourg + &kZoneAsia_Baku, // 0x1fa788b5, Asia/Baku + &kZoneAsia_Hovd, // 0x1fab0fe3, Asia/Hovd + &kZoneAsia_Ho_Chi_Minh, // 0x20f2d127, Asia/Ho_Chi_Minh + &kZoneAsia_Damascus, // 0x20fbb063, Asia/Damascus + &kZonePacific_Fiji, // 0x23383ba5, Pacific/Fiji + &kZonePacific_Niue, // 0x233ca014, Pacific/Niue + &kZonePacific_Wake, // 0x23416c2b, Pacific/Wake + &kZoneAustralia_Adelaide, // 0x2428e8a3, Australia/Adelaide + &kZonePacific_Auckland, // 0x25062f86, Pacific/Auckland + &kZonePacific_Tongatapu, // 0x262ca836, Pacific/Tongatapu + &kZoneAmerica_Monterrey, // 0x269a1deb, America/Monterrey + &kZoneAustralia_Darwin, // 0x2876bdff, Australia/Darwin + &kZonePacific_Pohnpei, // 0x28929f96, Pacific/Pohnpei + &kZoneAmerica_Indiana_Indianapolis, // 0x28a669a4, America/Indiana/Indianapolis + &kZoneAmerica_Vancouver, // 0x2c6f6b1f, America/Vancouver + &kZonePacific_Chatham, // 0x2f0de999, Pacific/Chatham + &kZoneAmerica_Indiana_Marengo, // 0x2feeee72, America/Indiana/Marengo + &kZoneAsia_Ulaanbaatar, // 0x30f0cc4e, Asia/Ulaanbaatar + &kZoneAustralia_Hobart, // 0x32bf951a, Australia/Hobart + &kZoneAsia_Dushanbe, // 0x32fc5c3c, Asia/Dushanbe + &kZoneAtlantic_South_Georgia, // 0x33013174, Atlantic/South_Georgia + &kZoneAmerica_Phoenix, // 0x34b5af01, America/Phoenix + &kZoneAmerica_Cayenne, // 0x3c617269, America/Cayenne + &kZoneAtlantic_Bermuda, // 0x3d4bb1c4, Atlantic/Bermuda + &kZoneAmerica_Managua, // 0x3d5e7600, America/Managua + &kZoneEtc_GMT_PLUS_10, // 0x3f8f1cc4, Etc/GMT+10 + &kZoneEtc_GMT_PLUS_11, // 0x3f8f1cc5, Etc/GMT+11 + &kZoneEtc_GMT_PLUS_12, // 0x3f8f1cc6, Etc/GMT+12 + &kZoneEtc_GMT_10, // 0x3f8f2546, Etc/GMT-10 + &kZoneEtc_GMT_11, // 0x3f8f2547, Etc/GMT-11 + &kZoneEtc_GMT_12, // 0x3f8f2548, Etc/GMT-12 + &kZoneEtc_GMT_13, // 0x3f8f2549, Etc/GMT-13 + &kZoneEtc_GMT_14, // 0x3f8f254a, Etc/GMT-14 + &kZoneEurope_Athens, // 0x4318fa27, Europe/Athens + &kZoneIndian_Kerguelen, // 0x4351b389, Indian/Kerguelen + &kZoneEurope_Berlin, // 0x44644c20, Europe/Berlin + &kZoneIndian_Chagos, // 0x456f7c3c, Indian/Chagos + &kZoneIndian_Mahe, // 0x45e725e2, Indian/Mahe + &kZoneEurope_Dublin, // 0x4a275f62, Europe/Dublin + &kZoneAsia_Nicosia, // 0x4b0fcf78, Asia/Nicosia + &kZoneAmerica_Chicago, // 0x4b92b5d4, America/Chicago + &kZoneAustralia_Sydney, // 0x4d1e9776, Australia/Sydney + &kZoneAntarctica_Vostok, // 0x4f966fd4, Antarctica/Vostok + &kZoneAustralia_Brisbane, // 0x4fedc9c0, Australia/Brisbane + &kZoneAmerica_Asuncion, // 0x50ec79a6, America/Asuncion + &kZoneAsia_Karachi, // 0x527f5245, Asia/Karachi + &kZonePacific_Gambier, // 0x53720c3a, Pacific/Gambier + &kZoneAmerica_Martinique, // 0x551e84c5, America/Martinique + &kZoneAmerica_Jamaica, // 0x565dad6c, America/Jamaica + &kZoneAsia_Hong_Kong, // 0x577f28ac, Asia/Hong_Kong + &kZonePacific_Marquesas, // 0x57ca7135, Pacific/Marquesas + &kZoneAmerica_Miquelon, // 0x59674330, America/Miquelon + &kZoneAntarctica_DumontDUrville, // 0x5a3c656c, Antarctica/DumontDUrville + &kZoneAmerica_Anchorage, // 0x5a79260e, America/Anchorage + &kZoneAsia_Jerusalem, // 0x5becd23a, Asia/Jerusalem + &kZoneEurope_Stockholm, // 0x5bf6fbb8, Europe/Stockholm + &kZoneEurope_Lisbon, // 0x5c00a70b, Europe/Lisbon + &kZoneAtlantic_Cape_Verde, // 0x5c5e1772, Atlantic/Cape_Verde + &kZoneEurope_London, // 0x5c6a84ae, Europe/London + &kZoneEurope_Madrid, // 0x5dbd1535, Europe/Madrid + &kZoneAmerica_Moncton, // 0x5e07fe24, America/Moncton + &kZoneEurope_Monaco, // 0x5ebf9f01, Europe/Monaco + &kZonePacific_Pago_Pago, // 0x603aebd0, Pacific/Pago_Pago + &kZonePacific_Enderbury, // 0x61599a93, Pacific/Enderbury + &kZoneAmerica_Creston, // 0x62a70204, America/Creston + &kZoneAmerica_Costa_Rica, // 0x63ff66be, America/Costa_Rica + &kZoneEurope_Prague, // 0x65ee5d48, Europe/Prague + &kZoneAmerica_Puerto_Rico, // 0x6752ca31, America/Puerto_Rico + &kZoneIndian_Christmas, // 0x68c207d5, Indian/Christmas + &kZoneAmerica_Curacao, // 0x6a879184, America/Curacao + &kZoneAsia_Makassar, // 0x6aa21c85, Asia/Makassar + &kZoneEurope_Helsinki, // 0x6ab2975b, Europe/Helsinki + &kZoneAmerica_Porto_Velho, // 0x6b1aac77, America/Porto_Velho + &kZoneAmerica_Edmonton, // 0x6cb9484a, America/Edmonton + &kZoneAmerica_Dawson_Creek, // 0x6cf24e5b, America/Dawson_Creek + &kZoneAmerica_Blanc_Sablon, // 0x6e299892, America/Blanc-Sablon + &kZoneEurope_Tirane, // 0x6ea95b47, Europe/Tirane + &kZoneIndian_Reunion, // 0x7076c047, Indian/Reunion + &kZoneAsia_Kolkata, // 0x72c06cd9, Asia/Kolkata + &kZoneEurope_Vienna, // 0x734cc2e5, Europe/Vienna + &kZoneAmerica_Santiago, // 0x7410c9bc, America/Santiago + &kZoneEurope_Warsaw, // 0x75185c19, Europe/Warsaw + &kZoneAmerica_El_Salvador, // 0x752ad652, America/El_Salvador + &kZoneAfrica_Bissau, // 0x75564141, Africa/Bissau + &kZoneAfrica_Ceuta, // 0x77fb46ec, Africa/Ceuta + &kZoneAfrica_Lagos, // 0x789bb5d0, Africa/Lagos + &kZoneAmerica_Toronto, // 0x792e851b, America/Toronto + &kZoneAfrica_Tunis, // 0x79378e6d, Africa/Tunis + &kZoneIndian_Mauritius, // 0x7b09c02a, Indian/Mauritius + &kZoneEurope_Zurich, // 0x7d8195b9, Europe/Zurich + &kZoneAsia_Kuching, // 0x801b003b, Asia/Kuching + &kZoneAtlantic_Madeira, // 0x81b5c037, Atlantic/Madeira + &kZoneAmerica_Atikokan, // 0x81b92098, America/Atikokan + &kZonePacific_Kiritimati, // 0x8305073a, Pacific/Kiritimati + &kZoneAmerica_Chihuahua, // 0x8827d776, America/Chihuahua + &kZonePacific_Pitcairn, // 0x8837d8bd, Pacific/Pitcairn + &kZonePacific_Chuuk, // 0x8a090b23, Pacific/Chuuk + &kZonePacific_Efate, // 0x8a2bce28, Pacific/Efate + &kZonePacific_Nauru, // 0x8acc41ae, Pacific/Nauru + &kZoneEST5EDT, // 0x8adc72a3, EST5EDT + &kZonePacific_Palau, // 0x8af04a36, Pacific/Palau + &kZoneAmerica_Winnipeg, // 0x8c7dafc7, America/Winnipeg + &kZoneAustralia_Eucla, // 0x8cf99e44, Australia/Eucla + &kZoneAustralia_Perth, // 0x8db8269d, Australia/Perth + &kZonePacific_Kwajalein, // 0x8e216759, Pacific/Kwajalein + &kZoneAmerica_Port_au_Prince, // 0x8e4a7bdc, America/Port-au-Prince + &kZoneAfrica_Maputo, // 0x8e6ca1f0, Africa/Maputo + &kZoneAsia_Yerevan, // 0x9185c8cc, Asia/Yerevan + &kZoneAmerica_Detroit, // 0x925cfbc1, America/Detroit + &kZoneAmerica_Bogota, // 0x93d7bc62, America/Bogota + &kZoneAmerica_Glace_Bay, // 0x9681f8dd, America/Glace_Bay + &kZoneAmerica_Denver, // 0x97d10b2a, America/Denver + &kZoneAmerica_Belem, // 0x97da580b, America/Belem + &kZoneAmerica_Boise, // 0x97dfc8d8, America/Boise + &kZoneEurope_Andorra, // 0x97f6764b, Europe/Andorra + &kZoneAmerica_Adak, // 0x97fe49d7, America/Adak + &kZoneAmerica_Lima, // 0x980468c9, America/Lima + &kZoneAmerica_Nome, // 0x98059b15, America/Nome + &kZoneAmerica_Nuuk, // 0x9805b5a9, America/Nuuk + &kZoneIndian_Maldives, // 0x9869681c, Indian/Maldives + &kZoneAmerica_Sitka, // 0x99104ce2, America/Sitka + &kZoneAmerica_Thule, // 0x9921dd68, America/Thule + &kZonePacific_Rarotonga, // 0x9981a3b0, Pacific/Rarotonga + &kZoneAsia_Kathmandu, // 0x9a96ce6f, Asia/Kathmandu + &kZoneAmerica_Rainy_River, // 0x9cd58a10, America/Rainy_River + &kZoneEurope_Budapest, // 0x9ce0197c, Europe/Budapest + &kZoneAsia_Baghdad, // 0x9ceffbed, Asia/Baghdad + &kZoneEtc_GMT_PLUS_1, // 0x9d13da14, Etc/GMT+1 + &kZoneEtc_GMT_PLUS_2, // 0x9d13da15, Etc/GMT+2 + &kZoneEtc_GMT_PLUS_3, // 0x9d13da16, Etc/GMT+3 + &kZoneEtc_GMT_PLUS_4, // 0x9d13da17, Etc/GMT+4 + &kZoneEtc_GMT_PLUS_5, // 0x9d13da18, Etc/GMT+5 + &kZoneEtc_GMT_PLUS_6, // 0x9d13da19, Etc/GMT+6 + &kZoneEtc_GMT_PLUS_7, // 0x9d13da1a, Etc/GMT+7 + &kZoneEtc_GMT_PLUS_8, // 0x9d13da1b, Etc/GMT+8 + &kZoneEtc_GMT_PLUS_9, // 0x9d13da1c, Etc/GMT+9 + &kZoneEtc_GMT_1, // 0x9d13da56, Etc/GMT-1 + &kZoneEtc_GMT_2, // 0x9d13da57, Etc/GMT-2 + &kZoneEtc_GMT_3, // 0x9d13da58, Etc/GMT-3 + &kZoneEtc_GMT_4, // 0x9d13da59, Etc/GMT-4 + &kZoneEtc_GMT_5, // 0x9d13da5a, Etc/GMT-5 + &kZoneEtc_GMT_6, // 0x9d13da5b, Etc/GMT-6 + &kZoneEtc_GMT_7, // 0x9d13da5c, Etc/GMT-7 + &kZoneEtc_GMT_8, // 0x9d13da5d, Etc/GMT-8 + &kZoneEtc_GMT_9, // 0x9d13da5e, Etc/GMT-9 + &kZoneAmerica_Nipigon, // 0x9d2a8b1a, America/Nipigon + &kZoneAsia_Bangkok, // 0x9d6e3aaf, Asia/Bangkok + &kZoneAmerica_North_Dakota_Center, // 0x9da42814, America/North_Dakota/Center + &kZoneAfrica_Ndjamena, // 0x9fe09898, Africa/Ndjamena + &kZoneAmerica_Guyana, // 0x9ff7bd0b, America/Guyana + &kZoneAmerica_Havana, // 0xa0e15675, America/Havana + &kZoneEurope_Kiev, // 0xa2c19eb3, Europe/Kiev + &kZoneEurope_Oslo, // 0xa2c3fba1, Europe/Oslo + &kZoneEurope_Rome, // 0xa2c58fd7, Europe/Rome + &kZoneAmerica_Inuvik, // 0xa42189fc, America/Inuvik + &kZoneAmerica_Juneau, // 0xa6f13e2e, America/Juneau + &kZoneAustralia_Lord_Howe, // 0xa748b67d, Australia/Lord_Howe + &kZonePacific_Port_Moresby, // 0xa7ba7f68, Pacific/Port_Moresby + &kZoneAsia_Beirut, // 0xa7f3d5fd, Asia/Beirut + &kZoneAfrica_Nairobi, // 0xa87ab57e, Africa/Nairobi + &kZoneAsia_Brunei, // 0xa8e595f7, Asia/Brunei + &kZonePacific_Galapagos, // 0xa952f752, Pacific/Galapagos + &kZoneAmerica_La_Paz, // 0xaa29125d, America/La_Paz + &kZoneAmerica_Manaus, // 0xac86bf8b, America/Manaus + &kZoneAmerica_Merida, // 0xacd172d8, America/Merida + &kZoneEurope_Chisinau, // 0xad58aa18, Europe/Chisinau + &kZoneAmerica_Nassau, // 0xaedef011, America/Nassau + &kZoneEurope_Uzhgorod, // 0xb066f5d6, Europe/Uzhgorod + &kZoneAustralia_Broken_Hill, // 0xb06eada3, Australia/Broken_Hill + &kZoneAmerica_Paramaribo, // 0xb319e4c4, America/Paramaribo + &kZoneAmerica_Panama, // 0xb3863854, America/Panama + &kZoneAmerica_Los_Angeles, // 0xb7f7e8f2, America/Los_Angeles + &kZoneAmerica_Regina, // 0xb875371c, America/Regina + &kZoneAsia_Ashgabat, // 0xba87598d, Asia/Ashgabat + &kZoneAmerica_Halifax, // 0xbc5b7183, America/Halifax + &kZoneAmerica_Tegucigalpa, // 0xbfd6fd4c, America/Tegucigalpa + &kZoneAsia_Manila, // 0xc156c944, Asia/Manila + &kZoneAfrica_Abidjan, // 0xc21305a3, Africa/Abidjan + &kZoneAsia_Jayapura, // 0xc6833c2f, Asia/Jayapura + &kZoneAmerica_Barbados, // 0xcbbc3b04, America/Barbados + &kZoneAsia_Riyadh, // 0xcd973d93, Asia/Riyadh + &kZonePacific_Easter, // 0xcf54f7e7, Pacific/Easter + &kZoneAsia_Singapore, // 0xcf8581fa, Asia/Singapore + &kZoneAsia_Taipei, // 0xd1a844ae, Asia/Taipei + &kZoneAsia_Tehran, // 0xd1f02254, Asia/Tehran + &kZoneAsia_Urumqi, // 0xd5379735, Asia/Urumqi + &kZoneAfrica_Johannesburg, // 0xd5d157a0, Africa/Johannesburg + &kZoneAmerica_Port_of_Spain, // 0xd8b28d59, America/Port_of_Spain + &kZoneEtc_GMT, // 0xd8e2de58, Etc/GMT + &kZoneEtc_UTC, // 0xd8e31abc, Etc/UTC + &kZoneAmerica_Yakutat, // 0xd8ee31e9, America/Yakutat + &kZoneAfrica_Algiers, // 0xd94515c1, Africa/Algiers + &kZonePST8PDT, // 0xd99ee2dc, PST8PDT + &kZonePacific_Funafuti, // 0xdb402d65, Pacific/Funafuti + &kZoneAmerica_Matamoros, // 0xdd1b0259, America/Matamoros + &kZoneAsia_Yangon, // 0xdd54a8be, Asia/Yangon + &kZonePacific_Kosrae, // 0xde5139a8, Pacific/Kosrae + &kZoneEurope_Brussels, // 0xdee07337, Europe/Brussels + &kZoneAmerica_Swift_Current, // 0xdef98e55, America/Swift_Current + &kZoneAustralia_Lindeman, // 0xe05029e2, Australia/Lindeman + &kZoneEurope_Belgrade, // 0xe0532b3a, Europe/Belgrade + &kZoneAmerica_Menominee, // 0xe0e9c583, America/Menominee + &kZoneEurope_Copenhagen, // 0xe0ed30bc, Europe/Copenhagen + &kZoneAtlantic_Faroe, // 0xe110a971, Atlantic/Faroe + &kZonePacific_Majuro, // 0xe1f95371, Pacific/Majuro + &kZoneAntarctica_Syowa, // 0xe330c7e1, Antarctica/Syowa + &kZonePacific_Noumea, // 0xe551b788, Pacific/Noumea + &kZonePacific_Honolulu, // 0xe6e70af9, Pacific/Honolulu + &kZoneEurope_Zaporozhye, // 0xeab9767f, Europe/Zaporozhye + &kZoneAmerica_Ojinaga, // 0xebfde83f, America/Ojinaga + &kZoneCST6CDT, // 0xf0e87d00, CST6CDT + &kZonePacific_Tahiti, // 0xf24c2446, Pacific/Tahiti + &kZonePacific_Tarawa, // 0xf2517e63, Pacific/Tarawa + &kZoneMST7MDT, // 0xf2af9375, MST7MDT + &kZoneAsia_Tashkent, // 0xf3924254, Asia/Tashkent + &kZonePacific_Guadalcanal, // 0xf4dd25f0, Pacific/Guadalcanal + &kZoneAmerica_Danmarkshavn, // 0xf554d204, America/Danmarkshavn + &kZoneAsia_Shanghai, // 0xf895a7f5, Asia/Shanghai + &kZoneEurope_Gibraltar, // 0xf8e325fc, Europe/Gibraltar + &kZoneAtlantic_Azores, // 0xf93ed918, Atlantic/Azores + &kZonePacific_Wallis, // 0xf94ddb0f, Pacific/Wallis + &kZoneAmerica_Thunder_Bay, // 0xf962e71b, America/Thunder_Bay + &kZoneAmerica_Montevideo, // 0xfa214780, America/Montevideo + &kZoneEurope_Malta, // 0xfb1560f3, Europe/Malta + &kZoneEurope_Bucharest, // 0xfb349ec5, Europe/Bucharest + &kZoneEurope_Paris, // 0xfb4bc2a3, Europe/Paris + &kZoneEurope_Sofia, // 0xfb898656, Europe/Sofia + &kZoneAtlantic_Canary, // 0xfc23f2c2, Atlantic/Canary + &kZoneAmerica_Campo_Grande, // 0xfec3e7a6, America/Campo_Grande + +}; + +//--------------------------------------------------------------------------- +// Zone and Link registry. Sorted by zoneId. +//--------------------------------------------------------------------------- +const basic::ZoneInfo* const kZoneAndLinkRegistry[449] ACE_TIME_PROGMEM = { + &kZoneGB, // 0x005973ae, GB -> Europe/London + &kZoneNZ, // 0x005974ad, NZ -> Pacific/Auckland + &kZoneAsia_Kuala_Lumpur, // 0x014763c4, Asia/Kuala_Lumpur + &kZoneAfrica_Libreville, // 0x01d96de4, Africa/Libreville -> Africa/Lagos + &kZoneIndian_Cocos, // 0x021e86de, Indian/Cocos + &kZoneAustralia_Victoria, // 0x0260d5db, Australia/Victoria -> Australia/Melbourne + &kZoneAtlantic_Faeroe, // 0x031ec516, Atlantic/Faeroe -> Atlantic/Faroe + &kZoneAmerica_St_Kitts, // 0x04c0507b, America/St_Kitts -> America/Port_of_Spain + &kZoneAfrica_Ouagadougou, // 0x04d7219a, Africa/Ouagadougou -> Africa/Abidjan + &kZoneAmerica_St_Lucia, // 0x04d8b3ba, America/St_Lucia -> America/Port_of_Spain + &kZoneAsia_Jakarta, // 0x0506ab50, Asia/Jakarta + &kZoneAfrica_Bujumbura, // 0x05232a47, Africa/Bujumbura -> Africa/Maputo + &kZoneAmerica_Mazatlan, // 0x0532189e, America/Mazatlan + &kZoneAmerica_St_Barthelemy, // 0x054e6a79, America/St_Barthelemy -> America/Port_of_Spain + &kZoneAfrica_Addis_Ababa, // 0x05ae1e65, Africa/Addis_Ababa -> Africa/Nairobi + &kZoneAmerica_Hermosillo, // 0x065d21c4, America/Hermosillo + &kZoneMexico_BajaSur, // 0x08ee3641, Mexico/BajaSur -> America/Mazatlan + &kZoneUS_Hawaii, // 0x09c8de2f, US/Hawaii -> Pacific/Honolulu + &kZoneCET, // 0x0b87d921, CET + &kZoneEET, // 0x0b87e1a3, EET + &kZoneEST, // 0x0b87e371, EST + &kZoneGMT, // 0x0b87eb2d, GMT -> Etc/GMT + &kZoneHST, // 0x0b87f034, HST + &kZoneMET, // 0x0b8803ab, MET + &kZoneMST, // 0x0b880579, MST + &kZonePRC, // 0x0b88120a, PRC -> Asia/Shanghai + &kZoneROC, // 0x0b881a29, ROC -> Asia/Taipei + &kZoneROK, // 0x0b881a31, ROK -> Asia/Seoul + &kZoneUCT, // 0x0b882571, UCT -> Etc/UTC + &kZoneUTC, // 0x0b882791, UTC -> Etc/UTC + &kZoneWET, // 0x0b882e35, WET + &kZoneAmerica_Guatemala, // 0x0c8259f7, America/Guatemala + &kZoneEurope_Mariehamn, // 0x0caa6496, Europe/Mariehamn -> Europe/Helsinki + &kZoneAfrica_Monrovia, // 0x0ce90385, Africa/Monrovia + &kZoneGMT_PLUS_0, // 0x0d2f7028, GMT+0 -> Etc/GMT + &kZoneGMT_0, // 0x0d2f706a, GMT-0 -> Etc/GMT + &kZoneJapan, // 0x0d712f8f, Japan -> Asia/Tokyo + &kZoneKwajalein, // 0x0e57afbb, Kwajalein -> Pacific/Kwajalein + &kZoneAntarctica_Rothera, // 0x0e86d203, Antarctica/Rothera + &kZoneAmerica_Yellowknife, // 0x0f76c76f, America/Yellowknife + &kZoneAustralia_Melbourne, // 0x0fe559a3, Australia/Melbourne + &kZoneAmerica_Sao_Paulo, // 0x1063bfc9, America/Sao_Paulo + &kZoneEurope_Amsterdam, // 0x109395c2, Europe/Amsterdam + &kZoneAmerica_Indiana_Vevay, // 0x10aca054, America/Indiana/Vevay + &kZoneAmerica_Scoresbysund, // 0x123f8d2a, America/Scoresbysund + &kZoneAsia_Samarkand, // 0x13ae5104, Asia/Samarkand + &kZoneAsia_Amman, // 0x148d21bc, Asia/Amman + &kZoneAsia_Dacca, // 0x14bcac5e, Asia/Dacca -> Asia/Dhaka + &kZoneAsia_Dhaka, // 0x14c07b8b, Asia/Dhaka + &kZoneAsia_Dubai, // 0x14c79f77, Asia/Dubai + &kZoneAsia_Kabul, // 0x153b5601, Asia/Kabul + &kZoneAsia_Ashkhabad, // 0x15454f09, Asia/Ashkhabad -> Asia/Ashgabat + &kZoneAsia_Macao, // 0x155f88b3, Asia/Macao -> Asia/Macau + &kZoneAsia_Macau, // 0x155f88b9, Asia/Macau + &kZoneAsia_Qatar, // 0x15a8330b, Asia/Qatar + &kZoneAsia_Seoul, // 0x15ce82da, Asia/Seoul + &kZoneAsia_Tokyo, // 0x15e606a8, Asia/Tokyo + &kZoneAsia_Tel_Aviv, // 0x166d7c2c, Asia/Tel_Aviv -> Asia/Jerusalem + &kZoneAsia_Thimphu, // 0x170380d1, Asia/Thimphu + &kZoneAmerica_Guayaquil, // 0x17e64958, America/Guayaquil + &kZoneAmerica_Montserrat, // 0x199b0a35, America/Montserrat -> America/Port_of_Spain + &kZoneAmerica_Kentucky_Louisville, // 0x1a21024b, America/Kentucky/Louisville + &kZoneAsia_Pontianak, // 0x1a76c057, Asia/Pontianak + &kZoneEurope_Podgorica, // 0x1c1a499c, Europe/Podgorica -> Europe/Belgrade + &kZoneAtlantic_Reykjavik, // 0x1c2b4f74, Atlantic/Reykjavik + &kZoneAmerica_New_York, // 0x1e2a7654, America/New_York + &kZoneEurope_Luxembourg, // 0x1f8bc6ce, Europe/Luxembourg + &kZoneAsia_Aden, // 0x1fa7084a, Asia/Aden -> Asia/Riyadh + &kZoneAsia_Baku, // 0x1fa788b5, Asia/Baku + &kZoneAsia_Hovd, // 0x1fab0fe3, Asia/Hovd + &kZoneAmerica_Montreal, // 0x203a1ea8, America/Montreal -> America/Toronto + &kZoneAsia_Ho_Chi_Minh, // 0x20f2d127, Asia/Ho_Chi_Minh + &kZoneAsia_Damascus, // 0x20fbb063, Asia/Damascus + &kZonePacific_Fiji, // 0x23383ba5, Pacific/Fiji + &kZonePacific_Niue, // 0x233ca014, Pacific/Niue + &kZonePacific_Truk, // 0x234010a9, Pacific/Truk -> Pacific/Chuuk + &kZonePacific_Wake, // 0x23416c2b, Pacific/Wake + &kZoneAustralia_Adelaide, // 0x2428e8a3, Australia/Adelaide + &kZonePacific_Auckland, // 0x25062f86, Pacific/Auckland + &kZonePacific_Tongatapu, // 0x262ca836, Pacific/Tongatapu + &kZoneAmerica_Monterrey, // 0x269a1deb, America/Monterrey + &kZoneEtc_Greenwich, // 0x26daa98c, Etc/Greenwich -> Etc/GMT + &kZoneAustralia_Currie, // 0x278b6a24, Australia/Currie -> Australia/Hobart + &kZoneAustralia_Darwin, // 0x2876bdff, Australia/Darwin + &kZonePacific_Pohnpei, // 0x28929f96, Pacific/Pohnpei + &kZoneAmerica_Indiana_Indianapolis, // 0x28a669a4, America/Indiana/Indianapolis + &kZoneAustralia_Canberra, // 0x2a09ae58, Australia/Canberra -> Australia/Sydney + &kZoneAmerica_Vancouver, // 0x2c6f6b1f, America/Vancouver + &kZoneJamaica, // 0x2e44fdab, Jamaica -> America/Jamaica + &kZonePacific_Chatham, // 0x2f0de999, Pacific/Chatham + &kZoneEtc_Universal, // 0x2f8cb9a9, Etc/Universal -> Etc/UTC + &kZoneAmerica_Indiana_Marengo, // 0x2feeee72, America/Indiana/Marengo + &kZoneAfrica_Djibouti, // 0x30ea01d4, Africa/Djibouti -> Africa/Nairobi + &kZoneAsia_Ulaanbaatar, // 0x30f0cc4e, Asia/Ulaanbaatar + &kZoneAfrica_Gaborone, // 0x317c0aa7, Africa/Gaborone -> Africa/Maputo + &kZoneAsia_Calcutta, // 0x328a44c3, Asia/Calcutta -> Asia/Kolkata + &kZoneAustralia_Hobart, // 0x32bf951a, Australia/Hobart + &kZoneAsia_Dushanbe, // 0x32fc5c3c, Asia/Dushanbe + &kZoneAtlantic_South_Georgia, // 0x33013174, Atlantic/South_Georgia + &kZoneAmerica_Phoenix, // 0x34b5af01, America/Phoenix + &kZoneAsia_Ulan_Bator, // 0x394db4d9, Asia/Ulan_Bator -> Asia/Ulaanbaatar + &kZoneAfrica_Brazzaville, // 0x39cda760, Africa/Brazzaville -> Africa/Lagos + &kZoneAmerica_Cayenne, // 0x3c617269, America/Cayenne + &kZoneAfrica_Porto_Novo, // 0x3d1bf95d, Africa/Porto-Novo -> Africa/Lagos + &kZoneAtlantic_Bermuda, // 0x3d4bb1c4, Atlantic/Bermuda + &kZoneAmerica_Managua, // 0x3d5e7600, America/Managua + &kZoneAmerica_Marigot, // 0x3dab3a59, America/Marigot -> America/Port_of_Spain + &kZoneEurope_Guernsey, // 0x3db12c16, Europe/Guernsey -> Europe/London + &kZoneAfrica_Nouakchott, // 0x3dc49dba, Africa/Nouakchott -> Africa/Abidjan + &kZoneAmerica_Louisville, // 0x3dcb47ee, America/Louisville -> America/Kentucky/Louisville + &kZoneEtc_GMT_PLUS_10, // 0x3f8f1cc4, Etc/GMT+10 + &kZoneEtc_GMT_PLUS_11, // 0x3f8f1cc5, Etc/GMT+11 + &kZoneEtc_GMT_PLUS_12, // 0x3f8f1cc6, Etc/GMT+12 + &kZoneEtc_GMT_10, // 0x3f8f2546, Etc/GMT-10 + &kZoneEtc_GMT_11, // 0x3f8f2547, Etc/GMT-11 + &kZoneEtc_GMT_12, // 0x3f8f2548, Etc/GMT-12 + &kZoneEtc_GMT_13, // 0x3f8f2549, Etc/GMT-13 + &kZoneEtc_GMT_14, // 0x3f8f254a, Etc/GMT-14 + &kZoneCanada_Pacific, // 0x40fa3c7b, Canada/Pacific -> America/Vancouver + &kZoneEurope_Athens, // 0x4318fa27, Europe/Athens + &kZoneIndian_Kerguelen, // 0x4351b389, Indian/Kerguelen + &kZoneEurope_Berlin, // 0x44644c20, Europe/Berlin + &kZoneAtlantic_St_Helena, // 0x451fc5f7, Atlantic/St_Helena -> Africa/Abidjan + &kZoneIndian_Chagos, // 0x456f7c3c, Indian/Chagos + &kZoneIndian_Mahe, // 0x45e725e2, Indian/Mahe + &kZoneIndian_Comoro, // 0x45f4deb6, Indian/Comoro -> Africa/Nairobi + &kZoneEurope_Dublin, // 0x4a275f62, Europe/Dublin + &kZoneAsia_Nicosia, // 0x4b0fcf78, Asia/Nicosia + &kZoneAmerica_Chicago, // 0x4b92b5d4, America/Chicago + &kZoneAustralia_Sydney, // 0x4d1e9776, Australia/Sydney + &kZoneNZ_CHAT, // 0x4d42afda, NZ-CHAT -> Pacific/Chatham + &kZoneUS_Arizona, // 0x4ec52670, US/Arizona -> America/Phoenix + &kZoneAntarctica_Vostok, // 0x4f966fd4, Antarctica/Vostok + &kZoneUS_Aleutian, // 0x4fe013ef, US/Aleutian -> America/Adak + &kZoneAustralia_Brisbane, // 0x4fedc9c0, Australia/Brisbane + &kZoneAmerica_Asuncion, // 0x50ec79a6, America/Asuncion + &kZoneAsia_Karachi, // 0x527f5245, Asia/Karachi + &kZoneAsia_Kashgar, // 0x52955193, Asia/Kashgar -> Asia/Urumqi + &kZoneCanada_Atlantic, // 0x536b119c, Canada/Atlantic -> America/Halifax + &kZonePacific_Gambier, // 0x53720c3a, Pacific/Gambier + &kZoneAmerica_Martinique, // 0x551e84c5, America/Martinique + &kZoneAmerica_Jamaica, // 0x565dad6c, America/Jamaica + &kZoneUS_Samoa, // 0x566821cd, US/Samoa -> Pacific/Pago_Pago + &kZoneHongkong, // 0x56d36560, Hongkong -> Asia/Hong_Kong + &kZoneEurope_Jersey, // 0x570dae76, Europe/Jersey -> Europe/London + &kZoneAsia_Hong_Kong, // 0x577f28ac, Asia/Hong_Kong + &kZonePacific_Marquesas, // 0x57ca7135, Pacific/Marquesas + &kZoneAmerica_Miquelon, // 0x59674330, America/Miquelon + &kZoneAntarctica_DumontDUrville, // 0x5a3c656c, Antarctica/DumontDUrville + &kZoneAtlantic_Jan_Mayen, // 0x5a7535b6, Atlantic/Jan_Mayen -> Europe/Oslo + &kZoneAmerica_Anchorage, // 0x5a79260e, America/Anchorage + &kZoneUS_Eastern, // 0x5bb7e78e, US/Eastern -> America/New_York + &kZoneAsia_Jerusalem, // 0x5becd23a, Asia/Jerusalem + &kZoneEurope_Stockholm, // 0x5bf6fbb8, Europe/Stockholm + &kZoneEurope_Lisbon, // 0x5c00a70b, Europe/Lisbon + &kZoneAtlantic_Cape_Verde, // 0x5c5e1772, Atlantic/Cape_Verde + &kZoneEurope_London, // 0x5c6a84ae, Europe/London + &kZoneAsia_Ujung_Pandang, // 0x5d001eb3, Asia/Ujung_Pandang -> Asia/Makassar + &kZoneAfrica_Mbabane, // 0x5d3bdd40, Africa/Mbabane -> Africa/Johannesburg + &kZoneEurope_Madrid, // 0x5dbd1535, Europe/Madrid + &kZoneAmerica_Moncton, // 0x5e07fe24, America/Moncton + &kZoneEurope_Monaco, // 0x5ebf9f01, Europe/Monaco + &kZonePacific_Pago_Pago, // 0x603aebd0, Pacific/Pago_Pago + &kZonePacific_Enderbury, // 0x61599a93, Pacific/Enderbury + &kZoneCanada_Central, // 0x626710f5, Canada/Central -> America/Winnipeg + &kZoneAmerica_Creston, // 0x62a70204, America/Creston + &kZoneAmerica_Costa_Rica, // 0x63ff66be, America/Costa_Rica + &kZoneEurope_Prague, // 0x65ee5d48, Europe/Prague + &kZoneBrazil_East, // 0x669578c5, Brazil/East -> America/Sao_Paulo + &kZoneAfrica_Kinshasa, // 0x6695d70c, Africa/Kinshasa -> Africa/Lagos + &kZoneBrazil_West, // 0x669f689b, Brazil/West -> America/Manaus + &kZoneAfrica_Mogadishu, // 0x66bc159b, Africa/Mogadishu -> Africa/Nairobi + &kZoneAmerica_Puerto_Rico, // 0x6752ca31, America/Puerto_Rico + &kZoneAfrica_Freetown, // 0x6823dd64, Africa/Freetown -> Africa/Abidjan + &kZoneIndian_Christmas, // 0x68c207d5, Indian/Christmas + &kZoneAmerica_Indianapolis, // 0x6a009ae1, America/Indianapolis -> America/Indiana/Indianapolis + &kZoneEurope_Sarajevo, // 0x6a576c3f, Europe/Sarajevo -> Europe/Belgrade + &kZoneAmerica_Curacao, // 0x6a879184, America/Curacao + &kZoneAsia_Makassar, // 0x6aa21c85, Asia/Makassar + &kZoneEurope_Helsinki, // 0x6ab2975b, Europe/Helsinki + &kZoneAmerica_Lower_Princes, // 0x6ae45b62, America/Lower_Princes -> America/Curacao + &kZoneAmerica_Porto_Velho, // 0x6b1aac77, America/Porto_Velho + &kZoneEurope_Skopje, // 0x6c76fdd0, Europe/Skopje -> Europe/Belgrade + &kZoneAmerica_Edmonton, // 0x6cb9484a, America/Edmonton + &kZoneAmerica_Dawson_Creek, // 0x6cf24e5b, America/Dawson_Creek + &kZoneAsia_Rangoon, // 0x6d1217c6, Asia/Rangoon -> Asia/Yangon + &kZoneUS_East_Indiana, // 0x6dcf558a, US/East-Indiana -> America/Indiana/Indianapolis + &kZoneAmerica_Blanc_Sablon, // 0x6e299892, America/Blanc-Sablon + &kZoneEurope_Tirane, // 0x6ea95b47, Europe/Tirane + &kZoneUS_Mountain, // 0x6eb88247, US/Mountain -> America/Denver + &kZoneAntarctica_McMurdo, // 0x6eeb5585, Antarctica/McMurdo -> Pacific/Auckland + &kZoneAfrica_Lubumbashi, // 0x6fd88566, Africa/Lubumbashi -> Africa/Maputo + &kZoneIndian_Reunion, // 0x7076c047, Indian/Reunion + &kZoneAsia_Kolkata, // 0x72c06cd9, Asia/Kolkata + &kZoneEurope_Vienna, // 0x734cc2e5, Europe/Vienna + &kZoneAfrica_Asmara, // 0x73b278ef, Africa/Asmara -> Africa/Nairobi + &kZoneAfrica_Asmera, // 0x73b289f3, Africa/Asmera -> Africa/Nairobi + &kZoneAmerica_Santiago, // 0x7410c9bc, America/Santiago + &kZoneAfrica_Bamako, // 0x74c1e7a5, Africa/Bamako -> Africa/Abidjan + &kZoneAfrica_Bangui, // 0x74c28ed0, Africa/Bangui -> Africa/Lagos + &kZoneAfrica_Banjul, // 0x74c29b96, Africa/Banjul -> Africa/Abidjan + &kZoneEurope_Nicosia, // 0x74efab8a, Europe/Nicosia -> Asia/Nicosia + &kZoneEurope_Warsaw, // 0x75185c19, Europe/Warsaw + &kZoneAmerica_El_Salvador, // 0x752ad652, America/El_Salvador + &kZoneAfrica_Bissau, // 0x75564141, Africa/Bissau + &kZoneUS_Michigan, // 0x766bb7bc, US/Michigan -> America/Detroit + &kZoneCanada_Saskatchewan, // 0x77311f49, Canada/Saskatchewan -> America/Regina + &kZoneAfrica_Ceuta, // 0x77fb46ec, Africa/Ceuta + &kZoneAfrica_Dakar, // 0x780b00fd, Africa/Dakar -> Africa/Abidjan + &kZoneAfrica_Lagos, // 0x789bb5d0, Africa/Lagos + &kZoneAmerica_Toronto, // 0x792e851b, America/Toronto + &kZoneAmerica_Tortola, // 0x7931462b, America/Tortola -> America/Port_of_Spain + &kZoneAfrica_Tunis, // 0x79378e6d, Africa/Tunis + &kZoneAfrica_Douala, // 0x7a6df310, Africa/Douala -> Africa/Lagos + &kZoneAfrica_Conakry, // 0x7ab36b31, Africa/Conakry -> Africa/Abidjan + &kZoneIndian_Mauritius, // 0x7b09c02a, Indian/Mauritius + &kZoneEurope_Zagreb, // 0x7c11c9ff, Europe/Zagreb -> Europe/Belgrade + &kZoneCuba, // 0x7c83cba0, Cuba -> America/Havana + &kZoneEire, // 0x7c84b36a, Eire -> Europe/Dublin + &kZoneGMT0, // 0x7c8550fd, GMT0 -> Etc/GMT + &kZoneIran, // 0x7c87090f, Iran -> Asia/Tehran + &kZoneZulu, // 0x7c9069b5, Zulu -> Etc/UTC + &kZoneEurope_Zurich, // 0x7d8195b9, Europe/Zurich + &kZoneChile_Continental, // 0x7e2bdb18, Chile/Continental -> America/Santiago + &kZoneAmerica_Fort_Wayne, // 0x7eaaaf24, America/Fort_Wayne -> America/Indiana/Indianapolis + &kZoneAsia_Kuching, // 0x801b003b, Asia/Kuching + &kZoneAtlantic_Madeira, // 0x81b5c037, Atlantic/Madeira + &kZoneAmerica_Atikokan, // 0x81b92098, America/Atikokan + &kZoneAfrica_Harare, // 0x82c39a2d, Africa/Harare -> Africa/Maputo + &kZoneAmerica_Shiprock, // 0x82fb7049, America/Shiprock -> America/Denver + &kZonePacific_Kiritimati, // 0x8305073a, Pacific/Kiritimati + &kZoneAmerica_St_Vincent, // 0x8460e523, America/St_Vincent -> America/Port_of_Spain + &kZoneAmerica_Chihuahua, // 0x8827d776, America/Chihuahua + &kZonePacific_Pitcairn, // 0x8837d8bd, Pacific/Pitcairn + &kZoneAsia_Vientiane, // 0x89d68d75, Asia/Vientiane -> Asia/Bangkok + &kZonePacific_Chuuk, // 0x8a090b23, Pacific/Chuuk + &kZonePacific_Efate, // 0x8a2bce28, Pacific/Efate + &kZoneAfrica_Kigali, // 0x8a4dcf2b, Africa/Kigali -> Africa/Maputo + &kZoneAustralia_ACT, // 0x8a970eb2, Australia/ACT -> Australia/Sydney + &kZoneAustralia_LHI, // 0x8a973e17, Australia/LHI -> Australia/Lord_Howe + &kZoneAustralia_NSW, // 0x8a974812, Australia/NSW -> Australia/Sydney + &kZonePacific_Nauru, // 0x8acc41ae, Pacific/Nauru + &kZoneEST5EDT, // 0x8adc72a3, EST5EDT + &kZonePacific_Palau, // 0x8af04a36, Pacific/Palau + &kZonePacific_Samoa, // 0x8b2699b4, Pacific/Samoa -> Pacific/Pago_Pago + &kZoneAmerica_Winnipeg, // 0x8c7dafc7, America/Winnipeg + &kZoneAustralia_Eucla, // 0x8cf99e44, Australia/Eucla + &kZoneAfrica_Luanda, // 0x8d7909cf, Africa/Luanda -> Africa/Lagos + &kZoneAfrica_Lusaka, // 0x8d82b23b, Africa/Lusaka -> Africa/Maputo + &kZoneAustralia_North, // 0x8d997165, Australia/North -> Australia/Darwin + &kZoneAustralia_Perth, // 0x8db8269d, Australia/Perth + &kZoneAustralia_South, // 0x8df3f8ad, Australia/South -> Australia/Adelaide + &kZonePacific_Kwajalein, // 0x8e216759, Pacific/Kwajalein + &kZoneAmerica_Port_au_Prince, // 0x8e4a7bdc, America/Port-au-Prince + &kZoneAfrica_Malabo, // 0x8e6a1906, Africa/Malabo -> Africa/Lagos + &kZoneAfrica_Maputo, // 0x8e6ca1f0, Africa/Maputo + &kZoneAfrica_Maseru, // 0x8e6e02c7, Africa/Maseru -> Africa/Johannesburg + &kZoneAmerica_Godthab, // 0x8f7eba1f, America/Godthab -> America/Nuuk + &kZoneAustralia_Yancowinna, // 0x90bac131, Australia/Yancowinna -> Australia/Broken_Hill + &kZoneAfrica_Niamey, // 0x914a30fd, Africa/Niamey -> Africa/Lagos + &kZoneAsia_Yerevan, // 0x9185c8cc, Asia/Yerevan + &kZoneAmerica_Detroit, // 0x925cfbc1, America/Detroit + &kZoneAmerica_Bogota, // 0x93d7bc62, America/Bogota + &kZoneAmerica_Cayman, // 0x953961df, America/Cayman -> America/Panama + &kZoneAmerica_Glace_Bay, // 0x9681f8dd, America/Glace_Bay + &kZoneAmerica_Grenada, // 0x968ce4d8, America/Grenada -> America/Port_of_Spain + &kZoneAmerica_Aruba, // 0x97cf8651, America/Aruba -> America/Curacao + &kZoneAmerica_Denver, // 0x97d10b2a, America/Denver + &kZoneAmerica_Belem, // 0x97da580b, America/Belem + &kZoneAmerica_Boise, // 0x97dfc8d8, America/Boise + &kZoneEurope_Andorra, // 0x97f6764b, Europe/Andorra + &kZoneAmerica_Adak, // 0x97fe49d7, America/Adak + &kZoneAmerica_Atka, // 0x97fe8f27, America/Atka -> America/Adak + &kZoneAmerica_Lima, // 0x980468c9, America/Lima + &kZoneAmerica_Nome, // 0x98059b15, America/Nome + &kZoneAmerica_Nuuk, // 0x9805b5a9, America/Nuuk + &kZoneIndian_Maldives, // 0x9869681c, Indian/Maldives + &kZoneAmerica_Sitka, // 0x99104ce2, America/Sitka + &kZoneAmerica_Thule, // 0x9921dd68, America/Thule + &kZonePacific_Rarotonga, // 0x9981a3b0, Pacific/Rarotonga + &kZoneAsia_Kathmandu, // 0x9a96ce6f, Asia/Kathmandu + &kZoneAmerica_Rainy_River, // 0x9cd58a10, America/Rainy_River + &kZoneEurope_Budapest, // 0x9ce0197c, Europe/Budapest + &kZoneAsia_Baghdad, // 0x9ceffbed, Asia/Baghdad + &kZoneAsia_Bahrain, // 0x9d078487, Asia/Bahrain -> Asia/Qatar + &kZoneEtc_GMT_PLUS_0, // 0x9d13da13, Etc/GMT+0 -> Etc/GMT + &kZoneEtc_GMT_PLUS_1, // 0x9d13da14, Etc/GMT+1 + &kZoneEtc_GMT_PLUS_2, // 0x9d13da15, Etc/GMT+2 + &kZoneEtc_GMT_PLUS_3, // 0x9d13da16, Etc/GMT+3 + &kZoneEtc_GMT_PLUS_4, // 0x9d13da17, Etc/GMT+4 + &kZoneEtc_GMT_PLUS_5, // 0x9d13da18, Etc/GMT+5 + &kZoneEtc_GMT_PLUS_6, // 0x9d13da19, Etc/GMT+6 + &kZoneEtc_GMT_PLUS_7, // 0x9d13da1a, Etc/GMT+7 + &kZoneEtc_GMT_PLUS_8, // 0x9d13da1b, Etc/GMT+8 + &kZoneEtc_GMT_PLUS_9, // 0x9d13da1c, Etc/GMT+9 + &kZoneEtc_GMT_0, // 0x9d13da55, Etc/GMT-0 -> Etc/GMT + &kZoneEtc_GMT_1, // 0x9d13da56, Etc/GMT-1 + &kZoneEtc_GMT_2, // 0x9d13da57, Etc/GMT-2 + &kZoneEtc_GMT_3, // 0x9d13da58, Etc/GMT-3 + &kZoneEtc_GMT_4, // 0x9d13da59, Etc/GMT-4 + &kZoneEtc_GMT_5, // 0x9d13da5a, Etc/GMT-5 + &kZoneEtc_GMT_6, // 0x9d13da5b, Etc/GMT-6 + &kZoneEtc_GMT_7, // 0x9d13da5c, Etc/GMT-7 + &kZoneEtc_GMT_8, // 0x9d13da5d, Etc/GMT-8 + &kZoneEtc_GMT_9, // 0x9d13da5e, Etc/GMT-9 + &kZoneAmerica_Nipigon, // 0x9d2a8b1a, America/Nipigon + &kZoneAsia_Bangkok, // 0x9d6e3aaf, Asia/Bangkok + &kZoneAmerica_North_Dakota_Center, // 0x9da42814, America/North_Dakota/Center + &kZoneIndian_Antananarivo, // 0x9ebf5289, Indian/Antananarivo -> Africa/Nairobi + &kZoneAfrica_Ndjamena, // 0x9fe09898, Africa/Ndjamena + &kZoneAmerica_Guyana, // 0x9ff7bd0b, America/Guyana + &kZoneAfrica_Dar_es_Salaam, // 0xa04c47b6, Africa/Dar_es_Salaam -> Africa/Nairobi + &kZoneAmerica_Havana, // 0xa0e15675, America/Havana + &kZoneEurope_Kiev, // 0xa2c19eb3, Europe/Kiev + &kZoneEurope_Oslo, // 0xa2c3fba1, Europe/Oslo + &kZoneEurope_Rome, // 0xa2c58fd7, Europe/Rome + &kZoneAmerica_Inuvik, // 0xa42189fc, America/Inuvik + &kZoneAmerica_Juneau, // 0xa6f13e2e, America/Juneau + &kZoneAustralia_Lord_Howe, // 0xa748b67d, Australia/Lord_Howe + &kZonePacific_Port_Moresby, // 0xa7ba7f68, Pacific/Port_Moresby + &kZoneAsia_Katmandu, // 0xa7ec12c7, Asia/Katmandu -> Asia/Kathmandu + &kZoneAsia_Beirut, // 0xa7f3d5fd, Asia/Beirut + &kZoneSingapore, // 0xa8598c8d, Singapore -> Asia/Singapore + &kZoneAfrica_Nairobi, // 0xa87ab57e, Africa/Nairobi + &kZoneAsia_Brunei, // 0xa8e595f7, Asia/Brunei + &kZoneUS_Pacific, // 0xa950f6ab, US/Pacific -> America/Los_Angeles + &kZonePacific_Galapagos, // 0xa952f752, Pacific/Galapagos + &kZoneAmerica_La_Paz, // 0xaa29125d, America/La_Paz + &kZoneAmerica_Coral_Harbour, // 0xabcb7569, America/Coral_Harbour -> America/Atikokan + &kZoneAmerica_Manaus, // 0xac86bf8b, America/Manaus + &kZoneAmerica_Merida, // 0xacd172d8, America/Merida + &kZoneEurope_Chisinau, // 0xad58aa18, Europe/Chisinau + &kZoneAmerica_Nassau, // 0xaedef011, America/Nassau + &kZoneAmerica_Anguilla, // 0xafe31333, America/Anguilla -> America/Port_of_Spain + &kZoneEurope_Uzhgorod, // 0xb066f5d6, Europe/Uzhgorod + &kZoneAustralia_Broken_Hill, // 0xb06eada3, Australia/Broken_Hill + &kZoneChile_EasterIsland, // 0xb0982af8, Chile/EasterIsland -> Pacific/Easter + &kZonePacific_Johnston, // 0xb15d7b36, Pacific/Johnston -> Pacific/Honolulu + &kZoneAfrica_Timbuktu, // 0xb164d56f, Africa/Timbuktu -> Africa/Abidjan + &kZoneAmerica_St_Thomas, // 0xb1b3d778, America/St_Thomas -> America/Port_of_Spain + &kZoneAmerica_Paramaribo, // 0xb319e4c4, America/Paramaribo + &kZoneAmerica_Panama, // 0xb3863854, America/Panama + &kZoneAsia_Harbin, // 0xb5af1186, Asia/Harbin -> Asia/Shanghai + &kZoneAmerica_Los_Angeles, // 0xb7f7e8f2, America/Los_Angeles + &kZoneAmerica_Regina, // 0xb875371c, America/Regina + &kZoneAsia_Ashgabat, // 0xba87598d, Asia/Ashgabat + &kZoneIsrael, // 0xba88c9e5, Israel -> Asia/Jerusalem + &kZonePacific_Yap, // 0xbb40138d, Pacific/Yap -> Pacific/Chuuk + &kZoneAmerica_Halifax, // 0xbc5b7183, America/Halifax + &kZoneEurope_Ljubljana, // 0xbd98cdb7, Europe/Ljubljana -> Europe/Belgrade + &kZoneAsia_Kuwait, // 0xbe1b2f27, Asia/Kuwait -> Asia/Riyadh + &kZoneEurope_Tiraspol, // 0xbe704472, Europe/Tiraspol -> Europe/Chisinau + &kZoneAmerica_Tegucigalpa, // 0xbfd6fd4c, America/Tegucigalpa + &kZoneAmerica_Antigua, // 0xc067a32f, America/Antigua -> America/Port_of_Spain + &kZoneEurope_Busingen, // 0xc06d2cdf, Europe/Busingen -> Europe/Zurich + &kZoneAsia_Manila, // 0xc156c944, Asia/Manila + &kZoneAfrica_Kampala, // 0xc1d30e31, Africa/Kampala -> Africa/Nairobi + &kZoneAfrica_Abidjan, // 0xc21305a3, Africa/Abidjan + &kZoneAmerica_Virgin, // 0xc2183ab5, America/Virgin -> America/Port_of_Spain + &kZoneAsia_Phnom_Penh, // 0xc224945e, Asia/Phnom_Penh -> Asia/Bangkok + &kZoneAsia_Muscat, // 0xc2c3565f, Asia/Muscat -> Asia/Dubai + &kZonePortugal, // 0xc3274593, Portugal -> Europe/Lisbon + &kZoneNavajo, // 0xc4ef0e24, Navajo -> America/Denver + &kZoneAsia_Jayapura, // 0xc6833c2f, Asia/Jayapura + &kZoneAsia_Chungking, // 0xc7121dd0, Asia/Chungking -> Asia/Shanghai + &kZoneGreenwich, // 0xc84d4221, Greenwich -> Etc/GMT + &kZonePoland, // 0xca913b23, Poland -> Europe/Warsaw + &kZoneUS_Central, // 0xcabdcb25, US/Central -> America/Chicago + &kZoneEurope_Vatican, // 0xcb485dca, Europe/Vatican -> Europe/Rome + &kZoneAmerica_Barbados, // 0xcbbc3b04, America/Barbados + &kZoneAmerica_Guadeloupe, // 0xcd1f8a31, America/Guadeloupe -> America/Port_of_Spain + &kZoneAntarctica_South_Pole, // 0xcd96b290, Antarctica/South_Pole -> Pacific/Auckland + &kZoneAsia_Riyadh, // 0xcd973d93, Asia/Riyadh + &kZoneAmerica_Dominica, // 0xcecb4c4a, America/Dominica -> America/Port_of_Spain + &kZoneEurope_San_Marino, // 0xcef7724b, Europe/San_Marino -> Europe/Rome + &kZoneAsia_Saigon, // 0xcf52f713, Asia/Saigon -> Asia/Ho_Chi_Minh + &kZonePacific_Easter, // 0xcf54f7e7, Pacific/Easter + &kZoneAsia_Singapore, // 0xcf8581fa, Asia/Singapore + &kZoneEurope_Belfast, // 0xd07dd1e5, Europe/Belfast -> Europe/London + &kZoneUniversal, // 0xd0ff523e, Universal -> Etc/UTC + &kZoneAsia_Taipei, // 0xd1a844ae, Asia/Taipei + &kZoneAsia_Tehran, // 0xd1f02254, Asia/Tehran + &kZoneAsia_Thimbu, // 0xd226e31b, Asia/Thimbu -> Asia/Thimphu + &kZoneArctic_Longyearbyen, // 0xd23e7859, Arctic/Longyearbyen -> Europe/Oslo + &kZoneAustralia_Queensland, // 0xd326ed0a, Australia/Queensland -> Australia/Brisbane + &kZoneAfrica_Lome, // 0xd51c3a07, Africa/Lome -> Africa/Abidjan + &kZoneAsia_Urumqi, // 0xd5379735, Asia/Urumqi + &kZoneAfrica_Johannesburg, // 0xd5d157a0, Africa/Johannesburg + &kZoneAmerica_Port_of_Spain, // 0xd8b28d59, America/Port_of_Spain + &kZoneEtc_GMT, // 0xd8e2de58, Etc/GMT + &kZoneEtc_UCT, // 0xd8e3189c, Etc/UCT -> Etc/UTC + &kZoneEtc_UTC, // 0xd8e31abc, Etc/UTC + &kZoneAmerica_Yakutat, // 0xd8ee31e9, America/Yakutat + &kZoneAfrica_Algiers, // 0xd94515c1, Africa/Algiers + &kZonePST8PDT, // 0xd99ee2dc, PST8PDT + &kZoneEurope_Bratislava, // 0xda493bed, Europe/Bratislava -> Europe/Prague + &kZonePacific_Funafuti, // 0xdb402d65, Pacific/Funafuti + &kZoneAmerica_Matamoros, // 0xdd1b0259, America/Matamoros + &kZoneAsia_Yangon, // 0xdd54a8be, Asia/Yangon + &kZoneAustralia_West, // 0xdd858a5d, Australia/West -> Australia/Perth + &kZonePacific_Kosrae, // 0xde5139a8, Pacific/Kosrae + &kZoneEurope_Brussels, // 0xdee07337, Europe/Brussels + &kZoneAmerica_Swift_Current, // 0xdef98e55, America/Swift_Current + &kZoneAustralia_Lindeman, // 0xe05029e2, Australia/Lindeman + &kZoneEurope_Belgrade, // 0xe0532b3a, Europe/Belgrade + &kZoneAfrica_Blantyre, // 0xe08d813b, Africa/Blantyre -> Africa/Maputo + &kZoneAmerica_Menominee, // 0xe0e9c583, America/Menominee + &kZoneEurope_Copenhagen, // 0xe0ed30bc, Europe/Copenhagen + &kZoneAtlantic_Faroe, // 0xe110a971, Atlantic/Faroe + &kZonePacific_Majuro, // 0xe1f95371, Pacific/Majuro + &kZonePacific_Midway, // 0xe286d38e, Pacific/Midway -> Pacific/Pago_Pago + &kZoneAntarctica_Syowa, // 0xe330c7e1, Antarctica/Syowa + &kZonePacific_Noumea, // 0xe551b788, Pacific/Noumea + &kZoneIceland, // 0xe56a35b5, Iceland -> Atlantic/Reykjavik + &kZoneIndian_Mayotte, // 0xe6880bca, Indian/Mayotte -> Africa/Nairobi + &kZoneAustralia_Tasmania, // 0xe6d76648, Australia/Tasmania -> Australia/Hobart + &kZonePacific_Honolulu, // 0xe6e70af9, Pacific/Honolulu + &kZoneAmerica_Kralendijk, // 0xe7c456c5, America/Kralendijk -> America/Curacao + &kZonePacific_Ponape, // 0xe9f80086, Pacific/Ponape -> Pacific/Pohnpei + &kZoneEurope_Zaporozhye, // 0xeab9767f, Europe/Zaporozhye + &kZoneEurope_Isle_of_Man, // 0xeaf84580, Europe/Isle_of_Man -> Europe/London + &kZoneAmerica_Ojinaga, // 0xebfde83f, America/Ojinaga + &kZoneCST6CDT, // 0xf0e87d00, CST6CDT + &kZonePacific_Tahiti, // 0xf24c2446, Pacific/Tahiti + &kZonePacific_Tarawa, // 0xf2517e63, Pacific/Tarawa + &kZoneMST7MDT, // 0xf2af9375, MST7MDT + &kZoneCanada_Eastern, // 0xf3612d5e, Canada/Eastern -> America/Toronto + &kZoneAsia_Tashkent, // 0xf3924254, Asia/Tashkent + &kZonePacific_Guadalcanal, // 0xf4dd25f0, Pacific/Guadalcanal + &kZoneEtc_GMT0, // 0xf53ea988, Etc/GMT0 -> Etc/GMT + &kZoneEtc_Zulu, // 0xf549c240, Etc/Zulu -> Etc/UTC + &kZoneAmerica_Danmarkshavn, // 0xf554d204, America/Danmarkshavn + &kZoneAsia_Shanghai, // 0xf895a7f5, Asia/Shanghai + &kZoneEurope_Gibraltar, // 0xf8e325fc, Europe/Gibraltar + &kZoneAsia_Chongqing, // 0xf937fb90, Asia/Chongqing -> Asia/Shanghai + &kZoneAtlantic_Azores, // 0xf93ed918, Atlantic/Azores + &kZonePacific_Wallis, // 0xf94ddb0f, Pacific/Wallis + &kZoneAmerica_Thunder_Bay, // 0xf962e71b, America/Thunder_Bay + &kZoneAmerica_Montevideo, // 0xfa214780, America/Montevideo + &kZoneUS_Alaska, // 0xfa300bc9, US/Alaska -> America/Anchorage + &kZoneGB_Eire, // 0xfa70e300, GB-Eire -> Europe/London + &kZoneEurope_Malta, // 0xfb1560f3, Europe/Malta + &kZoneEurope_Bucharest, // 0xfb349ec5, Europe/Bucharest + &kZoneEurope_Paris, // 0xfb4bc2a3, Europe/Paris + &kZoneEurope_Sofia, // 0xfb898656, Europe/Sofia + &kZoneCanada_Mountain, // 0xfb8a8217, Canada/Mountain -> America/Edmonton + &kZoneEurope_Vaduz, // 0xfbb81bae, Europe/Vaduz -> Europe/Zurich + &kZoneAtlantic_Canary, // 0xfc23f2c2, Atlantic/Canary + &kZoneAmerica_Campo_Grande, // 0xfec3e7a6, America/Campo_Grande }; diff --git a/src/ace_time/zonedb/zone_registry.h b/src/ace_time/zonedb/zone_registry.h index d987989d9..1c41f3f00 100644 --- a/src/ace_time/zonedb/zone_registry.h +++ b/src/ace_time/zonedb/zone_registry.h @@ -34,10 +34,14 @@ namespace ace_time { namespace zonedb { +// Zones const uint16_t kZoneRegistrySize = 266; - extern const basic::ZoneInfo* const kZoneRegistry[266]; +// Zones and Links +const uint16_t kZoneAndLinkRegistrySize = 449; +extern const basic::ZoneInfo* const kZoneAndLinkRegistry[449]; + } } #endif diff --git a/src/ace_time/zonedbx/zone_infos.cpp b/src/ace_time/zonedbx/zone_infos.cpp index 92e3771f8..1a3e34493 100644 --- a/src/ace_time/zonedbx/zone_infos.cpp +++ b/src/ace_time/zonedbx/zone_infos.cpp @@ -26,9 +26,14 @@ // // Zones: 386 // Links: 207 -// Strings (bytes): 9465 -// Memory (8-bit): 21125 -// Memory (32-bit): 27969 +// kZoneRegistry sizes (bytes): +// Strings: 9465 +// Memory (8-bit): 21897 +// Memory (32-bit): 29513 +// kZoneAndLinkRegistry sizes (bytes): +// Strings: 12392 +// Memory (8-bit): 27515 +// Memory (32-bit): 37408 // // DO NOT EDIT @@ -16641,213 +16646,3318 @@ const extended::ZoneInfo kZoneWET ACE_TIME_PROGMEM = { // Links: 207 //--------------------------------------------------------------------------- -const extended::ZoneInfo& kZoneAfrica_Addis_Ababa = kZoneAfrica_Nairobi; -const extended::ZoneInfo& kZoneAfrica_Asmara = kZoneAfrica_Nairobi; -const extended::ZoneInfo& kZoneAfrica_Asmera = kZoneAfrica_Nairobi; -const extended::ZoneInfo& kZoneAfrica_Bamako = kZoneAfrica_Abidjan; -const extended::ZoneInfo& kZoneAfrica_Bangui = kZoneAfrica_Lagos; -const extended::ZoneInfo& kZoneAfrica_Banjul = kZoneAfrica_Abidjan; -const extended::ZoneInfo& kZoneAfrica_Blantyre = kZoneAfrica_Maputo; -const extended::ZoneInfo& kZoneAfrica_Brazzaville = kZoneAfrica_Lagos; -const extended::ZoneInfo& kZoneAfrica_Bujumbura = kZoneAfrica_Maputo; -const extended::ZoneInfo& kZoneAfrica_Conakry = kZoneAfrica_Abidjan; -const extended::ZoneInfo& kZoneAfrica_Dakar = kZoneAfrica_Abidjan; -const extended::ZoneInfo& kZoneAfrica_Dar_es_Salaam = kZoneAfrica_Nairobi; -const extended::ZoneInfo& kZoneAfrica_Djibouti = kZoneAfrica_Nairobi; -const extended::ZoneInfo& kZoneAfrica_Douala = kZoneAfrica_Lagos; -const extended::ZoneInfo& kZoneAfrica_Freetown = kZoneAfrica_Abidjan; -const extended::ZoneInfo& kZoneAfrica_Gaborone = kZoneAfrica_Maputo; -const extended::ZoneInfo& kZoneAfrica_Harare = kZoneAfrica_Maputo; -const extended::ZoneInfo& kZoneAfrica_Kampala = kZoneAfrica_Nairobi; -const extended::ZoneInfo& kZoneAfrica_Kigali = kZoneAfrica_Maputo; -const extended::ZoneInfo& kZoneAfrica_Kinshasa = kZoneAfrica_Lagos; -const extended::ZoneInfo& kZoneAfrica_Libreville = kZoneAfrica_Lagos; -const extended::ZoneInfo& kZoneAfrica_Lome = kZoneAfrica_Abidjan; -const extended::ZoneInfo& kZoneAfrica_Luanda = kZoneAfrica_Lagos; -const extended::ZoneInfo& kZoneAfrica_Lubumbashi = kZoneAfrica_Maputo; -const extended::ZoneInfo& kZoneAfrica_Lusaka = kZoneAfrica_Maputo; -const extended::ZoneInfo& kZoneAfrica_Malabo = kZoneAfrica_Lagos; -const extended::ZoneInfo& kZoneAfrica_Maseru = kZoneAfrica_Johannesburg; -const extended::ZoneInfo& kZoneAfrica_Mbabane = kZoneAfrica_Johannesburg; -const extended::ZoneInfo& kZoneAfrica_Mogadishu = kZoneAfrica_Nairobi; -const extended::ZoneInfo& kZoneAfrica_Niamey = kZoneAfrica_Lagos; -const extended::ZoneInfo& kZoneAfrica_Nouakchott = kZoneAfrica_Abidjan; -const extended::ZoneInfo& kZoneAfrica_Ouagadougou = kZoneAfrica_Abidjan; -const extended::ZoneInfo& kZoneAfrica_Porto_Novo = kZoneAfrica_Lagos; -const extended::ZoneInfo& kZoneAfrica_Timbuktu = kZoneAfrica_Abidjan; -const extended::ZoneInfo& kZoneAmerica_Anguilla = kZoneAmerica_Port_of_Spain; -const extended::ZoneInfo& kZoneAmerica_Antigua = kZoneAmerica_Port_of_Spain; -const extended::ZoneInfo& kZoneAmerica_Argentina_ComodRivadavia = kZoneAmerica_Argentina_Catamarca; -const extended::ZoneInfo& kZoneAmerica_Aruba = kZoneAmerica_Curacao; -const extended::ZoneInfo& kZoneAmerica_Atka = kZoneAmerica_Adak; -const extended::ZoneInfo& kZoneAmerica_Buenos_Aires = kZoneAmerica_Argentina_Buenos_Aires; -const extended::ZoneInfo& kZoneAmerica_Catamarca = kZoneAmerica_Argentina_Catamarca; -const extended::ZoneInfo& kZoneAmerica_Cayman = kZoneAmerica_Panama; -const extended::ZoneInfo& kZoneAmerica_Coral_Harbour = kZoneAmerica_Atikokan; -const extended::ZoneInfo& kZoneAmerica_Cordoba = kZoneAmerica_Argentina_Cordoba; -const extended::ZoneInfo& kZoneAmerica_Dominica = kZoneAmerica_Port_of_Spain; -const extended::ZoneInfo& kZoneAmerica_Ensenada = kZoneAmerica_Tijuana; -const extended::ZoneInfo& kZoneAmerica_Fort_Wayne = kZoneAmerica_Indiana_Indianapolis; -const extended::ZoneInfo& kZoneAmerica_Godthab = kZoneAmerica_Nuuk; -const extended::ZoneInfo& kZoneAmerica_Grenada = kZoneAmerica_Port_of_Spain; -const extended::ZoneInfo& kZoneAmerica_Guadeloupe = kZoneAmerica_Port_of_Spain; -const extended::ZoneInfo& kZoneAmerica_Indianapolis = kZoneAmerica_Indiana_Indianapolis; -const extended::ZoneInfo& kZoneAmerica_Jujuy = kZoneAmerica_Argentina_Jujuy; -const extended::ZoneInfo& kZoneAmerica_Knox_IN = kZoneAmerica_Indiana_Knox; -const extended::ZoneInfo& kZoneAmerica_Kralendijk = kZoneAmerica_Curacao; -const extended::ZoneInfo& kZoneAmerica_Louisville = kZoneAmerica_Kentucky_Louisville; -const extended::ZoneInfo& kZoneAmerica_Lower_Princes = kZoneAmerica_Curacao; -const extended::ZoneInfo& kZoneAmerica_Marigot = kZoneAmerica_Port_of_Spain; -const extended::ZoneInfo& kZoneAmerica_Mendoza = kZoneAmerica_Argentina_Mendoza; -const extended::ZoneInfo& kZoneAmerica_Montreal = kZoneAmerica_Toronto; -const extended::ZoneInfo& kZoneAmerica_Montserrat = kZoneAmerica_Port_of_Spain; -const extended::ZoneInfo& kZoneAmerica_Porto_Acre = kZoneAmerica_Rio_Branco; -const extended::ZoneInfo& kZoneAmerica_Rosario = kZoneAmerica_Argentina_Cordoba; -const extended::ZoneInfo& kZoneAmerica_Santa_Isabel = kZoneAmerica_Tijuana; -const extended::ZoneInfo& kZoneAmerica_Shiprock = kZoneAmerica_Denver; -const extended::ZoneInfo& kZoneAmerica_St_Barthelemy = kZoneAmerica_Port_of_Spain; -const extended::ZoneInfo& kZoneAmerica_St_Kitts = kZoneAmerica_Port_of_Spain; -const extended::ZoneInfo& kZoneAmerica_St_Lucia = kZoneAmerica_Port_of_Spain; -const extended::ZoneInfo& kZoneAmerica_St_Thomas = kZoneAmerica_Port_of_Spain; -const extended::ZoneInfo& kZoneAmerica_St_Vincent = kZoneAmerica_Port_of_Spain; -const extended::ZoneInfo& kZoneAmerica_Tortola = kZoneAmerica_Port_of_Spain; -const extended::ZoneInfo& kZoneAmerica_Virgin = kZoneAmerica_Port_of_Spain; -const extended::ZoneInfo& kZoneAntarctica_McMurdo = kZonePacific_Auckland; -const extended::ZoneInfo& kZoneAntarctica_South_Pole = kZonePacific_Auckland; -const extended::ZoneInfo& kZoneArctic_Longyearbyen = kZoneEurope_Oslo; -const extended::ZoneInfo& kZoneAsia_Aden = kZoneAsia_Riyadh; -const extended::ZoneInfo& kZoneAsia_Ashkhabad = kZoneAsia_Ashgabat; -const extended::ZoneInfo& kZoneAsia_Bahrain = kZoneAsia_Qatar; -const extended::ZoneInfo& kZoneAsia_Calcutta = kZoneAsia_Kolkata; -const extended::ZoneInfo& kZoneAsia_Chongqing = kZoneAsia_Shanghai; -const extended::ZoneInfo& kZoneAsia_Chungking = kZoneAsia_Shanghai; -const extended::ZoneInfo& kZoneAsia_Dacca = kZoneAsia_Dhaka; -const extended::ZoneInfo& kZoneAsia_Harbin = kZoneAsia_Shanghai; -const extended::ZoneInfo& kZoneAsia_Istanbul = kZoneEurope_Istanbul; -const extended::ZoneInfo& kZoneAsia_Kashgar = kZoneAsia_Urumqi; -const extended::ZoneInfo& kZoneAsia_Katmandu = kZoneAsia_Kathmandu; -const extended::ZoneInfo& kZoneAsia_Kuwait = kZoneAsia_Riyadh; -const extended::ZoneInfo& kZoneAsia_Macao = kZoneAsia_Macau; -const extended::ZoneInfo& kZoneAsia_Muscat = kZoneAsia_Dubai; -const extended::ZoneInfo& kZoneAsia_Phnom_Penh = kZoneAsia_Bangkok; -const extended::ZoneInfo& kZoneAsia_Rangoon = kZoneAsia_Yangon; -const extended::ZoneInfo& kZoneAsia_Saigon = kZoneAsia_Ho_Chi_Minh; -const extended::ZoneInfo& kZoneAsia_Tel_Aviv = kZoneAsia_Jerusalem; -const extended::ZoneInfo& kZoneAsia_Thimbu = kZoneAsia_Thimphu; -const extended::ZoneInfo& kZoneAsia_Ujung_Pandang = kZoneAsia_Makassar; -const extended::ZoneInfo& kZoneAsia_Ulan_Bator = kZoneAsia_Ulaanbaatar; -const extended::ZoneInfo& kZoneAsia_Vientiane = kZoneAsia_Bangkok; -const extended::ZoneInfo& kZoneAtlantic_Faeroe = kZoneAtlantic_Faroe; -const extended::ZoneInfo& kZoneAtlantic_Jan_Mayen = kZoneEurope_Oslo; -const extended::ZoneInfo& kZoneAtlantic_St_Helena = kZoneAfrica_Abidjan; -const extended::ZoneInfo& kZoneAustralia_ACT = kZoneAustralia_Sydney; -const extended::ZoneInfo& kZoneAustralia_Canberra = kZoneAustralia_Sydney; -const extended::ZoneInfo& kZoneAustralia_Currie = kZoneAustralia_Hobart; -const extended::ZoneInfo& kZoneAustralia_LHI = kZoneAustralia_Lord_Howe; -const extended::ZoneInfo& kZoneAustralia_NSW = kZoneAustralia_Sydney; -const extended::ZoneInfo& kZoneAustralia_North = kZoneAustralia_Darwin; -const extended::ZoneInfo& kZoneAustralia_Queensland = kZoneAustralia_Brisbane; -const extended::ZoneInfo& kZoneAustralia_South = kZoneAustralia_Adelaide; -const extended::ZoneInfo& kZoneAustralia_Tasmania = kZoneAustralia_Hobart; -const extended::ZoneInfo& kZoneAustralia_Victoria = kZoneAustralia_Melbourne; -const extended::ZoneInfo& kZoneAustralia_West = kZoneAustralia_Perth; -const extended::ZoneInfo& kZoneAustralia_Yancowinna = kZoneAustralia_Broken_Hill; -const extended::ZoneInfo& kZoneBrazil_Acre = kZoneAmerica_Rio_Branco; -const extended::ZoneInfo& kZoneBrazil_DeNoronha = kZoneAmerica_Noronha; -const extended::ZoneInfo& kZoneBrazil_East = kZoneAmerica_Sao_Paulo; -const extended::ZoneInfo& kZoneBrazil_West = kZoneAmerica_Manaus; -const extended::ZoneInfo& kZoneCanada_Atlantic = kZoneAmerica_Halifax; -const extended::ZoneInfo& kZoneCanada_Central = kZoneAmerica_Winnipeg; -const extended::ZoneInfo& kZoneCanada_Eastern = kZoneAmerica_Toronto; -const extended::ZoneInfo& kZoneCanada_Mountain = kZoneAmerica_Edmonton; -const extended::ZoneInfo& kZoneCanada_Newfoundland = kZoneAmerica_St_Johns; -const extended::ZoneInfo& kZoneCanada_Pacific = kZoneAmerica_Vancouver; -const extended::ZoneInfo& kZoneCanada_Saskatchewan = kZoneAmerica_Regina; -const extended::ZoneInfo& kZoneCanada_Yukon = kZoneAmerica_Whitehorse; -const extended::ZoneInfo& kZoneChile_Continental = kZoneAmerica_Santiago; -const extended::ZoneInfo& kZoneChile_EasterIsland = kZonePacific_Easter; -const extended::ZoneInfo& kZoneCuba = kZoneAmerica_Havana; -const extended::ZoneInfo& kZoneEgypt = kZoneAfrica_Cairo; -const extended::ZoneInfo& kZoneEire = kZoneEurope_Dublin; -const extended::ZoneInfo& kZoneEtc_GMT_PLUS_0 = kZoneEtc_GMT; -const extended::ZoneInfo& kZoneEtc_GMT_0 = kZoneEtc_GMT; -const extended::ZoneInfo& kZoneEtc_GMT0 = kZoneEtc_GMT; -const extended::ZoneInfo& kZoneEtc_Greenwich = kZoneEtc_GMT; -const extended::ZoneInfo& kZoneEtc_UCT = kZoneEtc_UTC; -const extended::ZoneInfo& kZoneEtc_Universal = kZoneEtc_UTC; -const extended::ZoneInfo& kZoneEtc_Zulu = kZoneEtc_UTC; -const extended::ZoneInfo& kZoneEurope_Belfast = kZoneEurope_London; -const extended::ZoneInfo& kZoneEurope_Bratislava = kZoneEurope_Prague; -const extended::ZoneInfo& kZoneEurope_Busingen = kZoneEurope_Zurich; -const extended::ZoneInfo& kZoneEurope_Guernsey = kZoneEurope_London; -const extended::ZoneInfo& kZoneEurope_Isle_of_Man = kZoneEurope_London; -const extended::ZoneInfo& kZoneEurope_Jersey = kZoneEurope_London; -const extended::ZoneInfo& kZoneEurope_Ljubljana = kZoneEurope_Belgrade; -const extended::ZoneInfo& kZoneEurope_Mariehamn = kZoneEurope_Helsinki; -const extended::ZoneInfo& kZoneEurope_Nicosia = kZoneAsia_Nicosia; -const extended::ZoneInfo& kZoneEurope_Podgorica = kZoneEurope_Belgrade; -const extended::ZoneInfo& kZoneEurope_San_Marino = kZoneEurope_Rome; -const extended::ZoneInfo& kZoneEurope_Sarajevo = kZoneEurope_Belgrade; -const extended::ZoneInfo& kZoneEurope_Skopje = kZoneEurope_Belgrade; -const extended::ZoneInfo& kZoneEurope_Tiraspol = kZoneEurope_Chisinau; -const extended::ZoneInfo& kZoneEurope_Vaduz = kZoneEurope_Zurich; -const extended::ZoneInfo& kZoneEurope_Vatican = kZoneEurope_Rome; -const extended::ZoneInfo& kZoneEurope_Zagreb = kZoneEurope_Belgrade; -const extended::ZoneInfo& kZoneGB = kZoneEurope_London; -const extended::ZoneInfo& kZoneGB_Eire = kZoneEurope_London; -const extended::ZoneInfo& kZoneGMT = kZoneEtc_GMT; -const extended::ZoneInfo& kZoneGMT_PLUS_0 = kZoneEtc_GMT; -const extended::ZoneInfo& kZoneGMT_0 = kZoneEtc_GMT; -const extended::ZoneInfo& kZoneGMT0 = kZoneEtc_GMT; -const extended::ZoneInfo& kZoneGreenwich = kZoneEtc_GMT; -const extended::ZoneInfo& kZoneHongkong = kZoneAsia_Hong_Kong; -const extended::ZoneInfo& kZoneIceland = kZoneAtlantic_Reykjavik; -const extended::ZoneInfo& kZoneIndian_Antananarivo = kZoneAfrica_Nairobi; -const extended::ZoneInfo& kZoneIndian_Comoro = kZoneAfrica_Nairobi; -const extended::ZoneInfo& kZoneIndian_Mayotte = kZoneAfrica_Nairobi; -const extended::ZoneInfo& kZoneIran = kZoneAsia_Tehran; -const extended::ZoneInfo& kZoneIsrael = kZoneAsia_Jerusalem; -const extended::ZoneInfo& kZoneJamaica = kZoneAmerica_Jamaica; -const extended::ZoneInfo& kZoneJapan = kZoneAsia_Tokyo; -const extended::ZoneInfo& kZoneKwajalein = kZonePacific_Kwajalein; -const extended::ZoneInfo& kZoneLibya = kZoneAfrica_Tripoli; -const extended::ZoneInfo& kZoneMexico_BajaNorte = kZoneAmerica_Tijuana; -const extended::ZoneInfo& kZoneMexico_BajaSur = kZoneAmerica_Mazatlan; -const extended::ZoneInfo& kZoneMexico_General = kZoneAmerica_Mexico_City; -const extended::ZoneInfo& kZoneNZ = kZonePacific_Auckland; -const extended::ZoneInfo& kZoneNZ_CHAT = kZonePacific_Chatham; -const extended::ZoneInfo& kZoneNavajo = kZoneAmerica_Denver; -const extended::ZoneInfo& kZonePRC = kZoneAsia_Shanghai; -const extended::ZoneInfo& kZonePacific_Johnston = kZonePacific_Honolulu; -const extended::ZoneInfo& kZonePacific_Midway = kZonePacific_Pago_Pago; -const extended::ZoneInfo& kZonePacific_Ponape = kZonePacific_Pohnpei; -const extended::ZoneInfo& kZonePacific_Saipan = kZonePacific_Guam; -const extended::ZoneInfo& kZonePacific_Samoa = kZonePacific_Pago_Pago; -const extended::ZoneInfo& kZonePacific_Truk = kZonePacific_Chuuk; -const extended::ZoneInfo& kZonePacific_Yap = kZonePacific_Chuuk; -const extended::ZoneInfo& kZonePoland = kZoneEurope_Warsaw; -const extended::ZoneInfo& kZonePortugal = kZoneEurope_Lisbon; -const extended::ZoneInfo& kZoneROC = kZoneAsia_Taipei; -const extended::ZoneInfo& kZoneROK = kZoneAsia_Seoul; -const extended::ZoneInfo& kZoneSingapore = kZoneAsia_Singapore; -const extended::ZoneInfo& kZoneTurkey = kZoneEurope_Istanbul; -const extended::ZoneInfo& kZoneUCT = kZoneEtc_UTC; -const extended::ZoneInfo& kZoneUS_Alaska = kZoneAmerica_Anchorage; -const extended::ZoneInfo& kZoneUS_Aleutian = kZoneAmerica_Adak; -const extended::ZoneInfo& kZoneUS_Arizona = kZoneAmerica_Phoenix; -const extended::ZoneInfo& kZoneUS_Central = kZoneAmerica_Chicago; -const extended::ZoneInfo& kZoneUS_East_Indiana = kZoneAmerica_Indiana_Indianapolis; -const extended::ZoneInfo& kZoneUS_Eastern = kZoneAmerica_New_York; -const extended::ZoneInfo& kZoneUS_Hawaii = kZonePacific_Honolulu; -const extended::ZoneInfo& kZoneUS_Indiana_Starke = kZoneAmerica_Indiana_Knox; -const extended::ZoneInfo& kZoneUS_Michigan = kZoneAmerica_Detroit; -const extended::ZoneInfo& kZoneUS_Mountain = kZoneAmerica_Denver; -const extended::ZoneInfo& kZoneUS_Pacific = kZoneAmerica_Los_Angeles; -const extended::ZoneInfo& kZoneUS_Samoa = kZonePacific_Pago_Pago; -const extended::ZoneInfo& kZoneUTC = kZoneEtc_UTC; -const extended::ZoneInfo& kZoneUniversal = kZoneEtc_UTC; -const extended::ZoneInfo& kZoneW_SU = kZoneEurope_Moscow; -const extended::ZoneInfo& kZoneZulu = kZoneEtc_UTC; +//--------------------------------------------------------------------------- +// Link name: Africa/Addis_Ababa -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Addis_Ababa[] ACE_TIME_PROGMEM = "Africa/Addis_Ababa"; + +const extended::ZoneInfo kZoneAfrica_Addis_Ababa ACE_TIME_PROGMEM = { + kZoneNameAfrica_Addis_Ababa /*name*/, + 0x05ae1e65 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Asmara -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Asmara[] ACE_TIME_PROGMEM = "Africa/Asmara"; + +const extended::ZoneInfo kZoneAfrica_Asmara ACE_TIME_PROGMEM = { + kZoneNameAfrica_Asmara /*name*/, + 0x73b278ef /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Asmera -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Asmera[] ACE_TIME_PROGMEM = "Africa/Asmera"; + +const extended::ZoneInfo kZoneAfrica_Asmera ACE_TIME_PROGMEM = { + kZoneNameAfrica_Asmera /*name*/, + 0x73b289f3 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Bamako -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Bamako[] ACE_TIME_PROGMEM = "Africa/Bamako"; + +const extended::ZoneInfo kZoneAfrica_Bamako ACE_TIME_PROGMEM = { + kZoneNameAfrica_Bamako /*name*/, + 0x74c1e7a5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Bangui -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Bangui[] ACE_TIME_PROGMEM = "Africa/Bangui"; + +const extended::ZoneInfo kZoneAfrica_Bangui ACE_TIME_PROGMEM = { + kZoneNameAfrica_Bangui /*name*/, + 0x74c28ed0 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Banjul -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Banjul[] ACE_TIME_PROGMEM = "Africa/Banjul"; + +const extended::ZoneInfo kZoneAfrica_Banjul ACE_TIME_PROGMEM = { + kZoneNameAfrica_Banjul /*name*/, + 0x74c29b96 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Blantyre -> Africa/Maputo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Blantyre[] ACE_TIME_PROGMEM = "Africa/Blantyre"; + +const extended::ZoneInfo kZoneAfrica_Blantyre ACE_TIME_PROGMEM = { + kZoneNameAfrica_Blantyre /*name*/, + 0xe08d813b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Maputo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Brazzaville -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Brazzaville[] ACE_TIME_PROGMEM = "Africa/Brazzaville"; + +const extended::ZoneInfo kZoneAfrica_Brazzaville ACE_TIME_PROGMEM = { + kZoneNameAfrica_Brazzaville /*name*/, + 0x39cda760 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Bujumbura -> Africa/Maputo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Bujumbura[] ACE_TIME_PROGMEM = "Africa/Bujumbura"; + +const extended::ZoneInfo kZoneAfrica_Bujumbura ACE_TIME_PROGMEM = { + kZoneNameAfrica_Bujumbura /*name*/, + 0x05232a47 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Maputo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Conakry -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Conakry[] ACE_TIME_PROGMEM = "Africa/Conakry"; + +const extended::ZoneInfo kZoneAfrica_Conakry ACE_TIME_PROGMEM = { + kZoneNameAfrica_Conakry /*name*/, + 0x7ab36b31 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Dakar -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Dakar[] ACE_TIME_PROGMEM = "Africa/Dakar"; + +const extended::ZoneInfo kZoneAfrica_Dakar ACE_TIME_PROGMEM = { + kZoneNameAfrica_Dakar /*name*/, + 0x780b00fd /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Dar_es_Salaam -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Dar_es_Salaam[] ACE_TIME_PROGMEM = "Africa/Dar_es_Salaam"; + +const extended::ZoneInfo kZoneAfrica_Dar_es_Salaam ACE_TIME_PROGMEM = { + kZoneNameAfrica_Dar_es_Salaam /*name*/, + 0xa04c47b6 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Djibouti -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Djibouti[] ACE_TIME_PROGMEM = "Africa/Djibouti"; + +const extended::ZoneInfo kZoneAfrica_Djibouti ACE_TIME_PROGMEM = { + kZoneNameAfrica_Djibouti /*name*/, + 0x30ea01d4 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Douala -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Douala[] ACE_TIME_PROGMEM = "Africa/Douala"; + +const extended::ZoneInfo kZoneAfrica_Douala ACE_TIME_PROGMEM = { + kZoneNameAfrica_Douala /*name*/, + 0x7a6df310 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Freetown -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Freetown[] ACE_TIME_PROGMEM = "Africa/Freetown"; + +const extended::ZoneInfo kZoneAfrica_Freetown ACE_TIME_PROGMEM = { + kZoneNameAfrica_Freetown /*name*/, + 0x6823dd64 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Gaborone -> Africa/Maputo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Gaborone[] ACE_TIME_PROGMEM = "Africa/Gaborone"; + +const extended::ZoneInfo kZoneAfrica_Gaborone ACE_TIME_PROGMEM = { + kZoneNameAfrica_Gaborone /*name*/, + 0x317c0aa7 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Maputo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Harare -> Africa/Maputo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Harare[] ACE_TIME_PROGMEM = "Africa/Harare"; + +const extended::ZoneInfo kZoneAfrica_Harare ACE_TIME_PROGMEM = { + kZoneNameAfrica_Harare /*name*/, + 0x82c39a2d /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Maputo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Kampala -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Kampala[] ACE_TIME_PROGMEM = "Africa/Kampala"; + +const extended::ZoneInfo kZoneAfrica_Kampala ACE_TIME_PROGMEM = { + kZoneNameAfrica_Kampala /*name*/, + 0xc1d30e31 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Kigali -> Africa/Maputo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Kigali[] ACE_TIME_PROGMEM = "Africa/Kigali"; + +const extended::ZoneInfo kZoneAfrica_Kigali ACE_TIME_PROGMEM = { + kZoneNameAfrica_Kigali /*name*/, + 0x8a4dcf2b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Maputo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Kinshasa -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Kinshasa[] ACE_TIME_PROGMEM = "Africa/Kinshasa"; + +const extended::ZoneInfo kZoneAfrica_Kinshasa ACE_TIME_PROGMEM = { + kZoneNameAfrica_Kinshasa /*name*/, + 0x6695d70c /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Libreville -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Libreville[] ACE_TIME_PROGMEM = "Africa/Libreville"; + +const extended::ZoneInfo kZoneAfrica_Libreville ACE_TIME_PROGMEM = { + kZoneNameAfrica_Libreville /*name*/, + 0x01d96de4 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Lome -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Lome[] ACE_TIME_PROGMEM = "Africa/Lome"; + +const extended::ZoneInfo kZoneAfrica_Lome ACE_TIME_PROGMEM = { + kZoneNameAfrica_Lome /*name*/, + 0xd51c3a07 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Luanda -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Luanda[] ACE_TIME_PROGMEM = "Africa/Luanda"; + +const extended::ZoneInfo kZoneAfrica_Luanda ACE_TIME_PROGMEM = { + kZoneNameAfrica_Luanda /*name*/, + 0x8d7909cf /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Lubumbashi -> Africa/Maputo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Lubumbashi[] ACE_TIME_PROGMEM = "Africa/Lubumbashi"; + +const extended::ZoneInfo kZoneAfrica_Lubumbashi ACE_TIME_PROGMEM = { + kZoneNameAfrica_Lubumbashi /*name*/, + 0x6fd88566 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Maputo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Lusaka -> Africa/Maputo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Lusaka[] ACE_TIME_PROGMEM = "Africa/Lusaka"; + +const extended::ZoneInfo kZoneAfrica_Lusaka ACE_TIME_PROGMEM = { + kZoneNameAfrica_Lusaka /*name*/, + 0x8d82b23b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Maputo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Malabo -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Malabo[] ACE_TIME_PROGMEM = "Africa/Malabo"; + +const extended::ZoneInfo kZoneAfrica_Malabo ACE_TIME_PROGMEM = { + kZoneNameAfrica_Malabo /*name*/, + 0x8e6a1906 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Maseru -> Africa/Johannesburg +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Maseru[] ACE_TIME_PROGMEM = "Africa/Maseru"; + +const extended::ZoneInfo kZoneAfrica_Maseru ACE_TIME_PROGMEM = { + kZoneNameAfrica_Maseru /*name*/, + 0x8e6e02c7 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Johannesburg /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Mbabane -> Africa/Johannesburg +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Mbabane[] ACE_TIME_PROGMEM = "Africa/Mbabane"; + +const extended::ZoneInfo kZoneAfrica_Mbabane ACE_TIME_PROGMEM = { + kZoneNameAfrica_Mbabane /*name*/, + 0x5d3bdd40 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Johannesburg /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Mogadishu -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Mogadishu[] ACE_TIME_PROGMEM = "Africa/Mogadishu"; + +const extended::ZoneInfo kZoneAfrica_Mogadishu ACE_TIME_PROGMEM = { + kZoneNameAfrica_Mogadishu /*name*/, + 0x66bc159b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Niamey -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Niamey[] ACE_TIME_PROGMEM = "Africa/Niamey"; + +const extended::ZoneInfo kZoneAfrica_Niamey ACE_TIME_PROGMEM = { + kZoneNameAfrica_Niamey /*name*/, + 0x914a30fd /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Nouakchott -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Nouakchott[] ACE_TIME_PROGMEM = "Africa/Nouakchott"; + +const extended::ZoneInfo kZoneAfrica_Nouakchott ACE_TIME_PROGMEM = { + kZoneNameAfrica_Nouakchott /*name*/, + 0x3dc49dba /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Ouagadougou -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Ouagadougou[] ACE_TIME_PROGMEM = "Africa/Ouagadougou"; + +const extended::ZoneInfo kZoneAfrica_Ouagadougou ACE_TIME_PROGMEM = { + kZoneNameAfrica_Ouagadougou /*name*/, + 0x04d7219a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Porto-Novo -> Africa/Lagos +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Porto_Novo[] ACE_TIME_PROGMEM = "Africa/Porto-Novo"; + +const extended::ZoneInfo kZoneAfrica_Porto_Novo ACE_TIME_PROGMEM = { + kZoneNameAfrica_Porto_Novo /*name*/, + 0x3d1bf95d /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Lagos /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Africa/Timbuktu -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAfrica_Timbuktu[] ACE_TIME_PROGMEM = "Africa/Timbuktu"; + +const extended::ZoneInfo kZoneAfrica_Timbuktu ACE_TIME_PROGMEM = { + kZoneNameAfrica_Timbuktu /*name*/, + 0xb164d56f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Anguilla -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Anguilla[] ACE_TIME_PROGMEM = "America/Anguilla"; + +const extended::ZoneInfo kZoneAmerica_Anguilla ACE_TIME_PROGMEM = { + kZoneNameAmerica_Anguilla /*name*/, + 0xafe31333 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Antigua -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Antigua[] ACE_TIME_PROGMEM = "America/Antigua"; + +const extended::ZoneInfo kZoneAmerica_Antigua ACE_TIME_PROGMEM = { + kZoneNameAmerica_Antigua /*name*/, + 0xc067a32f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Argentina/ComodRivadavia -> America/Argentina/Catamarca +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Argentina_ComodRivadavia[] ACE_TIME_PROGMEM = "America/Argentina/ComodRivadavia"; + +const extended::ZoneInfo kZoneAmerica_Argentina_ComodRivadavia ACE_TIME_PROGMEM = { + kZoneNameAmerica_Argentina_ComodRivadavia /*name*/, + 0x22758877 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 6 /*numEras*/, + kZoneEraAmerica_Argentina_Catamarca /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Aruba -> America/Curacao +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Aruba[] ACE_TIME_PROGMEM = "America/Aruba"; + +const extended::ZoneInfo kZoneAmerica_Aruba ACE_TIME_PROGMEM = { + kZoneNameAmerica_Aruba /*name*/, + 0x97cf8651 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Curacao /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Atka -> America/Adak +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Atka[] ACE_TIME_PROGMEM = "America/Atka"; + +const extended::ZoneInfo kZoneAmerica_Atka ACE_TIME_PROGMEM = { + kZoneNameAmerica_Atka /*name*/, + 0x97fe8f27 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Adak /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Buenos_Aires -> America/Argentina/Buenos_Aires +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Buenos_Aires[] ACE_TIME_PROGMEM = "America/Buenos_Aires"; + +const extended::ZoneInfo kZoneAmerica_Buenos_Aires ACE_TIME_PROGMEM = { + kZoneNameAmerica_Buenos_Aires /*name*/, + 0x67d79a05 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 3 /*numEras*/, + kZoneEraAmerica_Argentina_Buenos_Aires /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Catamarca -> America/Argentina/Catamarca +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Catamarca[] ACE_TIME_PROGMEM = "America/Catamarca"; + +const extended::ZoneInfo kZoneAmerica_Catamarca ACE_TIME_PROGMEM = { + kZoneNameAmerica_Catamarca /*name*/, + 0x5036e963 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 6 /*numEras*/, + kZoneEraAmerica_Argentina_Catamarca /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Cayman -> America/Panama +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Cayman[] ACE_TIME_PROGMEM = "America/Cayman"; + +const extended::ZoneInfo kZoneAmerica_Cayman ACE_TIME_PROGMEM = { + kZoneNameAmerica_Cayman /*name*/, + 0x953961df /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Panama /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Coral_Harbour -> America/Atikokan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Coral_Harbour[] ACE_TIME_PROGMEM = "America/Coral_Harbour"; + +const extended::ZoneInfo kZoneAmerica_Coral_Harbour ACE_TIME_PROGMEM = { + kZoneNameAmerica_Coral_Harbour /*name*/, + 0xabcb7569 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Atikokan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Cordoba -> America/Argentina/Cordoba +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Cordoba[] ACE_TIME_PROGMEM = "America/Cordoba"; + +const extended::ZoneInfo kZoneAmerica_Cordoba ACE_TIME_PROGMEM = { + kZoneNameAmerica_Cordoba /*name*/, + 0x5c8a7600 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 3 /*numEras*/, + kZoneEraAmerica_Argentina_Cordoba /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Dominica -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Dominica[] ACE_TIME_PROGMEM = "America/Dominica"; + +const extended::ZoneInfo kZoneAmerica_Dominica ACE_TIME_PROGMEM = { + kZoneNameAmerica_Dominica /*name*/, + 0xcecb4c4a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Ensenada -> America/Tijuana +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Ensenada[] ACE_TIME_PROGMEM = "America/Ensenada"; + +const extended::ZoneInfo kZoneAmerica_Ensenada ACE_TIME_PROGMEM = { + kZoneNameAmerica_Ensenada /*name*/, + 0x7bc95445 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 4 /*numEras*/, + kZoneEraAmerica_Tijuana /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Fort_Wayne -> America/Indiana/Indianapolis +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Fort_Wayne[] ACE_TIME_PROGMEM = "America/Fort_Wayne"; + +const extended::ZoneInfo kZoneAmerica_Fort_Wayne ACE_TIME_PROGMEM = { + kZoneNameAmerica_Fort_Wayne /*name*/, + 0x7eaaaf24 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAmerica_Indiana_Indianapolis /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Godthab -> America/Nuuk +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Godthab[] ACE_TIME_PROGMEM = "America/Godthab"; + +const extended::ZoneInfo kZoneAmerica_Godthab ACE_TIME_PROGMEM = { + kZoneNameAmerica_Godthab /*name*/, + 0x8f7eba1f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Nuuk /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Grenada -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Grenada[] ACE_TIME_PROGMEM = "America/Grenada"; + +const extended::ZoneInfo kZoneAmerica_Grenada ACE_TIME_PROGMEM = { + kZoneNameAmerica_Grenada /*name*/, + 0x968ce4d8 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Guadeloupe -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Guadeloupe[] ACE_TIME_PROGMEM = "America/Guadeloupe"; + +const extended::ZoneInfo kZoneAmerica_Guadeloupe ACE_TIME_PROGMEM = { + kZoneNameAmerica_Guadeloupe /*name*/, + 0xcd1f8a31 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Indianapolis -> America/Indiana/Indianapolis +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Indianapolis[] ACE_TIME_PROGMEM = "America/Indianapolis"; + +const extended::ZoneInfo kZoneAmerica_Indianapolis ACE_TIME_PROGMEM = { + kZoneNameAmerica_Indianapolis /*name*/, + 0x6a009ae1 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAmerica_Indiana_Indianapolis /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Jujuy -> America/Argentina/Jujuy +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Jujuy[] ACE_TIME_PROGMEM = "America/Jujuy"; + +const extended::ZoneInfo kZoneAmerica_Jujuy ACE_TIME_PROGMEM = { + kZoneNameAmerica_Jujuy /*name*/, + 0x9873dbbd /*zoneId*/, + &kZoneContext /*zoneContext*/, + 4 /*numEras*/, + kZoneEraAmerica_Argentina_Jujuy /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Knox_IN -> America/Indiana/Knox +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Knox_IN[] ACE_TIME_PROGMEM = "America/Knox_IN"; + +const extended::ZoneInfo kZoneAmerica_Knox_IN ACE_TIME_PROGMEM = { + kZoneNameAmerica_Knox_IN /*name*/, + 0xc1db9a1c /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAmerica_Indiana_Knox /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Kralendijk -> America/Curacao +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Kralendijk[] ACE_TIME_PROGMEM = "America/Kralendijk"; + +const extended::ZoneInfo kZoneAmerica_Kralendijk ACE_TIME_PROGMEM = { + kZoneNameAmerica_Kralendijk /*name*/, + 0xe7c456c5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Curacao /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Louisville -> America/Kentucky/Louisville +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Louisville[] ACE_TIME_PROGMEM = "America/Louisville"; + +const extended::ZoneInfo kZoneAmerica_Louisville ACE_TIME_PROGMEM = { + kZoneNameAmerica_Louisville /*name*/, + 0x3dcb47ee /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Kentucky_Louisville /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Lower_Princes -> America/Curacao +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Lower_Princes[] ACE_TIME_PROGMEM = "America/Lower_Princes"; + +const extended::ZoneInfo kZoneAmerica_Lower_Princes ACE_TIME_PROGMEM = { + kZoneNameAmerica_Lower_Princes /*name*/, + 0x6ae45b62 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Curacao /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Marigot -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Marigot[] ACE_TIME_PROGMEM = "America/Marigot"; + +const extended::ZoneInfo kZoneAmerica_Marigot ACE_TIME_PROGMEM = { + kZoneNameAmerica_Marigot /*name*/, + 0x3dab3a59 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Mendoza -> America/Argentina/Mendoza +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Mendoza[] ACE_TIME_PROGMEM = "America/Mendoza"; + +const extended::ZoneInfo kZoneAmerica_Mendoza ACE_TIME_PROGMEM = { + kZoneNameAmerica_Mendoza /*name*/, + 0x46b4e054 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 6 /*numEras*/, + kZoneEraAmerica_Argentina_Mendoza /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Montreal -> America/Toronto +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Montreal[] ACE_TIME_PROGMEM = "America/Montreal"; + +const extended::ZoneInfo kZoneAmerica_Montreal ACE_TIME_PROGMEM = { + kZoneNameAmerica_Montreal /*name*/, + 0x203a1ea8 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Toronto /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Montserrat -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Montserrat[] ACE_TIME_PROGMEM = "America/Montserrat"; + +const extended::ZoneInfo kZoneAmerica_Montserrat ACE_TIME_PROGMEM = { + kZoneNameAmerica_Montserrat /*name*/, + 0x199b0a35 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Porto_Acre -> America/Rio_Branco +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Porto_Acre[] ACE_TIME_PROGMEM = "America/Porto_Acre"; + +const extended::ZoneInfo kZoneAmerica_Porto_Acre ACE_TIME_PROGMEM = { + kZoneNameAmerica_Porto_Acre /*name*/, + 0xcce5bf54 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 3 /*numEras*/, + kZoneEraAmerica_Rio_Branco /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Rosario -> America/Argentina/Cordoba +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Rosario[] ACE_TIME_PROGMEM = "America/Rosario"; + +const extended::ZoneInfo kZoneAmerica_Rosario ACE_TIME_PROGMEM = { + kZoneNameAmerica_Rosario /*name*/, + 0xdf448665 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 3 /*numEras*/, + kZoneEraAmerica_Argentina_Cordoba /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Santa_Isabel -> America/Tijuana +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Santa_Isabel[] ACE_TIME_PROGMEM = "America/Santa_Isabel"; + +const extended::ZoneInfo kZoneAmerica_Santa_Isabel ACE_TIME_PROGMEM = { + kZoneNameAmerica_Santa_Isabel /*name*/, + 0xfd18a56c /*zoneId*/, + &kZoneContext /*zoneContext*/, + 4 /*numEras*/, + kZoneEraAmerica_Tijuana /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Shiprock -> America/Denver +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Shiprock[] ACE_TIME_PROGMEM = "America/Shiprock"; + +const extended::ZoneInfo kZoneAmerica_Shiprock ACE_TIME_PROGMEM = { + kZoneNameAmerica_Shiprock /*name*/, + 0x82fb7049 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Denver /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/St_Barthelemy -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_St_Barthelemy[] ACE_TIME_PROGMEM = "America/St_Barthelemy"; + +const extended::ZoneInfo kZoneAmerica_St_Barthelemy ACE_TIME_PROGMEM = { + kZoneNameAmerica_St_Barthelemy /*name*/, + 0x054e6a79 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/St_Kitts -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_St_Kitts[] ACE_TIME_PROGMEM = "America/St_Kitts"; + +const extended::ZoneInfo kZoneAmerica_St_Kitts ACE_TIME_PROGMEM = { + kZoneNameAmerica_St_Kitts /*name*/, + 0x04c0507b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/St_Lucia -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_St_Lucia[] ACE_TIME_PROGMEM = "America/St_Lucia"; + +const extended::ZoneInfo kZoneAmerica_St_Lucia ACE_TIME_PROGMEM = { + kZoneNameAmerica_St_Lucia /*name*/, + 0x04d8b3ba /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/St_Thomas -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_St_Thomas[] ACE_TIME_PROGMEM = "America/St_Thomas"; + +const extended::ZoneInfo kZoneAmerica_St_Thomas ACE_TIME_PROGMEM = { + kZoneNameAmerica_St_Thomas /*name*/, + 0xb1b3d778 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/St_Vincent -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_St_Vincent[] ACE_TIME_PROGMEM = "America/St_Vincent"; + +const extended::ZoneInfo kZoneAmerica_St_Vincent ACE_TIME_PROGMEM = { + kZoneNameAmerica_St_Vincent /*name*/, + 0x8460e523 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Tortola -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Tortola[] ACE_TIME_PROGMEM = "America/Tortola"; + +const extended::ZoneInfo kZoneAmerica_Tortola ACE_TIME_PROGMEM = { + kZoneNameAmerica_Tortola /*name*/, + 0x7931462b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: America/Virgin -> America/Port_of_Spain +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAmerica_Virgin[] ACE_TIME_PROGMEM = "America/Virgin"; + +const extended::ZoneInfo kZoneAmerica_Virgin ACE_TIME_PROGMEM = { + kZoneNameAmerica_Virgin /*name*/, + 0xc2183ab5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Port_of_Spain /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Antarctica/McMurdo -> Pacific/Auckland +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAntarctica_McMurdo[] ACE_TIME_PROGMEM = "Antarctica/McMurdo"; + +const extended::ZoneInfo kZoneAntarctica_McMurdo ACE_TIME_PROGMEM = { + kZoneNameAntarctica_McMurdo /*name*/, + 0x6eeb5585 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Auckland /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Antarctica/South_Pole -> Pacific/Auckland +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAntarctica_South_Pole[] ACE_TIME_PROGMEM = "Antarctica/South_Pole"; + +const extended::ZoneInfo kZoneAntarctica_South_Pole ACE_TIME_PROGMEM = { + kZoneNameAntarctica_South_Pole /*name*/, + 0xcd96b290 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Auckland /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Arctic/Longyearbyen -> Europe/Oslo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameArctic_Longyearbyen[] ACE_TIME_PROGMEM = "Arctic/Longyearbyen"; + +const extended::ZoneInfo kZoneArctic_Longyearbyen ACE_TIME_PROGMEM = { + kZoneNameArctic_Longyearbyen /*name*/, + 0xd23e7859 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Oslo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Aden -> Asia/Riyadh +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Aden[] ACE_TIME_PROGMEM = "Asia/Aden"; + +const extended::ZoneInfo kZoneAsia_Aden ACE_TIME_PROGMEM = { + kZoneNameAsia_Aden /*name*/, + 0x1fa7084a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Riyadh /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Ashkhabad -> Asia/Ashgabat +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Ashkhabad[] ACE_TIME_PROGMEM = "Asia/Ashkhabad"; + +const extended::ZoneInfo kZoneAsia_Ashkhabad ACE_TIME_PROGMEM = { + kZoneNameAsia_Ashkhabad /*name*/, + 0x15454f09 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Ashgabat /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Bahrain -> Asia/Qatar +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Bahrain[] ACE_TIME_PROGMEM = "Asia/Bahrain"; + +const extended::ZoneInfo kZoneAsia_Bahrain ACE_TIME_PROGMEM = { + kZoneNameAsia_Bahrain /*name*/, + 0x9d078487 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Qatar /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Calcutta -> Asia/Kolkata +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Calcutta[] ACE_TIME_PROGMEM = "Asia/Calcutta"; + +const extended::ZoneInfo kZoneAsia_Calcutta ACE_TIME_PROGMEM = { + kZoneNameAsia_Calcutta /*name*/, + 0x328a44c3 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Kolkata /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Chongqing -> Asia/Shanghai +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Chongqing[] ACE_TIME_PROGMEM = "Asia/Chongqing"; + +const extended::ZoneInfo kZoneAsia_Chongqing ACE_TIME_PROGMEM = { + kZoneNameAsia_Chongqing /*name*/, + 0xf937fb90 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Shanghai /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Chungking -> Asia/Shanghai +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Chungking[] ACE_TIME_PROGMEM = "Asia/Chungking"; + +const extended::ZoneInfo kZoneAsia_Chungking ACE_TIME_PROGMEM = { + kZoneNameAsia_Chungking /*name*/, + 0xc7121dd0 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Shanghai /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Dacca -> Asia/Dhaka +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Dacca[] ACE_TIME_PROGMEM = "Asia/Dacca"; + +const extended::ZoneInfo kZoneAsia_Dacca ACE_TIME_PROGMEM = { + kZoneNameAsia_Dacca /*name*/, + 0x14bcac5e /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAsia_Dhaka /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Harbin -> Asia/Shanghai +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Harbin[] ACE_TIME_PROGMEM = "Asia/Harbin"; + +const extended::ZoneInfo kZoneAsia_Harbin ACE_TIME_PROGMEM = { + kZoneNameAsia_Harbin /*name*/, + 0xb5af1186 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Shanghai /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Istanbul -> Europe/Istanbul +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Istanbul[] ACE_TIME_PROGMEM = "Asia/Istanbul"; + +const extended::ZoneInfo kZoneAsia_Istanbul ACE_TIME_PROGMEM = { + kZoneNameAsia_Istanbul /*name*/, + 0x382e7894 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 9 /*numEras*/, + kZoneEraEurope_Istanbul /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Kashgar -> Asia/Urumqi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Kashgar[] ACE_TIME_PROGMEM = "Asia/Kashgar"; + +const extended::ZoneInfo kZoneAsia_Kashgar ACE_TIME_PROGMEM = { + kZoneNameAsia_Kashgar /*name*/, + 0x52955193 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Urumqi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Katmandu -> Asia/Kathmandu +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Katmandu[] ACE_TIME_PROGMEM = "Asia/Katmandu"; + +const extended::ZoneInfo kZoneAsia_Katmandu ACE_TIME_PROGMEM = { + kZoneNameAsia_Katmandu /*name*/, + 0xa7ec12c7 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Kathmandu /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Kuwait -> Asia/Riyadh +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Kuwait[] ACE_TIME_PROGMEM = "Asia/Kuwait"; + +const extended::ZoneInfo kZoneAsia_Kuwait ACE_TIME_PROGMEM = { + kZoneNameAsia_Kuwait /*name*/, + 0xbe1b2f27 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Riyadh /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Macao -> Asia/Macau +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Macao[] ACE_TIME_PROGMEM = "Asia/Macao"; + +const extended::ZoneInfo kZoneAsia_Macao ACE_TIME_PROGMEM = { + kZoneNameAsia_Macao /*name*/, + 0x155f88b3 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Macau /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Muscat -> Asia/Dubai +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Muscat[] ACE_TIME_PROGMEM = "Asia/Muscat"; + +const extended::ZoneInfo kZoneAsia_Muscat ACE_TIME_PROGMEM = { + kZoneNameAsia_Muscat /*name*/, + 0xc2c3565f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Dubai /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Phnom_Penh -> Asia/Bangkok +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Phnom_Penh[] ACE_TIME_PROGMEM = "Asia/Phnom_Penh"; + +const extended::ZoneInfo kZoneAsia_Phnom_Penh ACE_TIME_PROGMEM = { + kZoneNameAsia_Phnom_Penh /*name*/, + 0xc224945e /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Bangkok /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Rangoon -> Asia/Yangon +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Rangoon[] ACE_TIME_PROGMEM = "Asia/Rangoon"; + +const extended::ZoneInfo kZoneAsia_Rangoon ACE_TIME_PROGMEM = { + kZoneNameAsia_Rangoon /*name*/, + 0x6d1217c6 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Yangon /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Saigon -> Asia/Ho_Chi_Minh +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Saigon[] ACE_TIME_PROGMEM = "Asia/Saigon"; + +const extended::ZoneInfo kZoneAsia_Saigon ACE_TIME_PROGMEM = { + kZoneNameAsia_Saigon /*name*/, + 0xcf52f713 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Ho_Chi_Minh /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Tel_Aviv -> Asia/Jerusalem +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Tel_Aviv[] ACE_TIME_PROGMEM = "Asia/Tel_Aviv"; + +const extended::ZoneInfo kZoneAsia_Tel_Aviv ACE_TIME_PROGMEM = { + kZoneNameAsia_Tel_Aviv /*name*/, + 0x166d7c2c /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Jerusalem /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Thimbu -> Asia/Thimphu +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Thimbu[] ACE_TIME_PROGMEM = "Asia/Thimbu"; + +const extended::ZoneInfo kZoneAsia_Thimbu ACE_TIME_PROGMEM = { + kZoneNameAsia_Thimbu /*name*/, + 0xd226e31b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Thimphu /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Ujung_Pandang -> Asia/Makassar +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Ujung_Pandang[] ACE_TIME_PROGMEM = "Asia/Ujung_Pandang"; + +const extended::ZoneInfo kZoneAsia_Ujung_Pandang ACE_TIME_PROGMEM = { + kZoneNameAsia_Ujung_Pandang /*name*/, + 0x5d001eb3 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Makassar /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Ulan_Bator -> Asia/Ulaanbaatar +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Ulan_Bator[] ACE_TIME_PROGMEM = "Asia/Ulan_Bator"; + +const extended::ZoneInfo kZoneAsia_Ulan_Bator ACE_TIME_PROGMEM = { + kZoneNameAsia_Ulan_Bator /*name*/, + 0x394db4d9 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Ulaanbaatar /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Asia/Vientiane -> Asia/Bangkok +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAsia_Vientiane[] ACE_TIME_PROGMEM = "Asia/Vientiane"; + +const extended::ZoneInfo kZoneAsia_Vientiane ACE_TIME_PROGMEM = { + kZoneNameAsia_Vientiane /*name*/, + 0x89d68d75 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Bangkok /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Atlantic/Faeroe -> Atlantic/Faroe +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAtlantic_Faeroe[] ACE_TIME_PROGMEM = "Atlantic/Faeroe"; + +const extended::ZoneInfo kZoneAtlantic_Faeroe ACE_TIME_PROGMEM = { + kZoneNameAtlantic_Faeroe /*name*/, + 0x031ec516 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAtlantic_Faroe /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Atlantic/Jan_Mayen -> Europe/Oslo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAtlantic_Jan_Mayen[] ACE_TIME_PROGMEM = "Atlantic/Jan_Mayen"; + +const extended::ZoneInfo kZoneAtlantic_Jan_Mayen ACE_TIME_PROGMEM = { + kZoneNameAtlantic_Jan_Mayen /*name*/, + 0x5a7535b6 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Oslo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Atlantic/St_Helena -> Africa/Abidjan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAtlantic_St_Helena[] ACE_TIME_PROGMEM = "Atlantic/St_Helena"; + +const extended::ZoneInfo kZoneAtlantic_St_Helena ACE_TIME_PROGMEM = { + kZoneNameAtlantic_St_Helena /*name*/, + 0x451fc5f7 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Abidjan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/ACT -> Australia/Sydney +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_ACT[] ACE_TIME_PROGMEM = "Australia/ACT"; + +const extended::ZoneInfo kZoneAustralia_ACT ACE_TIME_PROGMEM = { + kZoneNameAustralia_ACT /*name*/, + 0x8a970eb2 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Sydney /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/Canberra -> Australia/Sydney +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_Canberra[] ACE_TIME_PROGMEM = "Australia/Canberra"; + +const extended::ZoneInfo kZoneAustralia_Canberra ACE_TIME_PROGMEM = { + kZoneNameAustralia_Canberra /*name*/, + 0x2a09ae58 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Sydney /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/Currie -> Australia/Hobart +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_Currie[] ACE_TIME_PROGMEM = "Australia/Currie"; + +const extended::ZoneInfo kZoneAustralia_Currie ACE_TIME_PROGMEM = { + kZoneNameAustralia_Currie /*name*/, + 0x278b6a24 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Hobart /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/LHI -> Australia/Lord_Howe +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_LHI[] ACE_TIME_PROGMEM = "Australia/LHI"; + +const extended::ZoneInfo kZoneAustralia_LHI ACE_TIME_PROGMEM = { + kZoneNameAustralia_LHI /*name*/, + 0x8a973e17 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Lord_Howe /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/NSW -> Australia/Sydney +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_NSW[] ACE_TIME_PROGMEM = "Australia/NSW"; + +const extended::ZoneInfo kZoneAustralia_NSW ACE_TIME_PROGMEM = { + kZoneNameAustralia_NSW /*name*/, + 0x8a974812 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Sydney /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/North -> Australia/Darwin +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_North[] ACE_TIME_PROGMEM = "Australia/North"; + +const extended::ZoneInfo kZoneAustralia_North ACE_TIME_PROGMEM = { + kZoneNameAustralia_North /*name*/, + 0x8d997165 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Darwin /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/Queensland -> Australia/Brisbane +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_Queensland[] ACE_TIME_PROGMEM = "Australia/Queensland"; + +const extended::ZoneInfo kZoneAustralia_Queensland ACE_TIME_PROGMEM = { + kZoneNameAustralia_Queensland /*name*/, + 0xd326ed0a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Brisbane /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/South -> Australia/Adelaide +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_South[] ACE_TIME_PROGMEM = "Australia/South"; + +const extended::ZoneInfo kZoneAustralia_South ACE_TIME_PROGMEM = { + kZoneNameAustralia_South /*name*/, + 0x8df3f8ad /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Adelaide /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/Tasmania -> Australia/Hobart +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_Tasmania[] ACE_TIME_PROGMEM = "Australia/Tasmania"; + +const extended::ZoneInfo kZoneAustralia_Tasmania ACE_TIME_PROGMEM = { + kZoneNameAustralia_Tasmania /*name*/, + 0xe6d76648 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Hobart /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/Victoria -> Australia/Melbourne +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_Victoria[] ACE_TIME_PROGMEM = "Australia/Victoria"; + +const extended::ZoneInfo kZoneAustralia_Victoria ACE_TIME_PROGMEM = { + kZoneNameAustralia_Victoria /*name*/, + 0x0260d5db /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Melbourne /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/West -> Australia/Perth +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_West[] ACE_TIME_PROGMEM = "Australia/West"; + +const extended::ZoneInfo kZoneAustralia_West ACE_TIME_PROGMEM = { + kZoneNameAustralia_West /*name*/, + 0xdd858a5d /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAustralia_Perth /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Australia/Yancowinna -> Australia/Broken_Hill +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameAustralia_Yancowinna[] ACE_TIME_PROGMEM = "Australia/Yancowinna"; + +const extended::ZoneInfo kZoneAustralia_Yancowinna ACE_TIME_PROGMEM = { + kZoneNameAustralia_Yancowinna /*name*/, + 0x90bac131 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAustralia_Broken_Hill /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Brazil/Acre -> America/Rio_Branco +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameBrazil_Acre[] ACE_TIME_PROGMEM = "Brazil/Acre"; + +const extended::ZoneInfo kZoneBrazil_Acre ACE_TIME_PROGMEM = { + kZoneNameBrazil_Acre /*name*/, + 0x66934f93 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 3 /*numEras*/, + kZoneEraAmerica_Rio_Branco /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Brazil/DeNoronha -> America/Noronha +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameBrazil_DeNoronha[] ACE_TIME_PROGMEM = "Brazil/DeNoronha"; + +const extended::ZoneInfo kZoneBrazil_DeNoronha ACE_TIME_PROGMEM = { + kZoneNameBrazil_DeNoronha /*name*/, + 0x9b4cb496 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 5 /*numEras*/, + kZoneEraAmerica_Noronha /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Brazil/East -> America/Sao_Paulo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameBrazil_East[] ACE_TIME_PROGMEM = "Brazil/East"; + +const extended::ZoneInfo kZoneBrazil_East ACE_TIME_PROGMEM = { + kZoneNameBrazil_East /*name*/, + 0x669578c5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Sao_Paulo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Brazil/West -> America/Manaus +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameBrazil_West[] ACE_TIME_PROGMEM = "Brazil/West"; + +const extended::ZoneInfo kZoneBrazil_West ACE_TIME_PROGMEM = { + kZoneNameBrazil_West /*name*/, + 0x669f689b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Manaus /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Canada/Atlantic -> America/Halifax +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCanada_Atlantic[] ACE_TIME_PROGMEM = "Canada/Atlantic"; + +const extended::ZoneInfo kZoneCanada_Atlantic ACE_TIME_PROGMEM = { + kZoneNameCanada_Atlantic /*name*/, + 0x536b119c /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Halifax /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Canada/Central -> America/Winnipeg +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCanada_Central[] ACE_TIME_PROGMEM = "Canada/Central"; + +const extended::ZoneInfo kZoneCanada_Central ACE_TIME_PROGMEM = { + kZoneNameCanada_Central /*name*/, + 0x626710f5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAmerica_Winnipeg /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Canada/Eastern -> America/Toronto +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCanada_Eastern[] ACE_TIME_PROGMEM = "Canada/Eastern"; + +const extended::ZoneInfo kZoneCanada_Eastern ACE_TIME_PROGMEM = { + kZoneNameCanada_Eastern /*name*/, + 0xf3612d5e /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Toronto /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Canada/Mountain -> America/Edmonton +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCanada_Mountain[] ACE_TIME_PROGMEM = "Canada/Mountain"; + +const extended::ZoneInfo kZoneCanada_Mountain ACE_TIME_PROGMEM = { + kZoneNameCanada_Mountain /*name*/, + 0xfb8a8217 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Edmonton /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Canada/Newfoundland -> America/St_Johns +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCanada_Newfoundland[] ACE_TIME_PROGMEM = "Canada/Newfoundland"; + +const extended::ZoneInfo kZoneCanada_Newfoundland ACE_TIME_PROGMEM = { + kZoneNameCanada_Newfoundland /*name*/, + 0xb396e991 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAmerica_St_Johns /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Canada/Pacific -> America/Vancouver +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCanada_Pacific[] ACE_TIME_PROGMEM = "Canada/Pacific"; + +const extended::ZoneInfo kZoneCanada_Pacific ACE_TIME_PROGMEM = { + kZoneNameCanada_Pacific /*name*/, + 0x40fa3c7b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Vancouver /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Canada/Saskatchewan -> America/Regina +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCanada_Saskatchewan[] ACE_TIME_PROGMEM = "Canada/Saskatchewan"; + +const extended::ZoneInfo kZoneCanada_Saskatchewan ACE_TIME_PROGMEM = { + kZoneNameCanada_Saskatchewan /*name*/, + 0x77311f49 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Regina /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Canada/Yukon -> America/Whitehorse +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCanada_Yukon[] ACE_TIME_PROGMEM = "Canada/Yukon"; + +const extended::ZoneInfo kZoneCanada_Yukon ACE_TIME_PROGMEM = { + kZoneNameCanada_Yukon /*name*/, + 0x78dd35c2 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAmerica_Whitehorse /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Chile/Continental -> America/Santiago +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameChile_Continental[] ACE_TIME_PROGMEM = "Chile/Continental"; + +const extended::ZoneInfo kZoneChile_Continental ACE_TIME_PROGMEM = { + kZoneNameChile_Continental /*name*/, + 0x7e2bdb18 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Santiago /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Chile/EasterIsland -> Pacific/Easter +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameChile_EasterIsland[] ACE_TIME_PROGMEM = "Chile/EasterIsland"; + +const extended::ZoneInfo kZoneChile_EasterIsland ACE_TIME_PROGMEM = { + kZoneNameChile_EasterIsland /*name*/, + 0xb0982af8 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Easter /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Cuba -> America/Havana +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameCuba[] ACE_TIME_PROGMEM = "Cuba"; + +const extended::ZoneInfo kZoneCuba ACE_TIME_PROGMEM = { + kZoneNameCuba /*name*/, + 0x7c83cba0 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Havana /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Egypt -> Africa/Cairo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEgypt[] ACE_TIME_PROGMEM = "Egypt"; + +const extended::ZoneInfo kZoneEgypt ACE_TIME_PROGMEM = { + kZoneNameEgypt /*name*/, + 0x0d1a278e /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Cairo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Eire -> Europe/Dublin +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEire[] ACE_TIME_PROGMEM = "Eire"; + +const extended::ZoneInfo kZoneEire ACE_TIME_PROGMEM = { + kZoneNameEire /*name*/, + 0x7c84b36a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Dublin /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Etc/GMT+0 -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEtc_GMT_PLUS_0[] ACE_TIME_PROGMEM = "Etc/GMT+0"; + +const extended::ZoneInfo kZoneEtc_GMT_PLUS_0 ACE_TIME_PROGMEM = { + kZoneNameEtc_GMT_PLUS_0 /*name*/, + 0x9d13da13 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Etc/GMT-0 -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEtc_GMT_0[] ACE_TIME_PROGMEM = "Etc/GMT-0"; + +const extended::ZoneInfo kZoneEtc_GMT_0 ACE_TIME_PROGMEM = { + kZoneNameEtc_GMT_0 /*name*/, + 0x9d13da55 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Etc/GMT0 -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEtc_GMT0[] ACE_TIME_PROGMEM = "Etc/GMT0"; + +const extended::ZoneInfo kZoneEtc_GMT0 ACE_TIME_PROGMEM = { + kZoneNameEtc_GMT0 /*name*/, + 0xf53ea988 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Etc/Greenwich -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEtc_Greenwich[] ACE_TIME_PROGMEM = "Etc/Greenwich"; + +const extended::ZoneInfo kZoneEtc_Greenwich ACE_TIME_PROGMEM = { + kZoneNameEtc_Greenwich /*name*/, + 0x26daa98c /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Etc/UCT -> Etc/UTC +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEtc_UCT[] ACE_TIME_PROGMEM = "Etc/UCT"; + +const extended::ZoneInfo kZoneEtc_UCT ACE_TIME_PROGMEM = { + kZoneNameEtc_UCT /*name*/, + 0xd8e3189c /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_UTC /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Etc/Universal -> Etc/UTC +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEtc_Universal[] ACE_TIME_PROGMEM = "Etc/Universal"; + +const extended::ZoneInfo kZoneEtc_Universal ACE_TIME_PROGMEM = { + kZoneNameEtc_Universal /*name*/, + 0x2f8cb9a9 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_UTC /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Etc/Zulu -> Etc/UTC +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEtc_Zulu[] ACE_TIME_PROGMEM = "Etc/Zulu"; + +const extended::ZoneInfo kZoneEtc_Zulu ACE_TIME_PROGMEM = { + kZoneNameEtc_Zulu /*name*/, + 0xf549c240 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_UTC /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Belfast -> Europe/London +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Belfast[] ACE_TIME_PROGMEM = "Europe/Belfast"; + +const extended::ZoneInfo kZoneEurope_Belfast ACE_TIME_PROGMEM = { + kZoneNameEurope_Belfast /*name*/, + 0xd07dd1e5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_London /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Bratislava -> Europe/Prague +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Bratislava[] ACE_TIME_PROGMEM = "Europe/Bratislava"; + +const extended::ZoneInfo kZoneEurope_Bratislava ACE_TIME_PROGMEM = { + kZoneNameEurope_Bratislava /*name*/, + 0xda493bed /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Prague /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Busingen -> Europe/Zurich +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Busingen[] ACE_TIME_PROGMEM = "Europe/Busingen"; + +const extended::ZoneInfo kZoneEurope_Busingen ACE_TIME_PROGMEM = { + kZoneNameEurope_Busingen /*name*/, + 0xc06d2cdf /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Zurich /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Guernsey -> Europe/London +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Guernsey[] ACE_TIME_PROGMEM = "Europe/Guernsey"; + +const extended::ZoneInfo kZoneEurope_Guernsey ACE_TIME_PROGMEM = { + kZoneNameEurope_Guernsey /*name*/, + 0x3db12c16 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_London /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Isle_of_Man -> Europe/London +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Isle_of_Man[] ACE_TIME_PROGMEM = "Europe/Isle_of_Man"; + +const extended::ZoneInfo kZoneEurope_Isle_of_Man ACE_TIME_PROGMEM = { + kZoneNameEurope_Isle_of_Man /*name*/, + 0xeaf84580 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_London /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Jersey -> Europe/London +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Jersey[] ACE_TIME_PROGMEM = "Europe/Jersey"; + +const extended::ZoneInfo kZoneEurope_Jersey ACE_TIME_PROGMEM = { + kZoneNameEurope_Jersey /*name*/, + 0x570dae76 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_London /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Ljubljana -> Europe/Belgrade +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Ljubljana[] ACE_TIME_PROGMEM = "Europe/Ljubljana"; + +const extended::ZoneInfo kZoneEurope_Ljubljana ACE_TIME_PROGMEM = { + kZoneNameEurope_Ljubljana /*name*/, + 0xbd98cdb7 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Belgrade /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Mariehamn -> Europe/Helsinki +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Mariehamn[] ACE_TIME_PROGMEM = "Europe/Mariehamn"; + +const extended::ZoneInfo kZoneEurope_Mariehamn ACE_TIME_PROGMEM = { + kZoneNameEurope_Mariehamn /*name*/, + 0x0caa6496 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Helsinki /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Nicosia -> Asia/Nicosia +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Nicosia[] ACE_TIME_PROGMEM = "Europe/Nicosia"; + +const extended::ZoneInfo kZoneEurope_Nicosia ACE_TIME_PROGMEM = { + kZoneNameEurope_Nicosia /*name*/, + 0x74efab8a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Nicosia /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Podgorica -> Europe/Belgrade +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Podgorica[] ACE_TIME_PROGMEM = "Europe/Podgorica"; + +const extended::ZoneInfo kZoneEurope_Podgorica ACE_TIME_PROGMEM = { + kZoneNameEurope_Podgorica /*name*/, + 0x1c1a499c /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Belgrade /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/San_Marino -> Europe/Rome +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_San_Marino[] ACE_TIME_PROGMEM = "Europe/San_Marino"; + +const extended::ZoneInfo kZoneEurope_San_Marino ACE_TIME_PROGMEM = { + kZoneNameEurope_San_Marino /*name*/, + 0xcef7724b /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Rome /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Sarajevo -> Europe/Belgrade +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Sarajevo[] ACE_TIME_PROGMEM = "Europe/Sarajevo"; + +const extended::ZoneInfo kZoneEurope_Sarajevo ACE_TIME_PROGMEM = { + kZoneNameEurope_Sarajevo /*name*/, + 0x6a576c3f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Belgrade /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Skopje -> Europe/Belgrade +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Skopje[] ACE_TIME_PROGMEM = "Europe/Skopje"; + +const extended::ZoneInfo kZoneEurope_Skopje ACE_TIME_PROGMEM = { + kZoneNameEurope_Skopje /*name*/, + 0x6c76fdd0 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Belgrade /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Tiraspol -> Europe/Chisinau +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Tiraspol[] ACE_TIME_PROGMEM = "Europe/Tiraspol"; + +const extended::ZoneInfo kZoneEurope_Tiraspol ACE_TIME_PROGMEM = { + kZoneNameEurope_Tiraspol /*name*/, + 0xbe704472 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Chisinau /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Vaduz -> Europe/Zurich +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Vaduz[] ACE_TIME_PROGMEM = "Europe/Vaduz"; + +const extended::ZoneInfo kZoneEurope_Vaduz ACE_TIME_PROGMEM = { + kZoneNameEurope_Vaduz /*name*/, + 0xfbb81bae /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Zurich /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Vatican -> Europe/Rome +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Vatican[] ACE_TIME_PROGMEM = "Europe/Vatican"; + +const extended::ZoneInfo kZoneEurope_Vatican ACE_TIME_PROGMEM = { + kZoneNameEurope_Vatican /*name*/, + 0xcb485dca /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Rome /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Europe/Zagreb -> Europe/Belgrade +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameEurope_Zagreb[] ACE_TIME_PROGMEM = "Europe/Zagreb"; + +const extended::ZoneInfo kZoneEurope_Zagreb ACE_TIME_PROGMEM = { + kZoneNameEurope_Zagreb /*name*/, + 0x7c11c9ff /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Belgrade /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: GB -> Europe/London +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameGB[] ACE_TIME_PROGMEM = "GB"; + +const extended::ZoneInfo kZoneGB ACE_TIME_PROGMEM = { + kZoneNameGB /*name*/, + 0x005973ae /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_London /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: GB-Eire -> Europe/London +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameGB_Eire[] ACE_TIME_PROGMEM = "GB-Eire"; + +const extended::ZoneInfo kZoneGB_Eire ACE_TIME_PROGMEM = { + kZoneNameGB_Eire /*name*/, + 0xfa70e300 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_London /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: GMT -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameGMT[] ACE_TIME_PROGMEM = "GMT"; + +const extended::ZoneInfo kZoneGMT ACE_TIME_PROGMEM = { + kZoneNameGMT /*name*/, + 0x0b87eb2d /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: GMT+0 -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameGMT_PLUS_0[] ACE_TIME_PROGMEM = "GMT+0"; + +const extended::ZoneInfo kZoneGMT_PLUS_0 ACE_TIME_PROGMEM = { + kZoneNameGMT_PLUS_0 /*name*/, + 0x0d2f7028 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: GMT-0 -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameGMT_0[] ACE_TIME_PROGMEM = "GMT-0"; + +const extended::ZoneInfo kZoneGMT_0 ACE_TIME_PROGMEM = { + kZoneNameGMT_0 /*name*/, + 0x0d2f706a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: GMT0 -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameGMT0[] ACE_TIME_PROGMEM = "GMT0"; + +const extended::ZoneInfo kZoneGMT0 ACE_TIME_PROGMEM = { + kZoneNameGMT0 /*name*/, + 0x7c8550fd /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Greenwich -> Etc/GMT +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameGreenwich[] ACE_TIME_PROGMEM = "Greenwich"; + +const extended::ZoneInfo kZoneGreenwich ACE_TIME_PROGMEM = { + kZoneNameGreenwich /*name*/, + 0xc84d4221 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_GMT /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Hongkong -> Asia/Hong_Kong +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameHongkong[] ACE_TIME_PROGMEM = "Hongkong"; + +const extended::ZoneInfo kZoneHongkong ACE_TIME_PROGMEM = { + kZoneNameHongkong /*name*/, + 0x56d36560 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Hong_Kong /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Iceland -> Atlantic/Reykjavik +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameIceland[] ACE_TIME_PROGMEM = "Iceland"; + +const extended::ZoneInfo kZoneIceland ACE_TIME_PROGMEM = { + kZoneNameIceland /*name*/, + 0xe56a35b5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAtlantic_Reykjavik /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Indian/Antananarivo -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameIndian_Antananarivo[] ACE_TIME_PROGMEM = "Indian/Antananarivo"; + +const extended::ZoneInfo kZoneIndian_Antananarivo ACE_TIME_PROGMEM = { + kZoneNameIndian_Antananarivo /*name*/, + 0x9ebf5289 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Indian/Comoro -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameIndian_Comoro[] ACE_TIME_PROGMEM = "Indian/Comoro"; + +const extended::ZoneInfo kZoneIndian_Comoro ACE_TIME_PROGMEM = { + kZoneNameIndian_Comoro /*name*/, + 0x45f4deb6 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Indian/Mayotte -> Africa/Nairobi +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameIndian_Mayotte[] ACE_TIME_PROGMEM = "Indian/Mayotte"; + +const extended::ZoneInfo kZoneIndian_Mayotte ACE_TIME_PROGMEM = { + kZoneNameIndian_Mayotte /*name*/, + 0xe6880bca /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAfrica_Nairobi /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Iran -> Asia/Tehran +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameIran[] ACE_TIME_PROGMEM = "Iran"; + +const extended::ZoneInfo kZoneIran ACE_TIME_PROGMEM = { + kZoneNameIran /*name*/, + 0x7c87090f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Tehran /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Israel -> Asia/Jerusalem +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameIsrael[] ACE_TIME_PROGMEM = "Israel"; + +const extended::ZoneInfo kZoneIsrael ACE_TIME_PROGMEM = { + kZoneNameIsrael /*name*/, + 0xba88c9e5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Jerusalem /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Jamaica -> America/Jamaica +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameJamaica[] ACE_TIME_PROGMEM = "Jamaica"; + +const extended::ZoneInfo kZoneJamaica ACE_TIME_PROGMEM = { + kZoneNameJamaica /*name*/, + 0x2e44fdab /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Jamaica /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Japan -> Asia/Tokyo +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameJapan[] ACE_TIME_PROGMEM = "Japan"; + +const extended::ZoneInfo kZoneJapan ACE_TIME_PROGMEM = { + kZoneNameJapan /*name*/, + 0x0d712f8f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Tokyo /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Kwajalein -> Pacific/Kwajalein +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameKwajalein[] ACE_TIME_PROGMEM = "Kwajalein"; + +const extended::ZoneInfo kZoneKwajalein ACE_TIME_PROGMEM = { + kZoneNameKwajalein /*name*/, + 0x0e57afbb /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Kwajalein /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Libya -> Africa/Tripoli +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameLibya[] ACE_TIME_PROGMEM = "Libya"; + +const extended::ZoneInfo kZoneLibya ACE_TIME_PROGMEM = { + kZoneNameLibya /*name*/, + 0x0d998b16 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 3 /*numEras*/, + kZoneEraAfrica_Tripoli /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Mexico/BajaNorte -> America/Tijuana +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameMexico_BajaNorte[] ACE_TIME_PROGMEM = "Mexico/BajaNorte"; + +const extended::ZoneInfo kZoneMexico_BajaNorte ACE_TIME_PROGMEM = { + kZoneNameMexico_BajaNorte /*name*/, + 0xfcf7150f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 4 /*numEras*/, + kZoneEraAmerica_Tijuana /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Mexico/BajaSur -> America/Mazatlan +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameMexico_BajaSur[] ACE_TIME_PROGMEM = "Mexico/BajaSur"; + +const extended::ZoneInfo kZoneMexico_BajaSur ACE_TIME_PROGMEM = { + kZoneNameMexico_BajaSur /*name*/, + 0x08ee3641 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Mazatlan /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Mexico/General -> America/Mexico_City +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameMexico_General[] ACE_TIME_PROGMEM = "Mexico/General"; + +const extended::ZoneInfo kZoneMexico_General ACE_TIME_PROGMEM = { + kZoneNameMexico_General /*name*/, + 0x93711d57 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 3 /*numEras*/, + kZoneEraAmerica_Mexico_City /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: NZ -> Pacific/Auckland +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameNZ[] ACE_TIME_PROGMEM = "NZ"; + +const extended::ZoneInfo kZoneNZ ACE_TIME_PROGMEM = { + kZoneNameNZ /*name*/, + 0x005974ad /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Auckland /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: NZ-CHAT -> Pacific/Chatham +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameNZ_CHAT[] ACE_TIME_PROGMEM = "NZ-CHAT"; + +const extended::ZoneInfo kZoneNZ_CHAT ACE_TIME_PROGMEM = { + kZoneNameNZ_CHAT /*name*/, + 0x4d42afda /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Chatham /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Navajo -> America/Denver +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameNavajo[] ACE_TIME_PROGMEM = "Navajo"; + +const extended::ZoneInfo kZoneNavajo ACE_TIME_PROGMEM = { + kZoneNameNavajo /*name*/, + 0xc4ef0e24 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Denver /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: PRC -> Asia/Shanghai +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePRC[] ACE_TIME_PROGMEM = "PRC"; + +const extended::ZoneInfo kZonePRC ACE_TIME_PROGMEM = { + kZoneNamePRC /*name*/, + 0x0b88120a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Shanghai /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Pacific/Johnston -> Pacific/Honolulu +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePacific_Johnston[] ACE_TIME_PROGMEM = "Pacific/Johnston"; + +const extended::ZoneInfo kZonePacific_Johnston ACE_TIME_PROGMEM = { + kZoneNamePacific_Johnston /*name*/, + 0xb15d7b36 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Honolulu /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Pacific/Midway -> Pacific/Pago_Pago +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePacific_Midway[] ACE_TIME_PROGMEM = "Pacific/Midway"; + +const extended::ZoneInfo kZonePacific_Midway ACE_TIME_PROGMEM = { + kZoneNamePacific_Midway /*name*/, + 0xe286d38e /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Pago_Pago /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Pacific/Ponape -> Pacific/Pohnpei +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePacific_Ponape[] ACE_TIME_PROGMEM = "Pacific/Ponape"; + +const extended::ZoneInfo kZonePacific_Ponape ACE_TIME_PROGMEM = { + kZoneNamePacific_Ponape /*name*/, + 0xe9f80086 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Pohnpei /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Pacific/Saipan -> Pacific/Guam +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePacific_Saipan[] ACE_TIME_PROGMEM = "Pacific/Saipan"; + +const extended::ZoneInfo kZonePacific_Saipan ACE_TIME_PROGMEM = { + kZoneNamePacific_Saipan /*name*/, + 0xeff7a35f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraPacific_Guam /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Pacific/Samoa -> Pacific/Pago_Pago +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePacific_Samoa[] ACE_TIME_PROGMEM = "Pacific/Samoa"; + +const extended::ZoneInfo kZonePacific_Samoa ACE_TIME_PROGMEM = { + kZoneNamePacific_Samoa /*name*/, + 0x8b2699b4 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Pago_Pago /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Pacific/Truk -> Pacific/Chuuk +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePacific_Truk[] ACE_TIME_PROGMEM = "Pacific/Truk"; + +const extended::ZoneInfo kZonePacific_Truk ACE_TIME_PROGMEM = { + kZoneNamePacific_Truk /*name*/, + 0x234010a9 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Chuuk /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Pacific/Yap -> Pacific/Chuuk +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePacific_Yap[] ACE_TIME_PROGMEM = "Pacific/Yap"; + +const extended::ZoneInfo kZonePacific_Yap ACE_TIME_PROGMEM = { + kZoneNamePacific_Yap /*name*/, + 0xbb40138d /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Chuuk /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Poland -> Europe/Warsaw +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePoland[] ACE_TIME_PROGMEM = "Poland"; + +const extended::ZoneInfo kZonePoland ACE_TIME_PROGMEM = { + kZoneNamePoland /*name*/, + 0xca913b23 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Warsaw /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Portugal -> Europe/Lisbon +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNamePortugal[] ACE_TIME_PROGMEM = "Portugal"; + +const extended::ZoneInfo kZonePortugal ACE_TIME_PROGMEM = { + kZoneNamePortugal /*name*/, + 0xc3274593 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEurope_Lisbon /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: ROC -> Asia/Taipei +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameROC[] ACE_TIME_PROGMEM = "ROC"; + +const extended::ZoneInfo kZoneROC ACE_TIME_PROGMEM = { + kZoneNameROC /*name*/, + 0x0b881a29 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Taipei /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: ROK -> Asia/Seoul +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameROK[] ACE_TIME_PROGMEM = "ROK"; + +const extended::ZoneInfo kZoneROK ACE_TIME_PROGMEM = { + kZoneNameROK /*name*/, + 0x0b881a31 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Seoul /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Singapore -> Asia/Singapore +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameSingapore[] ACE_TIME_PROGMEM = "Singapore"; + +const extended::ZoneInfo kZoneSingapore ACE_TIME_PROGMEM = { + kZoneNameSingapore /*name*/, + 0xa8598c8d /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAsia_Singapore /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Turkey -> Europe/Istanbul +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameTurkey[] ACE_TIME_PROGMEM = "Turkey"; + +const extended::ZoneInfo kZoneTurkey ACE_TIME_PROGMEM = { + kZoneNameTurkey /*name*/, + 0xd455e469 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 9 /*numEras*/, + kZoneEraEurope_Istanbul /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: UCT -> Etc/UTC +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUCT[] ACE_TIME_PROGMEM = "UCT"; + +const extended::ZoneInfo kZoneUCT ACE_TIME_PROGMEM = { + kZoneNameUCT /*name*/, + 0x0b882571 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_UTC /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Alaska -> America/Anchorage +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Alaska[] ACE_TIME_PROGMEM = "US/Alaska"; + +const extended::ZoneInfo kZoneUS_Alaska ACE_TIME_PROGMEM = { + kZoneNameUS_Alaska /*name*/, + 0xfa300bc9 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Anchorage /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Aleutian -> America/Adak +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Aleutian[] ACE_TIME_PROGMEM = "US/Aleutian"; + +const extended::ZoneInfo kZoneUS_Aleutian ACE_TIME_PROGMEM = { + kZoneNameUS_Aleutian /*name*/, + 0x4fe013ef /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Adak /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Arizona -> America/Phoenix +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Arizona[] ACE_TIME_PROGMEM = "US/Arizona"; + +const extended::ZoneInfo kZoneUS_Arizona ACE_TIME_PROGMEM = { + kZoneNameUS_Arizona /*name*/, + 0x4ec52670 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Phoenix /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Central -> America/Chicago +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Central[] ACE_TIME_PROGMEM = "US/Central"; + +const extended::ZoneInfo kZoneUS_Central ACE_TIME_PROGMEM = { + kZoneNameUS_Central /*name*/, + 0xcabdcb25 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Chicago /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/East-Indiana -> America/Indiana/Indianapolis +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_East_Indiana[] ACE_TIME_PROGMEM = "US/East-Indiana"; + +const extended::ZoneInfo kZoneUS_East_Indiana ACE_TIME_PROGMEM = { + kZoneNameUS_East_Indiana /*name*/, + 0x6dcf558a /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAmerica_Indiana_Indianapolis /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Eastern -> America/New_York +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Eastern[] ACE_TIME_PROGMEM = "US/Eastern"; + +const extended::ZoneInfo kZoneUS_Eastern ACE_TIME_PROGMEM = { + kZoneNameUS_Eastern /*name*/, + 0x5bb7e78e /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_New_York /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Hawaii -> Pacific/Honolulu +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Hawaii[] ACE_TIME_PROGMEM = "US/Hawaii"; + +const extended::ZoneInfo kZoneUS_Hawaii ACE_TIME_PROGMEM = { + kZoneNameUS_Hawaii /*name*/, + 0x09c8de2f /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Honolulu /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Indiana-Starke -> America/Indiana/Knox +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Indiana_Starke[] ACE_TIME_PROGMEM = "US/Indiana-Starke"; + +const extended::ZoneInfo kZoneUS_Indiana_Starke ACE_TIME_PROGMEM = { + kZoneNameUS_Indiana_Starke /*name*/, + 0x67977be7 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAmerica_Indiana_Knox /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Michigan -> America/Detroit +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Michigan[] ACE_TIME_PROGMEM = "US/Michigan"; + +const extended::ZoneInfo kZoneUS_Michigan ACE_TIME_PROGMEM = { + kZoneNameUS_Michigan /*name*/, + 0x766bb7bc /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Detroit /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Mountain -> America/Denver +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Mountain[] ACE_TIME_PROGMEM = "US/Mountain"; + +const extended::ZoneInfo kZoneUS_Mountain ACE_TIME_PROGMEM = { + kZoneNameUS_Mountain /*name*/, + 0x6eb88247 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Denver /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Pacific -> America/Los_Angeles +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Pacific[] ACE_TIME_PROGMEM = "US/Pacific"; + +const extended::ZoneInfo kZoneUS_Pacific ACE_TIME_PROGMEM = { + kZoneNameUS_Pacific /*name*/, + 0xa950f6ab /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraAmerica_Los_Angeles /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: US/Samoa -> Pacific/Pago_Pago +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUS_Samoa[] ACE_TIME_PROGMEM = "US/Samoa"; + +const extended::ZoneInfo kZoneUS_Samoa ACE_TIME_PROGMEM = { + kZoneNameUS_Samoa /*name*/, + 0x566821cd /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraPacific_Pago_Pago /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: UTC -> Etc/UTC +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUTC[] ACE_TIME_PROGMEM = "UTC"; + +const extended::ZoneInfo kZoneUTC ACE_TIME_PROGMEM = { + kZoneNameUTC /*name*/, + 0x0b882791 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_UTC /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Universal -> Etc/UTC +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameUniversal[] ACE_TIME_PROGMEM = "Universal"; + +const extended::ZoneInfo kZoneUniversal ACE_TIME_PROGMEM = { + kZoneNameUniversal /*name*/, + 0xd0ff523e /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_UTC /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: W-SU -> Europe/Moscow +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameW_SU[] ACE_TIME_PROGMEM = "W-SU"; + +const extended::ZoneInfo kZoneW_SU ACE_TIME_PROGMEM = { + kZoneNameW_SU /*name*/, + 0x7c8d8ef1 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 3 /*numEras*/, + kZoneEraEurope_Moscow /*eras*/, +}; + +//--------------------------------------------------------------------------- +// Link name: Zulu -> Etc/UTC +// Memory (8-bit): 11 +// Memory (32-bit): 20 +//--------------------------------------------------------------------------- + +static const char kZoneNameZulu[] ACE_TIME_PROGMEM = "Zulu"; + +const extended::ZoneInfo kZoneZulu ACE_TIME_PROGMEM = { + kZoneNameZulu /*name*/, + 0x7c9069b5 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 1 /*numEras*/, + kZoneEraEtc_UTC /*eras*/, +}; + } } diff --git a/src/ace_time/zonedbx/zone_infos.h b/src/ace_time/zonedbx/zone_infos.h index b246929d5..a3d8b7289 100644 --- a/src/ace_time/zonedbx/zone_infos.h +++ b/src/ace_time/zonedbx/zone_infos.h @@ -828,215 +828,422 @@ const uint32_t kZoneIdWET = 0x0b882e35; // WET // Supported links: 207 //--------------------------------------------------------------------------- -extern const extended::ZoneInfo& kZoneAfrica_Addis_Ababa; // Africa/Addis_Ababa -> Africa/Nairobi -extern const extended::ZoneInfo& kZoneAfrica_Asmara; // Africa/Asmara -> Africa/Nairobi -extern const extended::ZoneInfo& kZoneAfrica_Asmera; // Africa/Asmera -> Africa/Nairobi -extern const extended::ZoneInfo& kZoneAfrica_Bamako; // Africa/Bamako -> Africa/Abidjan -extern const extended::ZoneInfo& kZoneAfrica_Bangui; // Africa/Bangui -> Africa/Lagos -extern const extended::ZoneInfo& kZoneAfrica_Banjul; // Africa/Banjul -> Africa/Abidjan -extern const extended::ZoneInfo& kZoneAfrica_Blantyre; // Africa/Blantyre -> Africa/Maputo -extern const extended::ZoneInfo& kZoneAfrica_Brazzaville; // Africa/Brazzaville -> Africa/Lagos -extern const extended::ZoneInfo& kZoneAfrica_Bujumbura; // Africa/Bujumbura -> Africa/Maputo -extern const extended::ZoneInfo& kZoneAfrica_Conakry; // Africa/Conakry -> Africa/Abidjan -extern const extended::ZoneInfo& kZoneAfrica_Dakar; // Africa/Dakar -> Africa/Abidjan -extern const extended::ZoneInfo& kZoneAfrica_Dar_es_Salaam; // Africa/Dar_es_Salaam -> Africa/Nairobi -extern const extended::ZoneInfo& kZoneAfrica_Djibouti; // Africa/Djibouti -> Africa/Nairobi -extern const extended::ZoneInfo& kZoneAfrica_Douala; // Africa/Douala -> Africa/Lagos -extern const extended::ZoneInfo& kZoneAfrica_Freetown; // Africa/Freetown -> Africa/Abidjan -extern const extended::ZoneInfo& kZoneAfrica_Gaborone; // Africa/Gaborone -> Africa/Maputo -extern const extended::ZoneInfo& kZoneAfrica_Harare; // Africa/Harare -> Africa/Maputo -extern const extended::ZoneInfo& kZoneAfrica_Kampala; // Africa/Kampala -> Africa/Nairobi -extern const extended::ZoneInfo& kZoneAfrica_Kigali; // Africa/Kigali -> Africa/Maputo -extern const extended::ZoneInfo& kZoneAfrica_Kinshasa; // Africa/Kinshasa -> Africa/Lagos -extern const extended::ZoneInfo& kZoneAfrica_Libreville; // Africa/Libreville -> Africa/Lagos -extern const extended::ZoneInfo& kZoneAfrica_Lome; // Africa/Lome -> Africa/Abidjan -extern const extended::ZoneInfo& kZoneAfrica_Luanda; // Africa/Luanda -> Africa/Lagos -extern const extended::ZoneInfo& kZoneAfrica_Lubumbashi; // Africa/Lubumbashi -> Africa/Maputo -extern const extended::ZoneInfo& kZoneAfrica_Lusaka; // Africa/Lusaka -> Africa/Maputo -extern const extended::ZoneInfo& kZoneAfrica_Malabo; // Africa/Malabo -> Africa/Lagos -extern const extended::ZoneInfo& kZoneAfrica_Maseru; // Africa/Maseru -> Africa/Johannesburg -extern const extended::ZoneInfo& kZoneAfrica_Mbabane; // Africa/Mbabane -> Africa/Johannesburg -extern const extended::ZoneInfo& kZoneAfrica_Mogadishu; // Africa/Mogadishu -> Africa/Nairobi -extern const extended::ZoneInfo& kZoneAfrica_Niamey; // Africa/Niamey -> Africa/Lagos -extern const extended::ZoneInfo& kZoneAfrica_Nouakchott; // Africa/Nouakchott -> Africa/Abidjan -extern const extended::ZoneInfo& kZoneAfrica_Ouagadougou; // Africa/Ouagadougou -> Africa/Abidjan -extern const extended::ZoneInfo& kZoneAfrica_Porto_Novo; // Africa/Porto-Novo -> Africa/Lagos -extern const extended::ZoneInfo& kZoneAfrica_Timbuktu; // Africa/Timbuktu -> Africa/Abidjan -extern const extended::ZoneInfo& kZoneAmerica_Anguilla; // America/Anguilla -> America/Port_of_Spain -extern const extended::ZoneInfo& kZoneAmerica_Antigua; // America/Antigua -> America/Port_of_Spain -extern const extended::ZoneInfo& kZoneAmerica_Argentina_ComodRivadavia; // America/Argentina/ComodRivadavia -> America/Argentina/Catamarca -extern const extended::ZoneInfo& kZoneAmerica_Aruba; // America/Aruba -> America/Curacao -extern const extended::ZoneInfo& kZoneAmerica_Atka; // America/Atka -> America/Adak -extern const extended::ZoneInfo& kZoneAmerica_Buenos_Aires; // America/Buenos_Aires -> America/Argentina/Buenos_Aires -extern const extended::ZoneInfo& kZoneAmerica_Catamarca; // America/Catamarca -> America/Argentina/Catamarca -extern const extended::ZoneInfo& kZoneAmerica_Cayman; // America/Cayman -> America/Panama -extern const extended::ZoneInfo& kZoneAmerica_Coral_Harbour; // America/Coral_Harbour -> America/Atikokan -extern const extended::ZoneInfo& kZoneAmerica_Cordoba; // America/Cordoba -> America/Argentina/Cordoba -extern const extended::ZoneInfo& kZoneAmerica_Dominica; // America/Dominica -> America/Port_of_Spain -extern const extended::ZoneInfo& kZoneAmerica_Ensenada; // America/Ensenada -> America/Tijuana -extern const extended::ZoneInfo& kZoneAmerica_Fort_Wayne; // America/Fort_Wayne -> America/Indiana/Indianapolis -extern const extended::ZoneInfo& kZoneAmerica_Godthab; // America/Godthab -> America/Nuuk -extern const extended::ZoneInfo& kZoneAmerica_Grenada; // America/Grenada -> America/Port_of_Spain -extern const extended::ZoneInfo& kZoneAmerica_Guadeloupe; // America/Guadeloupe -> America/Port_of_Spain -extern const extended::ZoneInfo& kZoneAmerica_Indianapolis; // America/Indianapolis -> America/Indiana/Indianapolis -extern const extended::ZoneInfo& kZoneAmerica_Jujuy; // America/Jujuy -> America/Argentina/Jujuy -extern const extended::ZoneInfo& kZoneAmerica_Knox_IN; // America/Knox_IN -> America/Indiana/Knox -extern const extended::ZoneInfo& kZoneAmerica_Kralendijk; // America/Kralendijk -> America/Curacao -extern const extended::ZoneInfo& kZoneAmerica_Louisville; // America/Louisville -> America/Kentucky/Louisville -extern const extended::ZoneInfo& kZoneAmerica_Lower_Princes; // America/Lower_Princes -> America/Curacao -extern const extended::ZoneInfo& kZoneAmerica_Marigot; // America/Marigot -> America/Port_of_Spain -extern const extended::ZoneInfo& kZoneAmerica_Mendoza; // America/Mendoza -> America/Argentina/Mendoza -extern const extended::ZoneInfo& kZoneAmerica_Montreal; // America/Montreal -> America/Toronto -extern const extended::ZoneInfo& kZoneAmerica_Montserrat; // America/Montserrat -> America/Port_of_Spain -extern const extended::ZoneInfo& kZoneAmerica_Porto_Acre; // America/Porto_Acre -> America/Rio_Branco -extern const extended::ZoneInfo& kZoneAmerica_Rosario; // America/Rosario -> America/Argentina/Cordoba -extern const extended::ZoneInfo& kZoneAmerica_Santa_Isabel; // America/Santa_Isabel -> America/Tijuana -extern const extended::ZoneInfo& kZoneAmerica_Shiprock; // America/Shiprock -> America/Denver -extern const extended::ZoneInfo& kZoneAmerica_St_Barthelemy; // America/St_Barthelemy -> America/Port_of_Spain -extern const extended::ZoneInfo& kZoneAmerica_St_Kitts; // America/St_Kitts -> America/Port_of_Spain -extern const extended::ZoneInfo& kZoneAmerica_St_Lucia; // America/St_Lucia -> America/Port_of_Spain -extern const extended::ZoneInfo& kZoneAmerica_St_Thomas; // America/St_Thomas -> America/Port_of_Spain -extern const extended::ZoneInfo& kZoneAmerica_St_Vincent; // America/St_Vincent -> America/Port_of_Spain -extern const extended::ZoneInfo& kZoneAmerica_Tortola; // America/Tortola -> America/Port_of_Spain -extern const extended::ZoneInfo& kZoneAmerica_Virgin; // America/Virgin -> America/Port_of_Spain -extern const extended::ZoneInfo& kZoneAntarctica_McMurdo; // Antarctica/McMurdo -> Pacific/Auckland -extern const extended::ZoneInfo& kZoneAntarctica_South_Pole; // Antarctica/South_Pole -> Pacific/Auckland -extern const extended::ZoneInfo& kZoneArctic_Longyearbyen; // Arctic/Longyearbyen -> Europe/Oslo -extern const extended::ZoneInfo& kZoneAsia_Aden; // Asia/Aden -> Asia/Riyadh -extern const extended::ZoneInfo& kZoneAsia_Ashkhabad; // Asia/Ashkhabad -> Asia/Ashgabat -extern const extended::ZoneInfo& kZoneAsia_Bahrain; // Asia/Bahrain -> Asia/Qatar -extern const extended::ZoneInfo& kZoneAsia_Calcutta; // Asia/Calcutta -> Asia/Kolkata -extern const extended::ZoneInfo& kZoneAsia_Chongqing; // Asia/Chongqing -> Asia/Shanghai -extern const extended::ZoneInfo& kZoneAsia_Chungking; // Asia/Chungking -> Asia/Shanghai -extern const extended::ZoneInfo& kZoneAsia_Dacca; // Asia/Dacca -> Asia/Dhaka -extern const extended::ZoneInfo& kZoneAsia_Harbin; // Asia/Harbin -> Asia/Shanghai -extern const extended::ZoneInfo& kZoneAsia_Istanbul; // Asia/Istanbul -> Europe/Istanbul -extern const extended::ZoneInfo& kZoneAsia_Kashgar; // Asia/Kashgar -> Asia/Urumqi -extern const extended::ZoneInfo& kZoneAsia_Katmandu; // Asia/Katmandu -> Asia/Kathmandu -extern const extended::ZoneInfo& kZoneAsia_Kuwait; // Asia/Kuwait -> Asia/Riyadh -extern const extended::ZoneInfo& kZoneAsia_Macao; // Asia/Macao -> Asia/Macau -extern const extended::ZoneInfo& kZoneAsia_Muscat; // Asia/Muscat -> Asia/Dubai -extern const extended::ZoneInfo& kZoneAsia_Phnom_Penh; // Asia/Phnom_Penh -> Asia/Bangkok -extern const extended::ZoneInfo& kZoneAsia_Rangoon; // Asia/Rangoon -> Asia/Yangon -extern const extended::ZoneInfo& kZoneAsia_Saigon; // Asia/Saigon -> Asia/Ho_Chi_Minh -extern const extended::ZoneInfo& kZoneAsia_Tel_Aviv; // Asia/Tel_Aviv -> Asia/Jerusalem -extern const extended::ZoneInfo& kZoneAsia_Thimbu; // Asia/Thimbu -> Asia/Thimphu -extern const extended::ZoneInfo& kZoneAsia_Ujung_Pandang; // Asia/Ujung_Pandang -> Asia/Makassar -extern const extended::ZoneInfo& kZoneAsia_Ulan_Bator; // Asia/Ulan_Bator -> Asia/Ulaanbaatar -extern const extended::ZoneInfo& kZoneAsia_Vientiane; // Asia/Vientiane -> Asia/Bangkok -extern const extended::ZoneInfo& kZoneAtlantic_Faeroe; // Atlantic/Faeroe -> Atlantic/Faroe -extern const extended::ZoneInfo& kZoneAtlantic_Jan_Mayen; // Atlantic/Jan_Mayen -> Europe/Oslo -extern const extended::ZoneInfo& kZoneAtlantic_St_Helena; // Atlantic/St_Helena -> Africa/Abidjan -extern const extended::ZoneInfo& kZoneAustralia_ACT; // Australia/ACT -> Australia/Sydney -extern const extended::ZoneInfo& kZoneAustralia_Canberra; // Australia/Canberra -> Australia/Sydney -extern const extended::ZoneInfo& kZoneAustralia_Currie; // Australia/Currie -> Australia/Hobart -extern const extended::ZoneInfo& kZoneAustralia_LHI; // Australia/LHI -> Australia/Lord_Howe -extern const extended::ZoneInfo& kZoneAustralia_NSW; // Australia/NSW -> Australia/Sydney -extern const extended::ZoneInfo& kZoneAustralia_North; // Australia/North -> Australia/Darwin -extern const extended::ZoneInfo& kZoneAustralia_Queensland; // Australia/Queensland -> Australia/Brisbane -extern const extended::ZoneInfo& kZoneAustralia_South; // Australia/South -> Australia/Adelaide -extern const extended::ZoneInfo& kZoneAustralia_Tasmania; // Australia/Tasmania -> Australia/Hobart -extern const extended::ZoneInfo& kZoneAustralia_Victoria; // Australia/Victoria -> Australia/Melbourne -extern const extended::ZoneInfo& kZoneAustralia_West; // Australia/West -> Australia/Perth -extern const extended::ZoneInfo& kZoneAustralia_Yancowinna; // Australia/Yancowinna -> Australia/Broken_Hill -extern const extended::ZoneInfo& kZoneBrazil_Acre; // Brazil/Acre -> America/Rio_Branco -extern const extended::ZoneInfo& kZoneBrazil_DeNoronha; // Brazil/DeNoronha -> America/Noronha -extern const extended::ZoneInfo& kZoneBrazil_East; // Brazil/East -> America/Sao_Paulo -extern const extended::ZoneInfo& kZoneBrazil_West; // Brazil/West -> America/Manaus -extern const extended::ZoneInfo& kZoneCanada_Atlantic; // Canada/Atlantic -> America/Halifax -extern const extended::ZoneInfo& kZoneCanada_Central; // Canada/Central -> America/Winnipeg -extern const extended::ZoneInfo& kZoneCanada_Eastern; // Canada/Eastern -> America/Toronto -extern const extended::ZoneInfo& kZoneCanada_Mountain; // Canada/Mountain -> America/Edmonton -extern const extended::ZoneInfo& kZoneCanada_Newfoundland; // Canada/Newfoundland -> America/St_Johns -extern const extended::ZoneInfo& kZoneCanada_Pacific; // Canada/Pacific -> America/Vancouver -extern const extended::ZoneInfo& kZoneCanada_Saskatchewan; // Canada/Saskatchewan -> America/Regina -extern const extended::ZoneInfo& kZoneCanada_Yukon; // Canada/Yukon -> America/Whitehorse -extern const extended::ZoneInfo& kZoneChile_Continental; // Chile/Continental -> America/Santiago -extern const extended::ZoneInfo& kZoneChile_EasterIsland; // Chile/EasterIsland -> Pacific/Easter -extern const extended::ZoneInfo& kZoneCuba; // Cuba -> America/Havana -extern const extended::ZoneInfo& kZoneEgypt; // Egypt -> Africa/Cairo -extern const extended::ZoneInfo& kZoneEire; // Eire -> Europe/Dublin -extern const extended::ZoneInfo& kZoneEtc_GMT_PLUS_0; // Etc/GMT+0 -> Etc/GMT -extern const extended::ZoneInfo& kZoneEtc_GMT_0; // Etc/GMT-0 -> Etc/GMT -extern const extended::ZoneInfo& kZoneEtc_GMT0; // Etc/GMT0 -> Etc/GMT -extern const extended::ZoneInfo& kZoneEtc_Greenwich; // Etc/Greenwich -> Etc/GMT -extern const extended::ZoneInfo& kZoneEtc_UCT; // Etc/UCT -> Etc/UTC -extern const extended::ZoneInfo& kZoneEtc_Universal; // Etc/Universal -> Etc/UTC -extern const extended::ZoneInfo& kZoneEtc_Zulu; // Etc/Zulu -> Etc/UTC -extern const extended::ZoneInfo& kZoneEurope_Belfast; // Europe/Belfast -> Europe/London -extern const extended::ZoneInfo& kZoneEurope_Bratislava; // Europe/Bratislava -> Europe/Prague -extern const extended::ZoneInfo& kZoneEurope_Busingen; // Europe/Busingen -> Europe/Zurich -extern const extended::ZoneInfo& kZoneEurope_Guernsey; // Europe/Guernsey -> Europe/London -extern const extended::ZoneInfo& kZoneEurope_Isle_of_Man; // Europe/Isle_of_Man -> Europe/London -extern const extended::ZoneInfo& kZoneEurope_Jersey; // Europe/Jersey -> Europe/London -extern const extended::ZoneInfo& kZoneEurope_Ljubljana; // Europe/Ljubljana -> Europe/Belgrade -extern const extended::ZoneInfo& kZoneEurope_Mariehamn; // Europe/Mariehamn -> Europe/Helsinki -extern const extended::ZoneInfo& kZoneEurope_Nicosia; // Europe/Nicosia -> Asia/Nicosia -extern const extended::ZoneInfo& kZoneEurope_Podgorica; // Europe/Podgorica -> Europe/Belgrade -extern const extended::ZoneInfo& kZoneEurope_San_Marino; // Europe/San_Marino -> Europe/Rome -extern const extended::ZoneInfo& kZoneEurope_Sarajevo; // Europe/Sarajevo -> Europe/Belgrade -extern const extended::ZoneInfo& kZoneEurope_Skopje; // Europe/Skopje -> Europe/Belgrade -extern const extended::ZoneInfo& kZoneEurope_Tiraspol; // Europe/Tiraspol -> Europe/Chisinau -extern const extended::ZoneInfo& kZoneEurope_Vaduz; // Europe/Vaduz -> Europe/Zurich -extern const extended::ZoneInfo& kZoneEurope_Vatican; // Europe/Vatican -> Europe/Rome -extern const extended::ZoneInfo& kZoneEurope_Zagreb; // Europe/Zagreb -> Europe/Belgrade -extern const extended::ZoneInfo& kZoneGB; // GB -> Europe/London -extern const extended::ZoneInfo& kZoneGB_Eire; // GB-Eire -> Europe/London -extern const extended::ZoneInfo& kZoneGMT; // GMT -> Etc/GMT -extern const extended::ZoneInfo& kZoneGMT_PLUS_0; // GMT+0 -> Etc/GMT -extern const extended::ZoneInfo& kZoneGMT_0; // GMT-0 -> Etc/GMT -extern const extended::ZoneInfo& kZoneGMT0; // GMT0 -> Etc/GMT -extern const extended::ZoneInfo& kZoneGreenwich; // Greenwich -> Etc/GMT -extern const extended::ZoneInfo& kZoneHongkong; // Hongkong -> Asia/Hong_Kong -extern const extended::ZoneInfo& kZoneIceland; // Iceland -> Atlantic/Reykjavik -extern const extended::ZoneInfo& kZoneIndian_Antananarivo; // Indian/Antananarivo -> Africa/Nairobi -extern const extended::ZoneInfo& kZoneIndian_Comoro; // Indian/Comoro -> Africa/Nairobi -extern const extended::ZoneInfo& kZoneIndian_Mayotte; // Indian/Mayotte -> Africa/Nairobi -extern const extended::ZoneInfo& kZoneIran; // Iran -> Asia/Tehran -extern const extended::ZoneInfo& kZoneIsrael; // Israel -> Asia/Jerusalem -extern const extended::ZoneInfo& kZoneJamaica; // Jamaica -> America/Jamaica -extern const extended::ZoneInfo& kZoneJapan; // Japan -> Asia/Tokyo -extern const extended::ZoneInfo& kZoneKwajalein; // Kwajalein -> Pacific/Kwajalein -extern const extended::ZoneInfo& kZoneLibya; // Libya -> Africa/Tripoli -extern const extended::ZoneInfo& kZoneMexico_BajaNorte; // Mexico/BajaNorte -> America/Tijuana -extern const extended::ZoneInfo& kZoneMexico_BajaSur; // Mexico/BajaSur -> America/Mazatlan -extern const extended::ZoneInfo& kZoneMexico_General; // Mexico/General -> America/Mexico_City -extern const extended::ZoneInfo& kZoneNZ; // NZ -> Pacific/Auckland -extern const extended::ZoneInfo& kZoneNZ_CHAT; // NZ-CHAT -> Pacific/Chatham -extern const extended::ZoneInfo& kZoneNavajo; // Navajo -> America/Denver -extern const extended::ZoneInfo& kZonePRC; // PRC -> Asia/Shanghai -extern const extended::ZoneInfo& kZonePacific_Johnston; // Pacific/Johnston -> Pacific/Honolulu -extern const extended::ZoneInfo& kZonePacific_Midway; // Pacific/Midway -> Pacific/Pago_Pago -extern const extended::ZoneInfo& kZonePacific_Ponape; // Pacific/Ponape -> Pacific/Pohnpei -extern const extended::ZoneInfo& kZonePacific_Saipan; // Pacific/Saipan -> Pacific/Guam -extern const extended::ZoneInfo& kZonePacific_Samoa; // Pacific/Samoa -> Pacific/Pago_Pago -extern const extended::ZoneInfo& kZonePacific_Truk; // Pacific/Truk -> Pacific/Chuuk -extern const extended::ZoneInfo& kZonePacific_Yap; // Pacific/Yap -> Pacific/Chuuk -extern const extended::ZoneInfo& kZonePoland; // Poland -> Europe/Warsaw -extern const extended::ZoneInfo& kZonePortugal; // Portugal -> Europe/Lisbon -extern const extended::ZoneInfo& kZoneROC; // ROC -> Asia/Taipei -extern const extended::ZoneInfo& kZoneROK; // ROK -> Asia/Seoul -extern const extended::ZoneInfo& kZoneSingapore; // Singapore -> Asia/Singapore -extern const extended::ZoneInfo& kZoneTurkey; // Turkey -> Europe/Istanbul -extern const extended::ZoneInfo& kZoneUCT; // UCT -> Etc/UTC -extern const extended::ZoneInfo& kZoneUS_Alaska; // US/Alaska -> America/Anchorage -extern const extended::ZoneInfo& kZoneUS_Aleutian; // US/Aleutian -> America/Adak -extern const extended::ZoneInfo& kZoneUS_Arizona; // US/Arizona -> America/Phoenix -extern const extended::ZoneInfo& kZoneUS_Central; // US/Central -> America/Chicago -extern const extended::ZoneInfo& kZoneUS_East_Indiana; // US/East-Indiana -> America/Indiana/Indianapolis -extern const extended::ZoneInfo& kZoneUS_Eastern; // US/Eastern -> America/New_York -extern const extended::ZoneInfo& kZoneUS_Hawaii; // US/Hawaii -> Pacific/Honolulu -extern const extended::ZoneInfo& kZoneUS_Indiana_Starke; // US/Indiana-Starke -> America/Indiana/Knox -extern const extended::ZoneInfo& kZoneUS_Michigan; // US/Michigan -> America/Detroit -extern const extended::ZoneInfo& kZoneUS_Mountain; // US/Mountain -> America/Denver -extern const extended::ZoneInfo& kZoneUS_Pacific; // US/Pacific -> America/Los_Angeles -extern const extended::ZoneInfo& kZoneUS_Samoa; // US/Samoa -> Pacific/Pago_Pago -extern const extended::ZoneInfo& kZoneUTC; // UTC -> Etc/UTC -extern const extended::ZoneInfo& kZoneUniversal; // Universal -> Etc/UTC -extern const extended::ZoneInfo& kZoneW_SU; // W-SU -> Europe/Moscow -extern const extended::ZoneInfo& kZoneZulu; // Zulu -> Etc/UTC +extern const extended::ZoneInfo kZoneAfrica_Addis_Ababa; // Africa/Addis_Ababa -> Africa/Nairobi +extern const extended::ZoneInfo kZoneAfrica_Asmara; // Africa/Asmara -> Africa/Nairobi +extern const extended::ZoneInfo kZoneAfrica_Asmera; // Africa/Asmera -> Africa/Nairobi +extern const extended::ZoneInfo kZoneAfrica_Bamako; // Africa/Bamako -> Africa/Abidjan +extern const extended::ZoneInfo kZoneAfrica_Bangui; // Africa/Bangui -> Africa/Lagos +extern const extended::ZoneInfo kZoneAfrica_Banjul; // Africa/Banjul -> Africa/Abidjan +extern const extended::ZoneInfo kZoneAfrica_Blantyre; // Africa/Blantyre -> Africa/Maputo +extern const extended::ZoneInfo kZoneAfrica_Brazzaville; // Africa/Brazzaville -> Africa/Lagos +extern const extended::ZoneInfo kZoneAfrica_Bujumbura; // Africa/Bujumbura -> Africa/Maputo +extern const extended::ZoneInfo kZoneAfrica_Conakry; // Africa/Conakry -> Africa/Abidjan +extern const extended::ZoneInfo kZoneAfrica_Dakar; // Africa/Dakar -> Africa/Abidjan +extern const extended::ZoneInfo kZoneAfrica_Dar_es_Salaam; // Africa/Dar_es_Salaam -> Africa/Nairobi +extern const extended::ZoneInfo kZoneAfrica_Djibouti; // Africa/Djibouti -> Africa/Nairobi +extern const extended::ZoneInfo kZoneAfrica_Douala; // Africa/Douala -> Africa/Lagos +extern const extended::ZoneInfo kZoneAfrica_Freetown; // Africa/Freetown -> Africa/Abidjan +extern const extended::ZoneInfo kZoneAfrica_Gaborone; // Africa/Gaborone -> Africa/Maputo +extern const extended::ZoneInfo kZoneAfrica_Harare; // Africa/Harare -> Africa/Maputo +extern const extended::ZoneInfo kZoneAfrica_Kampala; // Africa/Kampala -> Africa/Nairobi +extern const extended::ZoneInfo kZoneAfrica_Kigali; // Africa/Kigali -> Africa/Maputo +extern const extended::ZoneInfo kZoneAfrica_Kinshasa; // Africa/Kinshasa -> Africa/Lagos +extern const extended::ZoneInfo kZoneAfrica_Libreville; // Africa/Libreville -> Africa/Lagos +extern const extended::ZoneInfo kZoneAfrica_Lome; // Africa/Lome -> Africa/Abidjan +extern const extended::ZoneInfo kZoneAfrica_Luanda; // Africa/Luanda -> Africa/Lagos +extern const extended::ZoneInfo kZoneAfrica_Lubumbashi; // Africa/Lubumbashi -> Africa/Maputo +extern const extended::ZoneInfo kZoneAfrica_Lusaka; // Africa/Lusaka -> Africa/Maputo +extern const extended::ZoneInfo kZoneAfrica_Malabo; // Africa/Malabo -> Africa/Lagos +extern const extended::ZoneInfo kZoneAfrica_Maseru; // Africa/Maseru -> Africa/Johannesburg +extern const extended::ZoneInfo kZoneAfrica_Mbabane; // Africa/Mbabane -> Africa/Johannesburg +extern const extended::ZoneInfo kZoneAfrica_Mogadishu; // Africa/Mogadishu -> Africa/Nairobi +extern const extended::ZoneInfo kZoneAfrica_Niamey; // Africa/Niamey -> Africa/Lagos +extern const extended::ZoneInfo kZoneAfrica_Nouakchott; // Africa/Nouakchott -> Africa/Abidjan +extern const extended::ZoneInfo kZoneAfrica_Ouagadougou; // Africa/Ouagadougou -> Africa/Abidjan +extern const extended::ZoneInfo kZoneAfrica_Porto_Novo; // Africa/Porto-Novo -> Africa/Lagos +extern const extended::ZoneInfo kZoneAfrica_Timbuktu; // Africa/Timbuktu -> Africa/Abidjan +extern const extended::ZoneInfo kZoneAmerica_Anguilla; // America/Anguilla -> America/Port_of_Spain +extern const extended::ZoneInfo kZoneAmerica_Antigua; // America/Antigua -> America/Port_of_Spain +extern const extended::ZoneInfo kZoneAmerica_Argentina_ComodRivadavia; // America/Argentina/ComodRivadavia -> America/Argentina/Catamarca +extern const extended::ZoneInfo kZoneAmerica_Aruba; // America/Aruba -> America/Curacao +extern const extended::ZoneInfo kZoneAmerica_Atka; // America/Atka -> America/Adak +extern const extended::ZoneInfo kZoneAmerica_Buenos_Aires; // America/Buenos_Aires -> America/Argentina/Buenos_Aires +extern const extended::ZoneInfo kZoneAmerica_Catamarca; // America/Catamarca -> America/Argentina/Catamarca +extern const extended::ZoneInfo kZoneAmerica_Cayman; // America/Cayman -> America/Panama +extern const extended::ZoneInfo kZoneAmerica_Coral_Harbour; // America/Coral_Harbour -> America/Atikokan +extern const extended::ZoneInfo kZoneAmerica_Cordoba; // America/Cordoba -> America/Argentina/Cordoba +extern const extended::ZoneInfo kZoneAmerica_Dominica; // America/Dominica -> America/Port_of_Spain +extern const extended::ZoneInfo kZoneAmerica_Ensenada; // America/Ensenada -> America/Tijuana +extern const extended::ZoneInfo kZoneAmerica_Fort_Wayne; // America/Fort_Wayne -> America/Indiana/Indianapolis +extern const extended::ZoneInfo kZoneAmerica_Godthab; // America/Godthab -> America/Nuuk +extern const extended::ZoneInfo kZoneAmerica_Grenada; // America/Grenada -> America/Port_of_Spain +extern const extended::ZoneInfo kZoneAmerica_Guadeloupe; // America/Guadeloupe -> America/Port_of_Spain +extern const extended::ZoneInfo kZoneAmerica_Indianapolis; // America/Indianapolis -> America/Indiana/Indianapolis +extern const extended::ZoneInfo kZoneAmerica_Jujuy; // America/Jujuy -> America/Argentina/Jujuy +extern const extended::ZoneInfo kZoneAmerica_Knox_IN; // America/Knox_IN -> America/Indiana/Knox +extern const extended::ZoneInfo kZoneAmerica_Kralendijk; // America/Kralendijk -> America/Curacao +extern const extended::ZoneInfo kZoneAmerica_Louisville; // America/Louisville -> America/Kentucky/Louisville +extern const extended::ZoneInfo kZoneAmerica_Lower_Princes; // America/Lower_Princes -> America/Curacao +extern const extended::ZoneInfo kZoneAmerica_Marigot; // America/Marigot -> America/Port_of_Spain +extern const extended::ZoneInfo kZoneAmerica_Mendoza; // America/Mendoza -> America/Argentina/Mendoza +extern const extended::ZoneInfo kZoneAmerica_Montreal; // America/Montreal -> America/Toronto +extern const extended::ZoneInfo kZoneAmerica_Montserrat; // America/Montserrat -> America/Port_of_Spain +extern const extended::ZoneInfo kZoneAmerica_Porto_Acre; // America/Porto_Acre -> America/Rio_Branco +extern const extended::ZoneInfo kZoneAmerica_Rosario; // America/Rosario -> America/Argentina/Cordoba +extern const extended::ZoneInfo kZoneAmerica_Santa_Isabel; // America/Santa_Isabel -> America/Tijuana +extern const extended::ZoneInfo kZoneAmerica_Shiprock; // America/Shiprock -> America/Denver +extern const extended::ZoneInfo kZoneAmerica_St_Barthelemy; // America/St_Barthelemy -> America/Port_of_Spain +extern const extended::ZoneInfo kZoneAmerica_St_Kitts; // America/St_Kitts -> America/Port_of_Spain +extern const extended::ZoneInfo kZoneAmerica_St_Lucia; // America/St_Lucia -> America/Port_of_Spain +extern const extended::ZoneInfo kZoneAmerica_St_Thomas; // America/St_Thomas -> America/Port_of_Spain +extern const extended::ZoneInfo kZoneAmerica_St_Vincent; // America/St_Vincent -> America/Port_of_Spain +extern const extended::ZoneInfo kZoneAmerica_Tortola; // America/Tortola -> America/Port_of_Spain +extern const extended::ZoneInfo kZoneAmerica_Virgin; // America/Virgin -> America/Port_of_Spain +extern const extended::ZoneInfo kZoneAntarctica_McMurdo; // Antarctica/McMurdo -> Pacific/Auckland +extern const extended::ZoneInfo kZoneAntarctica_South_Pole; // Antarctica/South_Pole -> Pacific/Auckland +extern const extended::ZoneInfo kZoneArctic_Longyearbyen; // Arctic/Longyearbyen -> Europe/Oslo +extern const extended::ZoneInfo kZoneAsia_Aden; // Asia/Aden -> Asia/Riyadh +extern const extended::ZoneInfo kZoneAsia_Ashkhabad; // Asia/Ashkhabad -> Asia/Ashgabat +extern const extended::ZoneInfo kZoneAsia_Bahrain; // Asia/Bahrain -> Asia/Qatar +extern const extended::ZoneInfo kZoneAsia_Calcutta; // Asia/Calcutta -> Asia/Kolkata +extern const extended::ZoneInfo kZoneAsia_Chongqing; // Asia/Chongqing -> Asia/Shanghai +extern const extended::ZoneInfo kZoneAsia_Chungking; // Asia/Chungking -> Asia/Shanghai +extern const extended::ZoneInfo kZoneAsia_Dacca; // Asia/Dacca -> Asia/Dhaka +extern const extended::ZoneInfo kZoneAsia_Harbin; // Asia/Harbin -> Asia/Shanghai +extern const extended::ZoneInfo kZoneAsia_Istanbul; // Asia/Istanbul -> Europe/Istanbul +extern const extended::ZoneInfo kZoneAsia_Kashgar; // Asia/Kashgar -> Asia/Urumqi +extern const extended::ZoneInfo kZoneAsia_Katmandu; // Asia/Katmandu -> Asia/Kathmandu +extern const extended::ZoneInfo kZoneAsia_Kuwait; // Asia/Kuwait -> Asia/Riyadh +extern const extended::ZoneInfo kZoneAsia_Macao; // Asia/Macao -> Asia/Macau +extern const extended::ZoneInfo kZoneAsia_Muscat; // Asia/Muscat -> Asia/Dubai +extern const extended::ZoneInfo kZoneAsia_Phnom_Penh; // Asia/Phnom_Penh -> Asia/Bangkok +extern const extended::ZoneInfo kZoneAsia_Rangoon; // Asia/Rangoon -> Asia/Yangon +extern const extended::ZoneInfo kZoneAsia_Saigon; // Asia/Saigon -> Asia/Ho_Chi_Minh +extern const extended::ZoneInfo kZoneAsia_Tel_Aviv; // Asia/Tel_Aviv -> Asia/Jerusalem +extern const extended::ZoneInfo kZoneAsia_Thimbu; // Asia/Thimbu -> Asia/Thimphu +extern const extended::ZoneInfo kZoneAsia_Ujung_Pandang; // Asia/Ujung_Pandang -> Asia/Makassar +extern const extended::ZoneInfo kZoneAsia_Ulan_Bator; // Asia/Ulan_Bator -> Asia/Ulaanbaatar +extern const extended::ZoneInfo kZoneAsia_Vientiane; // Asia/Vientiane -> Asia/Bangkok +extern const extended::ZoneInfo kZoneAtlantic_Faeroe; // Atlantic/Faeroe -> Atlantic/Faroe +extern const extended::ZoneInfo kZoneAtlantic_Jan_Mayen; // Atlantic/Jan_Mayen -> Europe/Oslo +extern const extended::ZoneInfo kZoneAtlantic_St_Helena; // Atlantic/St_Helena -> Africa/Abidjan +extern const extended::ZoneInfo kZoneAustralia_ACT; // Australia/ACT -> Australia/Sydney +extern const extended::ZoneInfo kZoneAustralia_Canberra; // Australia/Canberra -> Australia/Sydney +extern const extended::ZoneInfo kZoneAustralia_Currie; // Australia/Currie -> Australia/Hobart +extern const extended::ZoneInfo kZoneAustralia_LHI; // Australia/LHI -> Australia/Lord_Howe +extern const extended::ZoneInfo kZoneAustralia_NSW; // Australia/NSW -> Australia/Sydney +extern const extended::ZoneInfo kZoneAustralia_North; // Australia/North -> Australia/Darwin +extern const extended::ZoneInfo kZoneAustralia_Queensland; // Australia/Queensland -> Australia/Brisbane +extern const extended::ZoneInfo kZoneAustralia_South; // Australia/South -> Australia/Adelaide +extern const extended::ZoneInfo kZoneAustralia_Tasmania; // Australia/Tasmania -> Australia/Hobart +extern const extended::ZoneInfo kZoneAustralia_Victoria; // Australia/Victoria -> Australia/Melbourne +extern const extended::ZoneInfo kZoneAustralia_West; // Australia/West -> Australia/Perth +extern const extended::ZoneInfo kZoneAustralia_Yancowinna; // Australia/Yancowinna -> Australia/Broken_Hill +extern const extended::ZoneInfo kZoneBrazil_Acre; // Brazil/Acre -> America/Rio_Branco +extern const extended::ZoneInfo kZoneBrazil_DeNoronha; // Brazil/DeNoronha -> America/Noronha +extern const extended::ZoneInfo kZoneBrazil_East; // Brazil/East -> America/Sao_Paulo +extern const extended::ZoneInfo kZoneBrazil_West; // Brazil/West -> America/Manaus +extern const extended::ZoneInfo kZoneCanada_Atlantic; // Canada/Atlantic -> America/Halifax +extern const extended::ZoneInfo kZoneCanada_Central; // Canada/Central -> America/Winnipeg +extern const extended::ZoneInfo kZoneCanada_Eastern; // Canada/Eastern -> America/Toronto +extern const extended::ZoneInfo kZoneCanada_Mountain; // Canada/Mountain -> America/Edmonton +extern const extended::ZoneInfo kZoneCanada_Newfoundland; // Canada/Newfoundland -> America/St_Johns +extern const extended::ZoneInfo kZoneCanada_Pacific; // Canada/Pacific -> America/Vancouver +extern const extended::ZoneInfo kZoneCanada_Saskatchewan; // Canada/Saskatchewan -> America/Regina +extern const extended::ZoneInfo kZoneCanada_Yukon; // Canada/Yukon -> America/Whitehorse +extern const extended::ZoneInfo kZoneChile_Continental; // Chile/Continental -> America/Santiago +extern const extended::ZoneInfo kZoneChile_EasterIsland; // Chile/EasterIsland -> Pacific/Easter +extern const extended::ZoneInfo kZoneCuba; // Cuba -> America/Havana +extern const extended::ZoneInfo kZoneEgypt; // Egypt -> Africa/Cairo +extern const extended::ZoneInfo kZoneEire; // Eire -> Europe/Dublin +extern const extended::ZoneInfo kZoneEtc_GMT_PLUS_0; // Etc/GMT+0 -> Etc/GMT +extern const extended::ZoneInfo kZoneEtc_GMT_0; // Etc/GMT-0 -> Etc/GMT +extern const extended::ZoneInfo kZoneEtc_GMT0; // Etc/GMT0 -> Etc/GMT +extern const extended::ZoneInfo kZoneEtc_Greenwich; // Etc/Greenwich -> Etc/GMT +extern const extended::ZoneInfo kZoneEtc_UCT; // Etc/UCT -> Etc/UTC +extern const extended::ZoneInfo kZoneEtc_Universal; // Etc/Universal -> Etc/UTC +extern const extended::ZoneInfo kZoneEtc_Zulu; // Etc/Zulu -> Etc/UTC +extern const extended::ZoneInfo kZoneEurope_Belfast; // Europe/Belfast -> Europe/London +extern const extended::ZoneInfo kZoneEurope_Bratislava; // Europe/Bratislava -> Europe/Prague +extern const extended::ZoneInfo kZoneEurope_Busingen; // Europe/Busingen -> Europe/Zurich +extern const extended::ZoneInfo kZoneEurope_Guernsey; // Europe/Guernsey -> Europe/London +extern const extended::ZoneInfo kZoneEurope_Isle_of_Man; // Europe/Isle_of_Man -> Europe/London +extern const extended::ZoneInfo kZoneEurope_Jersey; // Europe/Jersey -> Europe/London +extern const extended::ZoneInfo kZoneEurope_Ljubljana; // Europe/Ljubljana -> Europe/Belgrade +extern const extended::ZoneInfo kZoneEurope_Mariehamn; // Europe/Mariehamn -> Europe/Helsinki +extern const extended::ZoneInfo kZoneEurope_Nicosia; // Europe/Nicosia -> Asia/Nicosia +extern const extended::ZoneInfo kZoneEurope_Podgorica; // Europe/Podgorica -> Europe/Belgrade +extern const extended::ZoneInfo kZoneEurope_San_Marino; // Europe/San_Marino -> Europe/Rome +extern const extended::ZoneInfo kZoneEurope_Sarajevo; // Europe/Sarajevo -> Europe/Belgrade +extern const extended::ZoneInfo kZoneEurope_Skopje; // Europe/Skopje -> Europe/Belgrade +extern const extended::ZoneInfo kZoneEurope_Tiraspol; // Europe/Tiraspol -> Europe/Chisinau +extern const extended::ZoneInfo kZoneEurope_Vaduz; // Europe/Vaduz -> Europe/Zurich +extern const extended::ZoneInfo kZoneEurope_Vatican; // Europe/Vatican -> Europe/Rome +extern const extended::ZoneInfo kZoneEurope_Zagreb; // Europe/Zagreb -> Europe/Belgrade +extern const extended::ZoneInfo kZoneGB; // GB -> Europe/London +extern const extended::ZoneInfo kZoneGB_Eire; // GB-Eire -> Europe/London +extern const extended::ZoneInfo kZoneGMT; // GMT -> Etc/GMT +extern const extended::ZoneInfo kZoneGMT_PLUS_0; // GMT+0 -> Etc/GMT +extern const extended::ZoneInfo kZoneGMT_0; // GMT-0 -> Etc/GMT +extern const extended::ZoneInfo kZoneGMT0; // GMT0 -> Etc/GMT +extern const extended::ZoneInfo kZoneGreenwich; // Greenwich -> Etc/GMT +extern const extended::ZoneInfo kZoneHongkong; // Hongkong -> Asia/Hong_Kong +extern const extended::ZoneInfo kZoneIceland; // Iceland -> Atlantic/Reykjavik +extern const extended::ZoneInfo kZoneIndian_Antananarivo; // Indian/Antananarivo -> Africa/Nairobi +extern const extended::ZoneInfo kZoneIndian_Comoro; // Indian/Comoro -> Africa/Nairobi +extern const extended::ZoneInfo kZoneIndian_Mayotte; // Indian/Mayotte -> Africa/Nairobi +extern const extended::ZoneInfo kZoneIran; // Iran -> Asia/Tehran +extern const extended::ZoneInfo kZoneIsrael; // Israel -> Asia/Jerusalem +extern const extended::ZoneInfo kZoneJamaica; // Jamaica -> America/Jamaica +extern const extended::ZoneInfo kZoneJapan; // Japan -> Asia/Tokyo +extern const extended::ZoneInfo kZoneKwajalein; // Kwajalein -> Pacific/Kwajalein +extern const extended::ZoneInfo kZoneLibya; // Libya -> Africa/Tripoli +extern const extended::ZoneInfo kZoneMexico_BajaNorte; // Mexico/BajaNorte -> America/Tijuana +extern const extended::ZoneInfo kZoneMexico_BajaSur; // Mexico/BajaSur -> America/Mazatlan +extern const extended::ZoneInfo kZoneMexico_General; // Mexico/General -> America/Mexico_City +extern const extended::ZoneInfo kZoneNZ; // NZ -> Pacific/Auckland +extern const extended::ZoneInfo kZoneNZ_CHAT; // NZ-CHAT -> Pacific/Chatham +extern const extended::ZoneInfo kZoneNavajo; // Navajo -> America/Denver +extern const extended::ZoneInfo kZonePRC; // PRC -> Asia/Shanghai +extern const extended::ZoneInfo kZonePacific_Johnston; // Pacific/Johnston -> Pacific/Honolulu +extern const extended::ZoneInfo kZonePacific_Midway; // Pacific/Midway -> Pacific/Pago_Pago +extern const extended::ZoneInfo kZonePacific_Ponape; // Pacific/Ponape -> Pacific/Pohnpei +extern const extended::ZoneInfo kZonePacific_Saipan; // Pacific/Saipan -> Pacific/Guam +extern const extended::ZoneInfo kZonePacific_Samoa; // Pacific/Samoa -> Pacific/Pago_Pago +extern const extended::ZoneInfo kZonePacific_Truk; // Pacific/Truk -> Pacific/Chuuk +extern const extended::ZoneInfo kZonePacific_Yap; // Pacific/Yap -> Pacific/Chuuk +extern const extended::ZoneInfo kZonePoland; // Poland -> Europe/Warsaw +extern const extended::ZoneInfo kZonePortugal; // Portugal -> Europe/Lisbon +extern const extended::ZoneInfo kZoneROC; // ROC -> Asia/Taipei +extern const extended::ZoneInfo kZoneROK; // ROK -> Asia/Seoul +extern const extended::ZoneInfo kZoneSingapore; // Singapore -> Asia/Singapore +extern const extended::ZoneInfo kZoneTurkey; // Turkey -> Europe/Istanbul +extern const extended::ZoneInfo kZoneUCT; // UCT -> Etc/UTC +extern const extended::ZoneInfo kZoneUS_Alaska; // US/Alaska -> America/Anchorage +extern const extended::ZoneInfo kZoneUS_Aleutian; // US/Aleutian -> America/Adak +extern const extended::ZoneInfo kZoneUS_Arizona; // US/Arizona -> America/Phoenix +extern const extended::ZoneInfo kZoneUS_Central; // US/Central -> America/Chicago +extern const extended::ZoneInfo kZoneUS_East_Indiana; // US/East-Indiana -> America/Indiana/Indianapolis +extern const extended::ZoneInfo kZoneUS_Eastern; // US/Eastern -> America/New_York +extern const extended::ZoneInfo kZoneUS_Hawaii; // US/Hawaii -> Pacific/Honolulu +extern const extended::ZoneInfo kZoneUS_Indiana_Starke; // US/Indiana-Starke -> America/Indiana/Knox +extern const extended::ZoneInfo kZoneUS_Michigan; // US/Michigan -> America/Detroit +extern const extended::ZoneInfo kZoneUS_Mountain; // US/Mountain -> America/Denver +extern const extended::ZoneInfo kZoneUS_Pacific; // US/Pacific -> America/Los_Angeles +extern const extended::ZoneInfo kZoneUS_Samoa; // US/Samoa -> Pacific/Pago_Pago +extern const extended::ZoneInfo kZoneUTC; // UTC -> Etc/UTC +extern const extended::ZoneInfo kZoneUniversal; // Universal -> Etc/UTC +extern const extended::ZoneInfo kZoneW_SU; // W-SU -> Europe/Moscow +extern const extended::ZoneInfo kZoneZulu; // Zulu -> Etc/UTC +const uint32_t kZoneIdAfrica_Addis_Ababa = 0x05ae1e65; // Africa/Addis_Ababa +const uint32_t kZoneIdAfrica_Asmara = 0x73b278ef; // Africa/Asmara +const uint32_t kZoneIdAfrica_Asmera = 0x73b289f3; // Africa/Asmera +const uint32_t kZoneIdAfrica_Bamako = 0x74c1e7a5; // Africa/Bamako +const uint32_t kZoneIdAfrica_Bangui = 0x74c28ed0; // Africa/Bangui +const uint32_t kZoneIdAfrica_Banjul = 0x74c29b96; // Africa/Banjul +const uint32_t kZoneIdAfrica_Blantyre = 0xe08d813b; // Africa/Blantyre +const uint32_t kZoneIdAfrica_Brazzaville = 0x39cda760; // Africa/Brazzaville +const uint32_t kZoneIdAfrica_Bujumbura = 0x05232a47; // Africa/Bujumbura +const uint32_t kZoneIdAfrica_Conakry = 0x7ab36b31; // Africa/Conakry +const uint32_t kZoneIdAfrica_Dakar = 0x780b00fd; // Africa/Dakar +const uint32_t kZoneIdAfrica_Dar_es_Salaam = 0xa04c47b6; // Africa/Dar_es_Salaam +const uint32_t kZoneIdAfrica_Djibouti = 0x30ea01d4; // Africa/Djibouti +const uint32_t kZoneIdAfrica_Douala = 0x7a6df310; // Africa/Douala +const uint32_t kZoneIdAfrica_Freetown = 0x6823dd64; // Africa/Freetown +const uint32_t kZoneIdAfrica_Gaborone = 0x317c0aa7; // Africa/Gaborone +const uint32_t kZoneIdAfrica_Harare = 0x82c39a2d; // Africa/Harare +const uint32_t kZoneIdAfrica_Kampala = 0xc1d30e31; // Africa/Kampala +const uint32_t kZoneIdAfrica_Kigali = 0x8a4dcf2b; // Africa/Kigali +const uint32_t kZoneIdAfrica_Kinshasa = 0x6695d70c; // Africa/Kinshasa +const uint32_t kZoneIdAfrica_Libreville = 0x01d96de4; // Africa/Libreville +const uint32_t kZoneIdAfrica_Lome = 0xd51c3a07; // Africa/Lome +const uint32_t kZoneIdAfrica_Luanda = 0x8d7909cf; // Africa/Luanda +const uint32_t kZoneIdAfrica_Lubumbashi = 0x6fd88566; // Africa/Lubumbashi +const uint32_t kZoneIdAfrica_Lusaka = 0x8d82b23b; // Africa/Lusaka +const uint32_t kZoneIdAfrica_Malabo = 0x8e6a1906; // Africa/Malabo +const uint32_t kZoneIdAfrica_Maseru = 0x8e6e02c7; // Africa/Maseru +const uint32_t kZoneIdAfrica_Mbabane = 0x5d3bdd40; // Africa/Mbabane +const uint32_t kZoneIdAfrica_Mogadishu = 0x66bc159b; // Africa/Mogadishu +const uint32_t kZoneIdAfrica_Niamey = 0x914a30fd; // Africa/Niamey +const uint32_t kZoneIdAfrica_Nouakchott = 0x3dc49dba; // Africa/Nouakchott +const uint32_t kZoneIdAfrica_Ouagadougou = 0x04d7219a; // Africa/Ouagadougou +const uint32_t kZoneIdAfrica_Porto_Novo = 0x3d1bf95d; // Africa/Porto-Novo +const uint32_t kZoneIdAfrica_Timbuktu = 0xb164d56f; // Africa/Timbuktu +const uint32_t kZoneIdAmerica_Anguilla = 0xafe31333; // America/Anguilla +const uint32_t kZoneIdAmerica_Antigua = 0xc067a32f; // America/Antigua +const uint32_t kZoneIdAmerica_Argentina_ComodRivadavia = 0x22758877; // America/Argentina/ComodRivadavia +const uint32_t kZoneIdAmerica_Aruba = 0x97cf8651; // America/Aruba +const uint32_t kZoneIdAmerica_Atka = 0x97fe8f27; // America/Atka +const uint32_t kZoneIdAmerica_Buenos_Aires = 0x67d79a05; // America/Buenos_Aires +const uint32_t kZoneIdAmerica_Catamarca = 0x5036e963; // America/Catamarca +const uint32_t kZoneIdAmerica_Cayman = 0x953961df; // America/Cayman +const uint32_t kZoneIdAmerica_Coral_Harbour = 0xabcb7569; // America/Coral_Harbour +const uint32_t kZoneIdAmerica_Cordoba = 0x5c8a7600; // America/Cordoba +const uint32_t kZoneIdAmerica_Dominica = 0xcecb4c4a; // America/Dominica +const uint32_t kZoneIdAmerica_Ensenada = 0x7bc95445; // America/Ensenada +const uint32_t kZoneIdAmerica_Fort_Wayne = 0x7eaaaf24; // America/Fort_Wayne +const uint32_t kZoneIdAmerica_Godthab = 0x8f7eba1f; // America/Godthab +const uint32_t kZoneIdAmerica_Grenada = 0x968ce4d8; // America/Grenada +const uint32_t kZoneIdAmerica_Guadeloupe = 0xcd1f8a31; // America/Guadeloupe +const uint32_t kZoneIdAmerica_Indianapolis = 0x6a009ae1; // America/Indianapolis +const uint32_t kZoneIdAmerica_Jujuy = 0x9873dbbd; // America/Jujuy +const uint32_t kZoneIdAmerica_Knox_IN = 0xc1db9a1c; // America/Knox_IN +const uint32_t kZoneIdAmerica_Kralendijk = 0xe7c456c5; // America/Kralendijk +const uint32_t kZoneIdAmerica_Louisville = 0x3dcb47ee; // America/Louisville +const uint32_t kZoneIdAmerica_Lower_Princes = 0x6ae45b62; // America/Lower_Princes +const uint32_t kZoneIdAmerica_Marigot = 0x3dab3a59; // America/Marigot +const uint32_t kZoneIdAmerica_Mendoza = 0x46b4e054; // America/Mendoza +const uint32_t kZoneIdAmerica_Montreal = 0x203a1ea8; // America/Montreal +const uint32_t kZoneIdAmerica_Montserrat = 0x199b0a35; // America/Montserrat +const uint32_t kZoneIdAmerica_Porto_Acre = 0xcce5bf54; // America/Porto_Acre +const uint32_t kZoneIdAmerica_Rosario = 0xdf448665; // America/Rosario +const uint32_t kZoneIdAmerica_Santa_Isabel = 0xfd18a56c; // America/Santa_Isabel +const uint32_t kZoneIdAmerica_Shiprock = 0x82fb7049; // America/Shiprock +const uint32_t kZoneIdAmerica_St_Barthelemy = 0x054e6a79; // America/St_Barthelemy +const uint32_t kZoneIdAmerica_St_Kitts = 0x04c0507b; // America/St_Kitts +const uint32_t kZoneIdAmerica_St_Lucia = 0x04d8b3ba; // America/St_Lucia +const uint32_t kZoneIdAmerica_St_Thomas = 0xb1b3d778; // America/St_Thomas +const uint32_t kZoneIdAmerica_St_Vincent = 0x8460e523; // America/St_Vincent +const uint32_t kZoneIdAmerica_Tortola = 0x7931462b; // America/Tortola +const uint32_t kZoneIdAmerica_Virgin = 0xc2183ab5; // America/Virgin +const uint32_t kZoneIdAntarctica_McMurdo = 0x6eeb5585; // Antarctica/McMurdo +const uint32_t kZoneIdAntarctica_South_Pole = 0xcd96b290; // Antarctica/South_Pole +const uint32_t kZoneIdArctic_Longyearbyen = 0xd23e7859; // Arctic/Longyearbyen +const uint32_t kZoneIdAsia_Aden = 0x1fa7084a; // Asia/Aden +const uint32_t kZoneIdAsia_Ashkhabad = 0x15454f09; // Asia/Ashkhabad +const uint32_t kZoneIdAsia_Bahrain = 0x9d078487; // Asia/Bahrain +const uint32_t kZoneIdAsia_Calcutta = 0x328a44c3; // Asia/Calcutta +const uint32_t kZoneIdAsia_Chongqing = 0xf937fb90; // Asia/Chongqing +const uint32_t kZoneIdAsia_Chungking = 0xc7121dd0; // Asia/Chungking +const uint32_t kZoneIdAsia_Dacca = 0x14bcac5e; // Asia/Dacca +const uint32_t kZoneIdAsia_Harbin = 0xb5af1186; // Asia/Harbin +const uint32_t kZoneIdAsia_Istanbul = 0x382e7894; // Asia/Istanbul +const uint32_t kZoneIdAsia_Kashgar = 0x52955193; // Asia/Kashgar +const uint32_t kZoneIdAsia_Katmandu = 0xa7ec12c7; // Asia/Katmandu +const uint32_t kZoneIdAsia_Kuwait = 0xbe1b2f27; // Asia/Kuwait +const uint32_t kZoneIdAsia_Macao = 0x155f88b3; // Asia/Macao +const uint32_t kZoneIdAsia_Muscat = 0xc2c3565f; // Asia/Muscat +const uint32_t kZoneIdAsia_Phnom_Penh = 0xc224945e; // Asia/Phnom_Penh +const uint32_t kZoneIdAsia_Rangoon = 0x6d1217c6; // Asia/Rangoon +const uint32_t kZoneIdAsia_Saigon = 0xcf52f713; // Asia/Saigon +const uint32_t kZoneIdAsia_Tel_Aviv = 0x166d7c2c; // Asia/Tel_Aviv +const uint32_t kZoneIdAsia_Thimbu = 0xd226e31b; // Asia/Thimbu +const uint32_t kZoneIdAsia_Ujung_Pandang = 0x5d001eb3; // Asia/Ujung_Pandang +const uint32_t kZoneIdAsia_Ulan_Bator = 0x394db4d9; // Asia/Ulan_Bator +const uint32_t kZoneIdAsia_Vientiane = 0x89d68d75; // Asia/Vientiane +const uint32_t kZoneIdAtlantic_Faeroe = 0x031ec516; // Atlantic/Faeroe +const uint32_t kZoneIdAtlantic_Jan_Mayen = 0x5a7535b6; // Atlantic/Jan_Mayen +const uint32_t kZoneIdAtlantic_St_Helena = 0x451fc5f7; // Atlantic/St_Helena +const uint32_t kZoneIdAustralia_ACT = 0x8a970eb2; // Australia/ACT +const uint32_t kZoneIdAustralia_Canberra = 0x2a09ae58; // Australia/Canberra +const uint32_t kZoneIdAustralia_Currie = 0x278b6a24; // Australia/Currie +const uint32_t kZoneIdAustralia_LHI = 0x8a973e17; // Australia/LHI +const uint32_t kZoneIdAustralia_NSW = 0x8a974812; // Australia/NSW +const uint32_t kZoneIdAustralia_North = 0x8d997165; // Australia/North +const uint32_t kZoneIdAustralia_Queensland = 0xd326ed0a; // Australia/Queensland +const uint32_t kZoneIdAustralia_South = 0x8df3f8ad; // Australia/South +const uint32_t kZoneIdAustralia_Tasmania = 0xe6d76648; // Australia/Tasmania +const uint32_t kZoneIdAustralia_Victoria = 0x0260d5db; // Australia/Victoria +const uint32_t kZoneIdAustralia_West = 0xdd858a5d; // Australia/West +const uint32_t kZoneIdAustralia_Yancowinna = 0x90bac131; // Australia/Yancowinna +const uint32_t kZoneIdBrazil_Acre = 0x66934f93; // Brazil/Acre +const uint32_t kZoneIdBrazil_DeNoronha = 0x9b4cb496; // Brazil/DeNoronha +const uint32_t kZoneIdBrazil_East = 0x669578c5; // Brazil/East +const uint32_t kZoneIdBrazil_West = 0x669f689b; // Brazil/West +const uint32_t kZoneIdCanada_Atlantic = 0x536b119c; // Canada/Atlantic +const uint32_t kZoneIdCanada_Central = 0x626710f5; // Canada/Central +const uint32_t kZoneIdCanada_Eastern = 0xf3612d5e; // Canada/Eastern +const uint32_t kZoneIdCanada_Mountain = 0xfb8a8217; // Canada/Mountain +const uint32_t kZoneIdCanada_Newfoundland = 0xb396e991; // Canada/Newfoundland +const uint32_t kZoneIdCanada_Pacific = 0x40fa3c7b; // Canada/Pacific +const uint32_t kZoneIdCanada_Saskatchewan = 0x77311f49; // Canada/Saskatchewan +const uint32_t kZoneIdCanada_Yukon = 0x78dd35c2; // Canada/Yukon +const uint32_t kZoneIdChile_Continental = 0x7e2bdb18; // Chile/Continental +const uint32_t kZoneIdChile_EasterIsland = 0xb0982af8; // Chile/EasterIsland +const uint32_t kZoneIdCuba = 0x7c83cba0; // Cuba +const uint32_t kZoneIdEgypt = 0x0d1a278e; // Egypt +const uint32_t kZoneIdEire = 0x7c84b36a; // Eire +const uint32_t kZoneIdEtc_GMT_PLUS_0 = 0x9d13da13; // Etc/GMT+0 +const uint32_t kZoneIdEtc_GMT_0 = 0x9d13da55; // Etc/GMT-0 +const uint32_t kZoneIdEtc_GMT0 = 0xf53ea988; // Etc/GMT0 +const uint32_t kZoneIdEtc_Greenwich = 0x26daa98c; // Etc/Greenwich +const uint32_t kZoneIdEtc_UCT = 0xd8e3189c; // Etc/UCT +const uint32_t kZoneIdEtc_Universal = 0x2f8cb9a9; // Etc/Universal +const uint32_t kZoneIdEtc_Zulu = 0xf549c240; // Etc/Zulu +const uint32_t kZoneIdEurope_Belfast = 0xd07dd1e5; // Europe/Belfast +const uint32_t kZoneIdEurope_Bratislava = 0xda493bed; // Europe/Bratislava +const uint32_t kZoneIdEurope_Busingen = 0xc06d2cdf; // Europe/Busingen +const uint32_t kZoneIdEurope_Guernsey = 0x3db12c16; // Europe/Guernsey +const uint32_t kZoneIdEurope_Isle_of_Man = 0xeaf84580; // Europe/Isle_of_Man +const uint32_t kZoneIdEurope_Jersey = 0x570dae76; // Europe/Jersey +const uint32_t kZoneIdEurope_Ljubljana = 0xbd98cdb7; // Europe/Ljubljana +const uint32_t kZoneIdEurope_Mariehamn = 0x0caa6496; // Europe/Mariehamn +const uint32_t kZoneIdEurope_Nicosia = 0x74efab8a; // Europe/Nicosia +const uint32_t kZoneIdEurope_Podgorica = 0x1c1a499c; // Europe/Podgorica +const uint32_t kZoneIdEurope_San_Marino = 0xcef7724b; // Europe/San_Marino +const uint32_t kZoneIdEurope_Sarajevo = 0x6a576c3f; // Europe/Sarajevo +const uint32_t kZoneIdEurope_Skopje = 0x6c76fdd0; // Europe/Skopje +const uint32_t kZoneIdEurope_Tiraspol = 0xbe704472; // Europe/Tiraspol +const uint32_t kZoneIdEurope_Vaduz = 0xfbb81bae; // Europe/Vaduz +const uint32_t kZoneIdEurope_Vatican = 0xcb485dca; // Europe/Vatican +const uint32_t kZoneIdEurope_Zagreb = 0x7c11c9ff; // Europe/Zagreb +const uint32_t kZoneIdGB = 0x005973ae; // GB +const uint32_t kZoneIdGB_Eire = 0xfa70e300; // GB-Eire +const uint32_t kZoneIdGMT = 0x0b87eb2d; // GMT +const uint32_t kZoneIdGMT_PLUS_0 = 0x0d2f7028; // GMT+0 +const uint32_t kZoneIdGMT_0 = 0x0d2f706a; // GMT-0 +const uint32_t kZoneIdGMT0 = 0x7c8550fd; // GMT0 +const uint32_t kZoneIdGreenwich = 0xc84d4221; // Greenwich +const uint32_t kZoneIdHongkong = 0x56d36560; // Hongkong +const uint32_t kZoneIdIceland = 0xe56a35b5; // Iceland +const uint32_t kZoneIdIndian_Antananarivo = 0x9ebf5289; // Indian/Antananarivo +const uint32_t kZoneIdIndian_Comoro = 0x45f4deb6; // Indian/Comoro +const uint32_t kZoneIdIndian_Mayotte = 0xe6880bca; // Indian/Mayotte +const uint32_t kZoneIdIran = 0x7c87090f; // Iran +const uint32_t kZoneIdIsrael = 0xba88c9e5; // Israel +const uint32_t kZoneIdJamaica = 0x2e44fdab; // Jamaica +const uint32_t kZoneIdJapan = 0x0d712f8f; // Japan +const uint32_t kZoneIdKwajalein = 0x0e57afbb; // Kwajalein +const uint32_t kZoneIdLibya = 0x0d998b16; // Libya +const uint32_t kZoneIdMexico_BajaNorte = 0xfcf7150f; // Mexico/BajaNorte +const uint32_t kZoneIdMexico_BajaSur = 0x08ee3641; // Mexico/BajaSur +const uint32_t kZoneIdMexico_General = 0x93711d57; // Mexico/General +const uint32_t kZoneIdNZ = 0x005974ad; // NZ +const uint32_t kZoneIdNZ_CHAT = 0x4d42afda; // NZ-CHAT +const uint32_t kZoneIdNavajo = 0xc4ef0e24; // Navajo +const uint32_t kZoneIdPRC = 0x0b88120a; // PRC +const uint32_t kZoneIdPacific_Johnston = 0xb15d7b36; // Pacific/Johnston +const uint32_t kZoneIdPacific_Midway = 0xe286d38e; // Pacific/Midway +const uint32_t kZoneIdPacific_Ponape = 0xe9f80086; // Pacific/Ponape +const uint32_t kZoneIdPacific_Saipan = 0xeff7a35f; // Pacific/Saipan +const uint32_t kZoneIdPacific_Samoa = 0x8b2699b4; // Pacific/Samoa +const uint32_t kZoneIdPacific_Truk = 0x234010a9; // Pacific/Truk +const uint32_t kZoneIdPacific_Yap = 0xbb40138d; // Pacific/Yap +const uint32_t kZoneIdPoland = 0xca913b23; // Poland +const uint32_t kZoneIdPortugal = 0xc3274593; // Portugal +const uint32_t kZoneIdROC = 0x0b881a29; // ROC +const uint32_t kZoneIdROK = 0x0b881a31; // ROK +const uint32_t kZoneIdSingapore = 0xa8598c8d; // Singapore +const uint32_t kZoneIdTurkey = 0xd455e469; // Turkey +const uint32_t kZoneIdUCT = 0x0b882571; // UCT +const uint32_t kZoneIdUS_Alaska = 0xfa300bc9; // US/Alaska +const uint32_t kZoneIdUS_Aleutian = 0x4fe013ef; // US/Aleutian +const uint32_t kZoneIdUS_Arizona = 0x4ec52670; // US/Arizona +const uint32_t kZoneIdUS_Central = 0xcabdcb25; // US/Central +const uint32_t kZoneIdUS_East_Indiana = 0x6dcf558a; // US/East-Indiana +const uint32_t kZoneIdUS_Eastern = 0x5bb7e78e; // US/Eastern +const uint32_t kZoneIdUS_Hawaii = 0x09c8de2f; // US/Hawaii +const uint32_t kZoneIdUS_Indiana_Starke = 0x67977be7; // US/Indiana-Starke +const uint32_t kZoneIdUS_Michigan = 0x766bb7bc; // US/Michigan +const uint32_t kZoneIdUS_Mountain = 0x6eb88247; // US/Mountain +const uint32_t kZoneIdUS_Pacific = 0xa950f6ab; // US/Pacific +const uint32_t kZoneIdUS_Samoa = 0x566821cd; // US/Samoa +const uint32_t kZoneIdUTC = 0x0b882791; // UTC +const uint32_t kZoneIdUniversal = 0xd0ff523e; // Universal +const uint32_t kZoneIdW_SU = 0x7c8d8ef1; // W-SU +const uint32_t kZoneIdZulu = 0x7c9069b5; // Zulu //--------------------------------------------------------------------------- diff --git a/src/ace_time/zonedbx/zone_registry.cpp b/src/ace_time/zonedbx/zone_registry.cpp index 9556ededa..4daaa5ef0 100644 --- a/src/ace_time/zonedbx/zone_registry.cpp +++ b/src/ace_time/zonedbx/zone_registry.cpp @@ -37,392 +37,992 @@ namespace zonedbx { // Zone registry. Sorted by zoneId. //--------------------------------------------------------------------------- const extended::ZoneInfo* const kZoneRegistry[386] ACE_TIME_PROGMEM = { - &kZoneAsia_Kuala_Lumpur, // Asia/Kuala_Lumpur - 0x014763c4 - &kZoneIndian_Cocos, // Indian/Cocos - 0x021e86de - &kZoneAmerica_St_Johns, // America/St_Johns - 0x04b14e6e - &kZoneAmerica_North_Dakota_New_Salem, // America/North_Dakota/New_Salem - 0x04f9958e - &kZoneAsia_Jakarta, // Asia/Jakarta - 0x0506ab50 - &kZoneAmerica_Mazatlan, // America/Mazatlan - 0x0532189e - &kZonePacific_Fakaofo, // Pacific/Fakaofo - 0x06532bba - &kZoneAmerica_Hermosillo, // America/Hermosillo - 0x065d21c4 - &kZoneAsia_Tbilisi, // Asia/Tbilisi - 0x0903e442 - &kZoneAmerica_Indiana_Tell_City, // America/Indiana/Tell_City - 0x09263612 - &kZoneAmerica_Boa_Vista, // America/Boa_Vista - 0x0a7b7efe - &kZoneAsia_Colombo, // Asia/Colombo - 0x0af0e91d - &kZoneCET, // CET - 0x0b87d921 - &kZoneEET, // EET - 0x0b87e1a3 - &kZoneEST, // EST - 0x0b87e371 - &kZoneHST, // HST - 0x0b87f034 - &kZoneMET, // MET - 0x0b8803ab - &kZoneMST, // MST - 0x0b880579 - &kZoneWET, // WET - 0x0b882e35 - &kZoneAmerica_Guatemala, // America/Guatemala - 0x0c8259f7 - &kZoneAfrica_Monrovia, // Africa/Monrovia - 0x0ce90385 - &kZoneAntarctica_Rothera, // Antarctica/Rothera - 0x0e86d203 - &kZoneAmerica_Yellowknife, // America/Yellowknife - 0x0f76c76f - &kZoneAustralia_Melbourne, // Australia/Melbourne - 0x0fe559a3 - &kZoneAmerica_Sao_Paulo, // America/Sao_Paulo - 0x1063bfc9 - &kZoneEurope_Amsterdam, // Europe/Amsterdam - 0x109395c2 - &kZoneAmerica_Indiana_Vevay, // America/Indiana/Vevay - 0x10aca054 - &kZoneAmerica_Scoresbysund, // America/Scoresbysund - 0x123f8d2a - &kZoneAsia_Samarkand, // Asia/Samarkand - 0x13ae5104 - &kZoneAsia_Amman, // Asia/Amman - 0x148d21bc - &kZoneAsia_Aqtau, // Asia/Aqtau - 0x148f710e - &kZoneAsia_Chita, // Asia/Chita - 0x14ae863b - &kZoneAsia_Dhaka, // Asia/Dhaka - 0x14c07b8b - &kZoneAsia_Dubai, // Asia/Dubai - 0x14c79f77 - &kZoneAmerica_Bahia_Banderas, // America/Bahia_Banderas - 0x14f6329a - &kZoneAsia_Kabul, // Asia/Kabul - 0x153b5601 - &kZoneAsia_Macau, // Asia/Macau - 0x155f88b9 - &kZoneAsia_Qatar, // Asia/Qatar - 0x15a8330b - &kZoneAsia_Seoul, // Asia/Seoul - 0x15ce82da - &kZoneAsia_Tokyo, // Asia/Tokyo - 0x15e606a8 - &kZoneAsia_Tomsk, // Asia/Tomsk - 0x15e60e60 - &kZoneAsia_Thimphu, // Asia/Thimphu - 0x170380d1 - &kZoneAmerica_Guayaquil, // America/Guayaquil - 0x17e64958 - &kZoneAmerica_Kentucky_Louisville, // America/Kentucky/Louisville - 0x1a21024b - &kZoneAsia_Pontianak, // Asia/Pontianak - 0x1a76c057 - &kZoneAtlantic_Reykjavik, // Atlantic/Reykjavik - 0x1c2b4f74 - &kZoneAmerica_New_York, // America/New_York - 0x1e2a7654 - &kZoneEurope_Luxembourg, // Europe/Luxembourg - 0x1f8bc6ce - &kZoneAsia_Baku, // Asia/Baku - 0x1fa788b5 - &kZoneAsia_Dili, // Asia/Dili - 0x1fa8c394 - &kZoneAsia_Gaza, // Asia/Gaza - 0x1faa4875 - &kZoneAsia_Hovd, // Asia/Hovd - 0x1fab0fe3 - &kZoneAsia_Omsk, // Asia/Omsk - 0x1faeddac - &kZoneAsia_Oral, // Asia/Oral - 0x1faef0a0 - &kZoneAsia_Ho_Chi_Minh, // Asia/Ho_Chi_Minh - 0x20f2d127 - &kZoneAsia_Damascus, // Asia/Damascus - 0x20fbb063 - &kZonePacific_Apia, // Pacific/Apia - 0x23359b5e - &kZonePacific_Fiji, // Pacific/Fiji - 0x23383ba5 - &kZonePacific_Guam, // Pacific/Guam - 0x2338f9ed - &kZonePacific_Niue, // Pacific/Niue - 0x233ca014 - &kZonePacific_Wake, // Pacific/Wake - 0x23416c2b - &kZoneAustralia_Adelaide, // Australia/Adelaide - 0x2428e8a3 - &kZonePacific_Auckland, // Pacific/Auckland - 0x25062f86 - &kZonePacific_Tongatapu, // Pacific/Tongatapu - 0x262ca836 - &kZoneAmerica_Monterrey, // America/Monterrey - 0x269a1deb - &kZoneAustralia_Darwin, // Australia/Darwin - 0x2876bdff - &kZonePacific_Pohnpei, // Pacific/Pohnpei - 0x28929f96 - &kZoneAsia_Famagusta, // Asia/Famagusta - 0x289b4f8b - &kZoneAmerica_Indiana_Vincennes, // America/Indiana/Vincennes - 0x28a0b212 - &kZoneAmerica_Indiana_Indianapolis, // America/Indiana/Indianapolis - 0x28a669a4 - &kZoneAsia_Vladivostok, // Asia/Vladivostok - 0x29de34a8 - &kZoneAmerica_Fortaleza, // America/Fortaleza - 0x2ad018ee - &kZoneAmerica_Vancouver, // America/Vancouver - 0x2c6f6b1f - &kZoneAmerica_Pangnirtung, // America/Pangnirtung - 0x2d999193 - &kZoneAmerica_Iqaluit, // America/Iqaluit - 0x2de310bf - &kZonePacific_Chatham, // Pacific/Chatham - 0x2f0de999 - &kZoneAmerica_Indiana_Marengo, // America/Indiana/Marengo - 0x2feeee72 - &kZoneEurope_Tallinn, // Europe/Tallinn - 0x30c4e096 - &kZoneAsia_Ulaanbaatar, // Asia/Ulaanbaatar - 0x30f0cc4e - &kZoneAmerica_Argentina_Ushuaia, // America/Argentina/Ushuaia - 0x320dcdde - &kZoneAustralia_Hobart, // Australia/Hobart - 0x32bf951a - &kZoneAsia_Dushanbe, // Asia/Dushanbe - 0x32fc5c3c - &kZoneAtlantic_South_Georgia, // Atlantic/South_Georgia - 0x33013174 - &kZoneAmerica_Phoenix, // America/Phoenix - 0x34b5af01 - &kZoneAntarctica_Mawson, // Antarctica/Mawson - 0x399cd863 - &kZoneAmerica_Caracas, // America/Caracas - 0x3be064f4 - &kZoneAmerica_Cayenne, // America/Cayenne - 0x3c617269 - &kZoneAtlantic_Bermuda, // Atlantic/Bermuda - 0x3d4bb1c4 - &kZoneAmerica_Managua, // America/Managua - 0x3d5e7600 - &kZoneAmerica_Argentina_San_Juan, // America/Argentina/San_Juan - 0x3e1009bd - &kZoneAmerica_Argentina_San_Luis, // America/Argentina/San_Luis - 0x3e11238c - &kZoneEurope_Volgograd, // Europe/Volgograd - 0x3ed0f389 - &kZoneAmerica_Fort_Nelson, // America/Fort_Nelson - 0x3f437e0f - &kZoneEtc_GMT_PLUS_10, // Etc/GMT+10 - 0x3f8f1cc4 - &kZoneEtc_GMT_PLUS_11, // Etc/GMT+11 - 0x3f8f1cc5 - &kZoneEtc_GMT_PLUS_12, // Etc/GMT+12 - 0x3f8f1cc6 - &kZoneEtc_GMT_10, // Etc/GMT-10 - 0x3f8f2546 - &kZoneEtc_GMT_11, // Etc/GMT-11 - 0x3f8f2547 - &kZoneEtc_GMT_12, // Etc/GMT-12 - 0x3f8f2548 - &kZoneEtc_GMT_13, // Etc/GMT-13 - 0x3f8f2549 - &kZoneEtc_GMT_14, // Etc/GMT-14 - 0x3f8f254a - &kZoneAntarctica_Palmer, // Antarctica/Palmer - 0x40962f4f - &kZoneEurope_Athens, // Europe/Athens - 0x4318fa27 - &kZoneIndian_Kerguelen, // Indian/Kerguelen - 0x4351b389 - &kZoneAmerica_Indiana_Winamac, // America/Indiana/Winamac - 0x4413fa69 - &kZoneEurope_Berlin, // Europe/Berlin - 0x44644c20 - &kZoneIndian_Chagos, // Indian/Chagos - 0x456f7c3c - &kZoneIndian_Mahe, // Indian/Mahe - 0x45e725e2 - &kZoneAsia_Ust_Nera, // Asia/Ust-Nera - 0x4785f921 - &kZoneEurope_Dublin, // Europe/Dublin - 0x4a275f62 - &kZoneAsia_Nicosia, // Asia/Nicosia - 0x4b0fcf78 - &kZoneAmerica_Chicago, // America/Chicago - 0x4b92b5d4 - &kZoneAustralia_Sydney, // Australia/Sydney - 0x4d1e9776 - &kZoneAntarctica_Vostok, // Antarctica/Vostok - 0x4f966fd4 - &kZoneAustralia_Brisbane, // Australia/Brisbane - 0x4fedc9c0 - &kZoneAmerica_Asuncion, // America/Asuncion - 0x50ec79a6 - &kZoneAsia_Karachi, // Asia/Karachi - 0x527f5245 - &kZonePacific_Gambier, // Pacific/Gambier - 0x53720c3a - &kZoneAmerica_Whitehorse, // America/Whitehorse - 0x54e0e3e8 - &kZoneAmerica_Martinique, // America/Martinique - 0x551e84c5 - &kZoneAmerica_Jamaica, // America/Jamaica - 0x565dad6c - &kZoneAsia_Hong_Kong, // Asia/Hong_Kong - 0x577f28ac - &kZonePacific_Marquesas, // Pacific/Marquesas - 0x57ca7135 - &kZoneAmerica_Miquelon, // America/Miquelon - 0x59674330 - &kZoneAntarctica_DumontDUrville, // Antarctica/DumontDUrville - 0x5a3c656c - &kZoneAmerica_Anchorage, // America/Anchorage - 0x5a79260e - &kZoneAsia_Jerusalem, // Asia/Jerusalem - 0x5becd23a - &kZoneEurope_Stockholm, // Europe/Stockholm - 0x5bf6fbb8 - &kZoneEurope_Lisbon, // Europe/Lisbon - 0x5c00a70b - &kZoneAtlantic_Cape_Verde, // Atlantic/Cape_Verde - 0x5c5e1772 - &kZoneEurope_London, // Europe/London - 0x5c6a84ae - &kZoneEurope_Madrid, // Europe/Madrid - 0x5dbd1535 - &kZoneAmerica_Moncton, // America/Moncton - 0x5e07fe24 - &kZonePacific_Bougainville, // Pacific/Bougainville - 0x5e10f7a4 - &kZoneEurope_Monaco, // Europe/Monaco - 0x5ebf9f01 - &kZoneEurope_Moscow, // Europe/Moscow - 0x5ec266fc - &kZoneAmerica_Argentina_Jujuy, // America/Argentina/Jujuy - 0x5f2f46c5 - &kZoneAmerica_Argentina_Salta, // America/Argentina/Salta - 0x5fc73403 - &kZonePacific_Pago_Pago, // Pacific/Pago_Pago - 0x603aebd0 - &kZonePacific_Enderbury, // Pacific/Enderbury - 0x61599a93 - &kZoneAfrica_Sao_Tome, // Africa/Sao_Tome - 0x61b319d1 - &kZoneAmerica_Creston, // America/Creston - 0x62a70204 - &kZoneAmerica_Costa_Rica, // America/Costa_Rica - 0x63ff66be - &kZoneAsia_Qostanay, // Asia/Qostanay - 0x654fe522 - &kZoneAmerica_Indiana_Knox, // America/Indiana/Knox - 0x6554adc9 - &kZoneEurope_Prague, // Europe/Prague - 0x65ee5d48 - &kZoneAmerica_Puerto_Rico, // America/Puerto_Rico - 0x6752ca31 - &kZoneIndian_Christmas, // Indian/Christmas - 0x68c207d5 - &kZoneAsia_Novokuznetsk, // Asia/Novokuznetsk - 0x69264f93 - &kZoneAmerica_Curacao, // America/Curacao - 0x6a879184 - &kZoneAmerica_Tijuana, // America/Tijuana - 0x6aa1df72 - &kZoneAsia_Makassar, // Asia/Makassar - 0x6aa21c85 - &kZoneEurope_Helsinki, // Europe/Helsinki - 0x6ab2975b - &kZoneAmerica_Porto_Velho, // America/Porto_Velho - 0x6b1aac77 - &kZoneEurope_Samara, // Europe/Samara - 0x6bc0b139 - &kZoneAmerica_Edmonton, // America/Edmonton - 0x6cb9484a - &kZoneAmerica_Dawson_Creek, // America/Dawson_Creek - 0x6cf24e5b - &kZoneAmerica_Grand_Turk, // America/Grand_Turk - 0x6e216197 - &kZoneAmerica_Blanc_Sablon, // America/Blanc-Sablon - 0x6e299892 - &kZoneEurope_Tirane, // Europe/Tirane - 0x6ea95b47 - &kZoneAmerica_Araguaina, // America/Araguaina - 0x6f9a3aef - &kZoneIndian_Reunion, // Indian/Reunion - 0x7076c047 - &kZoneAsia_Qyzylorda, // Asia/Qyzylorda - 0x71282e81 - &kZoneAsia_Kolkata, // Asia/Kolkata - 0x72c06cd9 - &kZoneEurope_Vienna, // Europe/Vienna - 0x734cc2e5 - &kZoneAsia_Kamchatka, // Asia/Kamchatka - 0x73baf9d7 - &kZoneAmerica_Santarem, // America/Santarem - 0x740caec1 - &kZoneAmerica_Santiago, // America/Santiago - 0x7410c9bc - &kZoneEurope_Warsaw, // Europe/Warsaw - 0x75185c19 - &kZoneAmerica_El_Salvador, // America/El_Salvador - 0x752ad652 - &kZoneAfrica_Bissau, // Africa/Bissau - 0x75564141 - &kZoneAmerica_Santo_Domingo, // America/Santo_Domingo - 0x75a0d177 - &kZoneAfrica_Accra, // Africa/Accra - 0x77d5b054 - &kZoneAfrica_Cairo, // Africa/Cairo - 0x77f8e228 - &kZoneAfrica_Ceuta, // Africa/Ceuta - 0x77fb46ec - &kZoneAfrica_Lagos, // Africa/Lagos - 0x789bb5d0 - &kZoneAfrica_Windhoek, // Africa/Windhoek - 0x789c9bd3 - &kZoneAmerica_Toronto, // America/Toronto - 0x792e851b - &kZoneAfrica_Tunis, // Africa/Tunis - 0x79378e6d - &kZoneIndian_Mauritius, // Indian/Mauritius - 0x7b09c02a - &kZoneAtlantic_Stanley, // Atlantic/Stanley - 0x7bb3e1c4 - &kZoneEurope_Zurich, // Europe/Zurich - 0x7d8195b9 - &kZoneAsia_Kuching, // Asia/Kuching - 0x801b003b - &kZoneAtlantic_Madeira, // Atlantic/Madeira - 0x81b5c037 - &kZoneAmerica_Atikokan, // America/Atikokan - 0x81b92098 - &kZonePacific_Kiritimati, // Pacific/Kiritimati - 0x8305073a - &kZoneAmerica_Metlakatla, // America/Metlakatla - 0x84de2686 - &kZoneAsia_Yakutsk, // Asia/Yakutsk - 0x87bb3a9e - &kZoneAmerica_Chihuahua, // America/Chihuahua - 0x8827d776 - &kZonePacific_Pitcairn, // Pacific/Pitcairn - 0x8837d8bd - &kZonePacific_Chuuk, // Pacific/Chuuk - 0x8a090b23 - &kZonePacific_Efate, // Pacific/Efate - 0x8a2bce28 - &kZonePacific_Nauru, // Pacific/Nauru - 0x8acc41ae - &kZoneEST5EDT, // EST5EDT - 0x8adc72a3 - &kZonePacific_Palau, // Pacific/Palau - 0x8af04a36 - &kZoneAmerica_Winnipeg, // America/Winnipeg - 0x8c7dafc7 - &kZoneAustralia_Eucla, // Australia/Eucla - 0x8cf99e44 - &kZoneAmerica_Argentina_Catamarca, // America/Argentina/Catamarca - 0x8d40986b - &kZoneAustralia_Perth, // Australia/Perth - 0x8db8269d - &kZonePacific_Kwajalein, // Pacific/Kwajalein - 0x8e216759 - &kZoneAmerica_Port_au_Prince, // America/Port-au-Prince - 0x8e4a7bdc - &kZoneAfrica_Maputo, // Africa/Maputo - 0x8e6ca1f0 - &kZonePacific_Norfolk, // Pacific/Norfolk - 0x8f4eb4be - &kZoneAsia_Yerevan, // Asia/Yerevan - 0x9185c8cc - &kZoneAmerica_Detroit, // America/Detroit - 0x925cfbc1 - &kZoneAsia_Choibalsan, // Asia/Choibalsan - 0x928aa4a6 - &kZoneAntarctica_Macquarie, // Antarctica/Macquarie - 0x92f47626 - &kZoneAmerica_Belize, // America/Belize - 0x93256c81 - &kZoneAmerica_Bogota, // America/Bogota - 0x93d7bc62 - &kZoneAsia_Pyongyang, // Asia/Pyongyang - 0x93ed1c8e - &kZoneAmerica_Indiana_Petersburg, // America/Indiana/Petersburg - 0x94ac7acc - &kZoneAmerica_Cancun, // America/Cancun - 0x953331be - &kZoneAmerica_Glace_Bay, // America/Glace_Bay - 0x9681f8dd - &kZoneAsia_Khandyga, // Asia/Khandyga - 0x9685a4d9 - &kZoneAmerica_Cuiaba, // America/Cuiaba - 0x969a52eb - &kZoneAmerica_Dawson, // America/Dawson - 0x978d8d12 - &kZoneAmerica_Denver, // America/Denver - 0x97d10b2a - &kZoneAmerica_Bahia, // America/Bahia - 0x97d815fb - &kZoneAmerica_Belem, // America/Belem - 0x97da580b - &kZoneAmerica_Boise, // America/Boise - 0x97dfc8d8 - &kZoneEurope_Andorra, // Europe/Andorra - 0x97f6764b - &kZoneAmerica_Adak, // America/Adak - 0x97fe49d7 - &kZoneAmerica_Lima, // America/Lima - 0x980468c9 - &kZoneAmerica_Nome, // America/Nome - 0x98059b15 - &kZoneAmerica_Nuuk, // America/Nuuk - 0x9805b5a9 - &kZoneIndian_Maldives, // Indian/Maldives - 0x9869681c - &kZoneAmerica_Sitka, // America/Sitka - 0x99104ce2 - &kZoneAmerica_Thule, // America/Thule - 0x9921dd68 - &kZonePacific_Rarotonga, // Pacific/Rarotonga - 0x9981a3b0 - &kZoneAsia_Kathmandu, // Asia/Kathmandu - 0x9a96ce6f - &kZoneAmerica_North_Dakota_Beulah, // America/North_Dakota/Beulah - 0x9b52b384 - &kZoneAmerica_Rainy_River, // America/Rainy_River - 0x9cd58a10 - &kZoneEurope_Budapest, // Europe/Budapest - 0x9ce0197c - &kZoneAsia_Baghdad, // Asia/Baghdad - 0x9ceffbed - &kZoneEtc_GMT_PLUS_1, // Etc/GMT+1 - 0x9d13da14 - &kZoneEtc_GMT_PLUS_2, // Etc/GMT+2 - 0x9d13da15 - &kZoneEtc_GMT_PLUS_3, // Etc/GMT+3 - 0x9d13da16 - &kZoneEtc_GMT_PLUS_4, // Etc/GMT+4 - 0x9d13da17 - &kZoneEtc_GMT_PLUS_5, // Etc/GMT+5 - 0x9d13da18 - &kZoneEtc_GMT_PLUS_6, // Etc/GMT+6 - 0x9d13da19 - &kZoneEtc_GMT_PLUS_7, // Etc/GMT+7 - 0x9d13da1a - &kZoneEtc_GMT_PLUS_8, // Etc/GMT+8 - 0x9d13da1b - &kZoneEtc_GMT_PLUS_9, // Etc/GMT+9 - 0x9d13da1c - &kZoneEtc_GMT_1, // Etc/GMT-1 - 0x9d13da56 - &kZoneEtc_GMT_2, // Etc/GMT-2 - 0x9d13da57 - &kZoneEtc_GMT_3, // Etc/GMT-3 - 0x9d13da58 - &kZoneEtc_GMT_4, // Etc/GMT-4 - 0x9d13da59 - &kZoneEtc_GMT_5, // Etc/GMT-5 - 0x9d13da5a - &kZoneEtc_GMT_6, // Etc/GMT-6 - 0x9d13da5b - &kZoneEtc_GMT_7, // Etc/GMT-7 - 0x9d13da5c - &kZoneEtc_GMT_8, // Etc/GMT-8 - 0x9d13da5d - &kZoneEtc_GMT_9, // Etc/GMT-9 - 0x9d13da5e - &kZoneAmerica_Nipigon, // America/Nipigon - 0x9d2a8b1a - &kZoneAmerica_Rio_Branco, // America/Rio_Branco - 0x9d352764 - &kZoneAsia_Bangkok, // Asia/Bangkok - 0x9d6e3aaf - &kZoneAfrica_El_Aaiun, // Africa/El_Aaiun - 0x9d6fb118 - &kZoneAmerica_North_Dakota_Center, // America/North_Dakota/Center - 0x9da42814 - &kZoneAsia_Barnaul, // Asia/Barnaul - 0x9dba4997 - &kZoneAfrica_Tripoli, // Africa/Tripoli - 0x9dfebd3d - &kZoneEurope_Istanbul, // Europe/Istanbul - 0x9e09d6e6 - &kZoneAfrica_Ndjamena, // Africa/Ndjamena - 0x9fe09898 - &kZoneAmerica_Guyana, // America/Guyana - 0x9ff7bd0b - &kZoneAmerica_Havana, // America/Havana - 0xa0e15675 - &kZoneAsia_Novosibirsk, // Asia/Novosibirsk - 0xa2a435cb - &kZoneEurope_Kiev, // Europe/Kiev - 0xa2c19eb3 - &kZoneEurope_Oslo, // Europe/Oslo - 0xa2c3fba1 - &kZoneEurope_Riga, // Europe/Riga - 0xa2c57587 - &kZoneEurope_Rome, // Europe/Rome - 0xa2c58fd7 - &kZoneAmerica_Inuvik, // America/Inuvik - 0xa42189fc - &kZoneAmerica_Argentina_La_Rioja, // America/Argentina/La_Rioja - 0xa46b7eef - &kZoneAsia_Almaty, // Asia/Almaty - 0xa61f41fa - &kZoneAsia_Anadyr, // Asia/Anadyr - 0xa63cebd1 - &kZoneAsia_Aqtobe, // Asia/Aqtobe - 0xa67dcc4e - &kZoneAsia_Atyrau, // Asia/Atyrau - 0xa6b6e068 - &kZoneAmerica_Juneau, // America/Juneau - 0xa6f13e2e - &kZoneAustralia_Lord_Howe, // Australia/Lord_Howe - 0xa748b67d - &kZonePacific_Port_Moresby, // Pacific/Port_Moresby - 0xa7ba7f68 - &kZoneAsia_Beirut, // Asia/Beirut - 0xa7f3d5fd - &kZoneAfrica_Nairobi, // Africa/Nairobi - 0xa87ab57e - &kZoneAsia_Brunei, // Asia/Brunei - 0xa8e595f7 - &kZonePacific_Galapagos, // Pacific/Galapagos - 0xa952f752 - &kZoneAmerica_Argentina_Mendoza, // America/Argentina/Mendoza - 0xa9f72d5c - &kZoneAmerica_La_Paz, // America/La_Paz - 0xaa29125d - &kZoneAmerica_Noronha, // America/Noronha - 0xab5116fb - &kZoneAmerica_Maceio, // America/Maceio - 0xac80c6d4 - &kZoneAmerica_Manaus, // America/Manaus - 0xac86bf8b - &kZoneAmerica_Merida, // America/Merida - 0xacd172d8 - &kZoneEurope_Chisinau, // Europe/Chisinau - 0xad58aa18 - &kZoneAmerica_Nassau, // America/Nassau - 0xaedef011 - &kZoneEurope_Uzhgorod, // Europe/Uzhgorod - 0xb066f5d6 - &kZoneAustralia_Broken_Hill, // Australia/Broken_Hill - 0xb06eada3 - &kZoneAsia_Bishkek, // Asia/Bishkek - 0xb0728553 - &kZoneAmerica_Paramaribo, // America/Paramaribo - 0xb319e4c4 - &kZoneAmerica_Panama, // America/Panama - 0xb3863854 - &kZoneAsia_Hebron, // Asia/Hebron - 0xb5eef250 - &kZoneAmerica_Goose_Bay, // America/Goose_Bay - 0xb649541e - &kZoneAmerica_Los_Angeles, // America/Los_Angeles - 0xb7f7e8f2 - &kZoneAmerica_Recife, // America/Recife - 0xb8730494 - &kZoneAmerica_Regina, // America/Regina - 0xb875371c - &kZoneAsia_Ashgabat, // Asia/Ashgabat - 0xba87598d - &kZoneAmerica_Halifax, // America/Halifax - 0xbc5b7183 - &kZoneAsia_Srednekolymsk, // Asia/Srednekolymsk - 0xbf8e337d - &kZoneAmerica_Argentina_Cordoba, // America/Argentina/Cordoba - 0xbfccc308 - &kZoneAmerica_Tegucigalpa, // America/Tegucigalpa - 0xbfd6fd4c - &kZoneAsia_Manila, // Asia/Manila - 0xc156c944 - &kZoneAfrica_Abidjan, // Africa/Abidjan - 0xc21305a3 - &kZoneAmerica_Punta_Arenas, // America/Punta_Arenas - 0xc2c3bce7 - &kZoneAfrica_Casablanca, // Africa/Casablanca - 0xc59f1b33 - &kZoneAmerica_Argentina_Rio_Gallegos, // America/Argentina/Rio_Gallegos - 0xc5b0f565 - &kZoneAsia_Jayapura, // Asia/Jayapura - 0xc6833c2f - &kZoneAmerica_Resolute, // America/Resolute - 0xc7093459 - &kZoneAmerica_Rankin_Inlet, // America/Rankin_Inlet - 0xc8de4984 - &kZoneAmerica_Barbados, // America/Barbados - 0xcbbc3b04 - &kZoneAsia_Riyadh, // Asia/Riyadh - 0xcd973d93 - &kZonePacific_Easter, // Pacific/Easter - 0xcf54f7e7 - &kZoneAsia_Singapore, // Asia/Singapore - 0xcf8581fa - &kZoneAsia_Krasnoyarsk, // Asia/Krasnoyarsk - 0xd0376c6a - &kZoneAmerica_Mexico_City, // America/Mexico_City - 0xd0d93f43 - &kZoneAsia_Taipei, // Asia/Taipei - 0xd1a844ae - &kZoneAsia_Tehran, // Asia/Tehran - 0xd1f02254 - &kZoneEurope_Kaliningrad, // Europe/Kaliningrad - 0xd33b2f28 - &kZoneAmerica_Argentina_Buenos_Aires, // America/Argentina/Buenos_Aires - 0xd43b4c0d - &kZoneAfrica_Juba, // Africa/Juba - 0xd51b395c - &kZoneAsia_Urumqi, // Asia/Urumqi - 0xd5379735 - &kZoneAmerica_Cambridge_Bay, // America/Cambridge_Bay - 0xd5a44aff - &kZoneAfrica_Johannesburg, // Africa/Johannesburg - 0xd5d157a0 - &kZoneAmerica_Port_of_Spain, // America/Port_of_Spain - 0xd8b28d59 - &kZoneEtc_GMT, // Etc/GMT - 0xd8e2de58 - &kZoneEtc_UTC, // Etc/UTC - 0xd8e31abc - &kZoneAmerica_Yakutat, // America/Yakutat - 0xd8ee31e9 - &kZoneAfrica_Algiers, // Africa/Algiers - 0xd94515c1 - &kZonePST8PDT, // PST8PDT - 0xd99ee2dc - &kZoneEurope_Simferopol, // Europe/Simferopol - 0xda9eb724 - &kZonePacific_Funafuti, // Pacific/Funafuti - 0xdb402d65 - &kZoneAmerica_Matamoros, // America/Matamoros - 0xdd1b0259 - &kZoneAsia_Yangon, // Asia/Yangon - 0xdd54a8be - &kZoneEurope_Vilnius, // Europe/Vilnius - 0xdd63b8ce - &kZonePacific_Kosrae, // Pacific/Kosrae - 0xde5139a8 - &kZoneAmerica_Kentucky_Monticello, // America/Kentucky/Monticello - 0xde71c439 - &kZoneEurope_Brussels, // Europe/Brussels - 0xdee07337 - &kZoneAmerica_Swift_Current, // America/Swift_Current - 0xdef98e55 - &kZoneAsia_Irkutsk, // Asia/Irkutsk - 0xdfbf213f - &kZoneEurope_Ulyanovsk, // Europe/Ulyanovsk - 0xe03783d0 - &kZoneAustralia_Lindeman, // Australia/Lindeman - 0xe05029e2 - &kZoneEurope_Belgrade, // Europe/Belgrade - 0xe0532b3a - &kZoneAmerica_Menominee, // America/Menominee - 0xe0e9c583 - &kZoneEurope_Copenhagen, // Europe/Copenhagen - 0xe0ed30bc - &kZoneAtlantic_Faroe, // Atlantic/Faroe - 0xe110a971 - &kZonePacific_Majuro, // Pacific/Majuro - 0xe1f95371 - &kZoneAntarctica_Casey, // Antarctica/Casey - 0xe2022583 - &kZoneAntarctica_Davis, // Antarctica/Davis - 0xe2144b45 - &kZoneEurope_Astrakhan, // Europe/Astrakhan - 0xe22256e1 - &kZoneAntarctica_Syowa, // Antarctica/Syowa - 0xe330c7e1 - &kZoneAntarctica_Troll, // Antarctica/Troll - 0xe33f085b - &kZoneEurope_Saratov, // Europe/Saratov - 0xe4315da4 - &kZonePacific_Noumea, // Pacific/Noumea - 0xe551b788 - &kZonePacific_Honolulu, // Pacific/Honolulu - 0xe6e70af9 - &kZoneAmerica_Argentina_Tucuman, // America/Argentina/Tucuman - 0xe96399eb - &kZoneEurope_Zaporozhye, // Europe/Zaporozhye - 0xeab9767f - &kZoneAsia_Magadan, // Asia/Magadan - 0xebacc19b - &kZoneAmerica_Ojinaga, // America/Ojinaga - 0xebfde83f - &kZoneCST6CDT, // CST6CDT - 0xf0e87d00 - &kZonePacific_Tahiti, // Pacific/Tahiti - 0xf24c2446 - &kZonePacific_Tarawa, // Pacific/Tarawa - 0xf2517e63 - &kZoneMST7MDT, // MST7MDT - 0xf2af9375 - &kZoneAsia_Tashkent, // Asia/Tashkent - 0xf3924254 - &kZoneAsia_Sakhalin, // Asia/Sakhalin - 0xf4a1c9bd - &kZonePacific_Guadalcanal, // Pacific/Guadalcanal - 0xf4dd25f0 - &kZoneAmerica_Danmarkshavn, // America/Danmarkshavn - 0xf554d204 - &kZoneAsia_Shanghai, // Asia/Shanghai - 0xf895a7f5 - &kZoneEurope_Gibraltar, // Europe/Gibraltar - 0xf8e325fc - &kZoneAtlantic_Azores, // Atlantic/Azores - 0xf93ed918 - &kZonePacific_Wallis, // Pacific/Wallis - 0xf94ddb0f - &kZoneAmerica_Thunder_Bay, // America/Thunder_Bay - 0xf962e71b - &kZoneAmerica_Eirunepe, // America/Eirunepe - 0xf9b29683 - &kZoneAmerica_Montevideo, // America/Montevideo - 0xfa214780 - &kZoneEurope_Kirov, // Europe/Kirov - 0xfaf5abef - &kZoneEurope_Malta, // Europe/Malta - 0xfb1560f3 - &kZoneEurope_Minsk, // Europe/Minsk - 0xfb19cc66 - &kZoneEurope_Bucharest, // Europe/Bucharest - 0xfb349ec5 - &kZoneAfrica_Khartoum, // Africa/Khartoum - 0xfb3d4205 - &kZoneEurope_Paris, // Europe/Paris - 0xfb4bc2a3 - &kZoneAsia_Yekaterinburg, // Asia/Yekaterinburg - 0xfb544c6e - &kZoneEurope_Sofia, // Europe/Sofia - 0xfb898656 - &kZoneAtlantic_Canary, // Atlantic/Canary - 0xfc23f2c2 - &kZoneAmerica_Campo_Grande, // America/Campo_Grande - 0xfec3e7a6 + &kZoneAsia_Kuala_Lumpur, // 0x014763c4, Asia/Kuala_Lumpur + &kZoneIndian_Cocos, // 0x021e86de, Indian/Cocos + &kZoneAmerica_St_Johns, // 0x04b14e6e, America/St_Johns + &kZoneAmerica_North_Dakota_New_Salem, // 0x04f9958e, America/North_Dakota/New_Salem + &kZoneAsia_Jakarta, // 0x0506ab50, Asia/Jakarta + &kZoneAmerica_Mazatlan, // 0x0532189e, America/Mazatlan + &kZonePacific_Fakaofo, // 0x06532bba, Pacific/Fakaofo + &kZoneAmerica_Hermosillo, // 0x065d21c4, America/Hermosillo + &kZoneAsia_Tbilisi, // 0x0903e442, Asia/Tbilisi + &kZoneAmerica_Indiana_Tell_City, // 0x09263612, America/Indiana/Tell_City + &kZoneAmerica_Boa_Vista, // 0x0a7b7efe, America/Boa_Vista + &kZoneAsia_Colombo, // 0x0af0e91d, Asia/Colombo + &kZoneCET, // 0x0b87d921, CET + &kZoneEET, // 0x0b87e1a3, EET + &kZoneEST, // 0x0b87e371, EST + &kZoneHST, // 0x0b87f034, HST + &kZoneMET, // 0x0b8803ab, MET + &kZoneMST, // 0x0b880579, MST + &kZoneWET, // 0x0b882e35, WET + &kZoneAmerica_Guatemala, // 0x0c8259f7, America/Guatemala + &kZoneAfrica_Monrovia, // 0x0ce90385, Africa/Monrovia + &kZoneAntarctica_Rothera, // 0x0e86d203, Antarctica/Rothera + &kZoneAmerica_Yellowknife, // 0x0f76c76f, America/Yellowknife + &kZoneAustralia_Melbourne, // 0x0fe559a3, Australia/Melbourne + &kZoneAmerica_Sao_Paulo, // 0x1063bfc9, America/Sao_Paulo + &kZoneEurope_Amsterdam, // 0x109395c2, Europe/Amsterdam + &kZoneAmerica_Indiana_Vevay, // 0x10aca054, America/Indiana/Vevay + &kZoneAmerica_Scoresbysund, // 0x123f8d2a, America/Scoresbysund + &kZoneAsia_Samarkand, // 0x13ae5104, Asia/Samarkand + &kZoneAsia_Amman, // 0x148d21bc, Asia/Amman + &kZoneAsia_Aqtau, // 0x148f710e, Asia/Aqtau + &kZoneAsia_Chita, // 0x14ae863b, Asia/Chita + &kZoneAsia_Dhaka, // 0x14c07b8b, Asia/Dhaka + &kZoneAsia_Dubai, // 0x14c79f77, Asia/Dubai + &kZoneAmerica_Bahia_Banderas, // 0x14f6329a, America/Bahia_Banderas + &kZoneAsia_Kabul, // 0x153b5601, Asia/Kabul + &kZoneAsia_Macau, // 0x155f88b9, Asia/Macau + &kZoneAsia_Qatar, // 0x15a8330b, Asia/Qatar + &kZoneAsia_Seoul, // 0x15ce82da, Asia/Seoul + &kZoneAsia_Tokyo, // 0x15e606a8, Asia/Tokyo + &kZoneAsia_Tomsk, // 0x15e60e60, Asia/Tomsk + &kZoneAsia_Thimphu, // 0x170380d1, Asia/Thimphu + &kZoneAmerica_Guayaquil, // 0x17e64958, America/Guayaquil + &kZoneAmerica_Kentucky_Louisville, // 0x1a21024b, America/Kentucky/Louisville + &kZoneAsia_Pontianak, // 0x1a76c057, Asia/Pontianak + &kZoneAtlantic_Reykjavik, // 0x1c2b4f74, Atlantic/Reykjavik + &kZoneAmerica_New_York, // 0x1e2a7654, America/New_York + &kZoneEurope_Luxembourg, // 0x1f8bc6ce, Europe/Luxembourg + &kZoneAsia_Baku, // 0x1fa788b5, Asia/Baku + &kZoneAsia_Dili, // 0x1fa8c394, Asia/Dili + &kZoneAsia_Gaza, // 0x1faa4875, Asia/Gaza + &kZoneAsia_Hovd, // 0x1fab0fe3, Asia/Hovd + &kZoneAsia_Omsk, // 0x1faeddac, Asia/Omsk + &kZoneAsia_Oral, // 0x1faef0a0, Asia/Oral + &kZoneAsia_Ho_Chi_Minh, // 0x20f2d127, Asia/Ho_Chi_Minh + &kZoneAsia_Damascus, // 0x20fbb063, Asia/Damascus + &kZonePacific_Apia, // 0x23359b5e, Pacific/Apia + &kZonePacific_Fiji, // 0x23383ba5, Pacific/Fiji + &kZonePacific_Guam, // 0x2338f9ed, Pacific/Guam + &kZonePacific_Niue, // 0x233ca014, Pacific/Niue + &kZonePacific_Wake, // 0x23416c2b, Pacific/Wake + &kZoneAustralia_Adelaide, // 0x2428e8a3, Australia/Adelaide + &kZonePacific_Auckland, // 0x25062f86, Pacific/Auckland + &kZonePacific_Tongatapu, // 0x262ca836, Pacific/Tongatapu + &kZoneAmerica_Monterrey, // 0x269a1deb, America/Monterrey + &kZoneAustralia_Darwin, // 0x2876bdff, Australia/Darwin + &kZonePacific_Pohnpei, // 0x28929f96, Pacific/Pohnpei + &kZoneAsia_Famagusta, // 0x289b4f8b, Asia/Famagusta + &kZoneAmerica_Indiana_Vincennes, // 0x28a0b212, America/Indiana/Vincennes + &kZoneAmerica_Indiana_Indianapolis, // 0x28a669a4, America/Indiana/Indianapolis + &kZoneAsia_Vladivostok, // 0x29de34a8, Asia/Vladivostok + &kZoneAmerica_Fortaleza, // 0x2ad018ee, America/Fortaleza + &kZoneAmerica_Vancouver, // 0x2c6f6b1f, America/Vancouver + &kZoneAmerica_Pangnirtung, // 0x2d999193, America/Pangnirtung + &kZoneAmerica_Iqaluit, // 0x2de310bf, America/Iqaluit + &kZonePacific_Chatham, // 0x2f0de999, Pacific/Chatham + &kZoneAmerica_Indiana_Marengo, // 0x2feeee72, America/Indiana/Marengo + &kZoneEurope_Tallinn, // 0x30c4e096, Europe/Tallinn + &kZoneAsia_Ulaanbaatar, // 0x30f0cc4e, Asia/Ulaanbaatar + &kZoneAmerica_Argentina_Ushuaia, // 0x320dcdde, America/Argentina/Ushuaia + &kZoneAustralia_Hobart, // 0x32bf951a, Australia/Hobart + &kZoneAsia_Dushanbe, // 0x32fc5c3c, Asia/Dushanbe + &kZoneAtlantic_South_Georgia, // 0x33013174, Atlantic/South_Georgia + &kZoneAmerica_Phoenix, // 0x34b5af01, America/Phoenix + &kZoneAntarctica_Mawson, // 0x399cd863, Antarctica/Mawson + &kZoneAmerica_Caracas, // 0x3be064f4, America/Caracas + &kZoneAmerica_Cayenne, // 0x3c617269, America/Cayenne + &kZoneAtlantic_Bermuda, // 0x3d4bb1c4, Atlantic/Bermuda + &kZoneAmerica_Managua, // 0x3d5e7600, America/Managua + &kZoneAmerica_Argentina_San_Juan, // 0x3e1009bd, America/Argentina/San_Juan + &kZoneAmerica_Argentina_San_Luis, // 0x3e11238c, America/Argentina/San_Luis + &kZoneEurope_Volgograd, // 0x3ed0f389, Europe/Volgograd + &kZoneAmerica_Fort_Nelson, // 0x3f437e0f, America/Fort_Nelson + &kZoneEtc_GMT_PLUS_10, // 0x3f8f1cc4, Etc/GMT+10 + &kZoneEtc_GMT_PLUS_11, // 0x3f8f1cc5, Etc/GMT+11 + &kZoneEtc_GMT_PLUS_12, // 0x3f8f1cc6, Etc/GMT+12 + &kZoneEtc_GMT_10, // 0x3f8f2546, Etc/GMT-10 + &kZoneEtc_GMT_11, // 0x3f8f2547, Etc/GMT-11 + &kZoneEtc_GMT_12, // 0x3f8f2548, Etc/GMT-12 + &kZoneEtc_GMT_13, // 0x3f8f2549, Etc/GMT-13 + &kZoneEtc_GMT_14, // 0x3f8f254a, Etc/GMT-14 + &kZoneAntarctica_Palmer, // 0x40962f4f, Antarctica/Palmer + &kZoneEurope_Athens, // 0x4318fa27, Europe/Athens + &kZoneIndian_Kerguelen, // 0x4351b389, Indian/Kerguelen + &kZoneAmerica_Indiana_Winamac, // 0x4413fa69, America/Indiana/Winamac + &kZoneEurope_Berlin, // 0x44644c20, Europe/Berlin + &kZoneIndian_Chagos, // 0x456f7c3c, Indian/Chagos + &kZoneIndian_Mahe, // 0x45e725e2, Indian/Mahe + &kZoneAsia_Ust_Nera, // 0x4785f921, Asia/Ust-Nera + &kZoneEurope_Dublin, // 0x4a275f62, Europe/Dublin + &kZoneAsia_Nicosia, // 0x4b0fcf78, Asia/Nicosia + &kZoneAmerica_Chicago, // 0x4b92b5d4, America/Chicago + &kZoneAustralia_Sydney, // 0x4d1e9776, Australia/Sydney + &kZoneAntarctica_Vostok, // 0x4f966fd4, Antarctica/Vostok + &kZoneAustralia_Brisbane, // 0x4fedc9c0, Australia/Brisbane + &kZoneAmerica_Asuncion, // 0x50ec79a6, America/Asuncion + &kZoneAsia_Karachi, // 0x527f5245, Asia/Karachi + &kZonePacific_Gambier, // 0x53720c3a, Pacific/Gambier + &kZoneAmerica_Whitehorse, // 0x54e0e3e8, America/Whitehorse + &kZoneAmerica_Martinique, // 0x551e84c5, America/Martinique + &kZoneAmerica_Jamaica, // 0x565dad6c, America/Jamaica + &kZoneAsia_Hong_Kong, // 0x577f28ac, Asia/Hong_Kong + &kZonePacific_Marquesas, // 0x57ca7135, Pacific/Marquesas + &kZoneAmerica_Miquelon, // 0x59674330, America/Miquelon + &kZoneAntarctica_DumontDUrville, // 0x5a3c656c, Antarctica/DumontDUrville + &kZoneAmerica_Anchorage, // 0x5a79260e, America/Anchorage + &kZoneAsia_Jerusalem, // 0x5becd23a, Asia/Jerusalem + &kZoneEurope_Stockholm, // 0x5bf6fbb8, Europe/Stockholm + &kZoneEurope_Lisbon, // 0x5c00a70b, Europe/Lisbon + &kZoneAtlantic_Cape_Verde, // 0x5c5e1772, Atlantic/Cape_Verde + &kZoneEurope_London, // 0x5c6a84ae, Europe/London + &kZoneEurope_Madrid, // 0x5dbd1535, Europe/Madrid + &kZoneAmerica_Moncton, // 0x5e07fe24, America/Moncton + &kZonePacific_Bougainville, // 0x5e10f7a4, Pacific/Bougainville + &kZoneEurope_Monaco, // 0x5ebf9f01, Europe/Monaco + &kZoneEurope_Moscow, // 0x5ec266fc, Europe/Moscow + &kZoneAmerica_Argentina_Jujuy, // 0x5f2f46c5, America/Argentina/Jujuy + &kZoneAmerica_Argentina_Salta, // 0x5fc73403, America/Argentina/Salta + &kZonePacific_Pago_Pago, // 0x603aebd0, Pacific/Pago_Pago + &kZonePacific_Enderbury, // 0x61599a93, Pacific/Enderbury + &kZoneAfrica_Sao_Tome, // 0x61b319d1, Africa/Sao_Tome + &kZoneAmerica_Creston, // 0x62a70204, America/Creston + &kZoneAmerica_Costa_Rica, // 0x63ff66be, America/Costa_Rica + &kZoneAsia_Qostanay, // 0x654fe522, Asia/Qostanay + &kZoneAmerica_Indiana_Knox, // 0x6554adc9, America/Indiana/Knox + &kZoneEurope_Prague, // 0x65ee5d48, Europe/Prague + &kZoneAmerica_Puerto_Rico, // 0x6752ca31, America/Puerto_Rico + &kZoneIndian_Christmas, // 0x68c207d5, Indian/Christmas + &kZoneAsia_Novokuznetsk, // 0x69264f93, Asia/Novokuznetsk + &kZoneAmerica_Curacao, // 0x6a879184, America/Curacao + &kZoneAmerica_Tijuana, // 0x6aa1df72, America/Tijuana + &kZoneAsia_Makassar, // 0x6aa21c85, Asia/Makassar + &kZoneEurope_Helsinki, // 0x6ab2975b, Europe/Helsinki + &kZoneAmerica_Porto_Velho, // 0x6b1aac77, America/Porto_Velho + &kZoneEurope_Samara, // 0x6bc0b139, Europe/Samara + &kZoneAmerica_Edmonton, // 0x6cb9484a, America/Edmonton + &kZoneAmerica_Dawson_Creek, // 0x6cf24e5b, America/Dawson_Creek + &kZoneAmerica_Grand_Turk, // 0x6e216197, America/Grand_Turk + &kZoneAmerica_Blanc_Sablon, // 0x6e299892, America/Blanc-Sablon + &kZoneEurope_Tirane, // 0x6ea95b47, Europe/Tirane + &kZoneAmerica_Araguaina, // 0x6f9a3aef, America/Araguaina + &kZoneIndian_Reunion, // 0x7076c047, Indian/Reunion + &kZoneAsia_Qyzylorda, // 0x71282e81, Asia/Qyzylorda + &kZoneAsia_Kolkata, // 0x72c06cd9, Asia/Kolkata + &kZoneEurope_Vienna, // 0x734cc2e5, Europe/Vienna + &kZoneAsia_Kamchatka, // 0x73baf9d7, Asia/Kamchatka + &kZoneAmerica_Santarem, // 0x740caec1, America/Santarem + &kZoneAmerica_Santiago, // 0x7410c9bc, America/Santiago + &kZoneEurope_Warsaw, // 0x75185c19, Europe/Warsaw + &kZoneAmerica_El_Salvador, // 0x752ad652, America/El_Salvador + &kZoneAfrica_Bissau, // 0x75564141, Africa/Bissau + &kZoneAmerica_Santo_Domingo, // 0x75a0d177, America/Santo_Domingo + &kZoneAfrica_Accra, // 0x77d5b054, Africa/Accra + &kZoneAfrica_Cairo, // 0x77f8e228, Africa/Cairo + &kZoneAfrica_Ceuta, // 0x77fb46ec, Africa/Ceuta + &kZoneAfrica_Lagos, // 0x789bb5d0, Africa/Lagos + &kZoneAfrica_Windhoek, // 0x789c9bd3, Africa/Windhoek + &kZoneAmerica_Toronto, // 0x792e851b, America/Toronto + &kZoneAfrica_Tunis, // 0x79378e6d, Africa/Tunis + &kZoneIndian_Mauritius, // 0x7b09c02a, Indian/Mauritius + &kZoneAtlantic_Stanley, // 0x7bb3e1c4, Atlantic/Stanley + &kZoneEurope_Zurich, // 0x7d8195b9, Europe/Zurich + &kZoneAsia_Kuching, // 0x801b003b, Asia/Kuching + &kZoneAtlantic_Madeira, // 0x81b5c037, Atlantic/Madeira + &kZoneAmerica_Atikokan, // 0x81b92098, America/Atikokan + &kZonePacific_Kiritimati, // 0x8305073a, Pacific/Kiritimati + &kZoneAmerica_Metlakatla, // 0x84de2686, America/Metlakatla + &kZoneAsia_Yakutsk, // 0x87bb3a9e, Asia/Yakutsk + &kZoneAmerica_Chihuahua, // 0x8827d776, America/Chihuahua + &kZonePacific_Pitcairn, // 0x8837d8bd, Pacific/Pitcairn + &kZonePacific_Chuuk, // 0x8a090b23, Pacific/Chuuk + &kZonePacific_Efate, // 0x8a2bce28, Pacific/Efate + &kZonePacific_Nauru, // 0x8acc41ae, Pacific/Nauru + &kZoneEST5EDT, // 0x8adc72a3, EST5EDT + &kZonePacific_Palau, // 0x8af04a36, Pacific/Palau + &kZoneAmerica_Winnipeg, // 0x8c7dafc7, America/Winnipeg + &kZoneAustralia_Eucla, // 0x8cf99e44, Australia/Eucla + &kZoneAmerica_Argentina_Catamarca, // 0x8d40986b, America/Argentina/Catamarca + &kZoneAustralia_Perth, // 0x8db8269d, Australia/Perth + &kZonePacific_Kwajalein, // 0x8e216759, Pacific/Kwajalein + &kZoneAmerica_Port_au_Prince, // 0x8e4a7bdc, America/Port-au-Prince + &kZoneAfrica_Maputo, // 0x8e6ca1f0, Africa/Maputo + &kZonePacific_Norfolk, // 0x8f4eb4be, Pacific/Norfolk + &kZoneAsia_Yerevan, // 0x9185c8cc, Asia/Yerevan + &kZoneAmerica_Detroit, // 0x925cfbc1, America/Detroit + &kZoneAsia_Choibalsan, // 0x928aa4a6, Asia/Choibalsan + &kZoneAntarctica_Macquarie, // 0x92f47626, Antarctica/Macquarie + &kZoneAmerica_Belize, // 0x93256c81, America/Belize + &kZoneAmerica_Bogota, // 0x93d7bc62, America/Bogota + &kZoneAsia_Pyongyang, // 0x93ed1c8e, Asia/Pyongyang + &kZoneAmerica_Indiana_Petersburg, // 0x94ac7acc, America/Indiana/Petersburg + &kZoneAmerica_Cancun, // 0x953331be, America/Cancun + &kZoneAmerica_Glace_Bay, // 0x9681f8dd, America/Glace_Bay + &kZoneAsia_Khandyga, // 0x9685a4d9, Asia/Khandyga + &kZoneAmerica_Cuiaba, // 0x969a52eb, America/Cuiaba + &kZoneAmerica_Dawson, // 0x978d8d12, America/Dawson + &kZoneAmerica_Denver, // 0x97d10b2a, America/Denver + &kZoneAmerica_Bahia, // 0x97d815fb, America/Bahia + &kZoneAmerica_Belem, // 0x97da580b, America/Belem + &kZoneAmerica_Boise, // 0x97dfc8d8, America/Boise + &kZoneEurope_Andorra, // 0x97f6764b, Europe/Andorra + &kZoneAmerica_Adak, // 0x97fe49d7, America/Adak + &kZoneAmerica_Lima, // 0x980468c9, America/Lima + &kZoneAmerica_Nome, // 0x98059b15, America/Nome + &kZoneAmerica_Nuuk, // 0x9805b5a9, America/Nuuk + &kZoneIndian_Maldives, // 0x9869681c, Indian/Maldives + &kZoneAmerica_Sitka, // 0x99104ce2, America/Sitka + &kZoneAmerica_Thule, // 0x9921dd68, America/Thule + &kZonePacific_Rarotonga, // 0x9981a3b0, Pacific/Rarotonga + &kZoneAsia_Kathmandu, // 0x9a96ce6f, Asia/Kathmandu + &kZoneAmerica_North_Dakota_Beulah, // 0x9b52b384, America/North_Dakota/Beulah + &kZoneAmerica_Rainy_River, // 0x9cd58a10, America/Rainy_River + &kZoneEurope_Budapest, // 0x9ce0197c, Europe/Budapest + &kZoneAsia_Baghdad, // 0x9ceffbed, Asia/Baghdad + &kZoneEtc_GMT_PLUS_1, // 0x9d13da14, Etc/GMT+1 + &kZoneEtc_GMT_PLUS_2, // 0x9d13da15, Etc/GMT+2 + &kZoneEtc_GMT_PLUS_3, // 0x9d13da16, Etc/GMT+3 + &kZoneEtc_GMT_PLUS_4, // 0x9d13da17, Etc/GMT+4 + &kZoneEtc_GMT_PLUS_5, // 0x9d13da18, Etc/GMT+5 + &kZoneEtc_GMT_PLUS_6, // 0x9d13da19, Etc/GMT+6 + &kZoneEtc_GMT_PLUS_7, // 0x9d13da1a, Etc/GMT+7 + &kZoneEtc_GMT_PLUS_8, // 0x9d13da1b, Etc/GMT+8 + &kZoneEtc_GMT_PLUS_9, // 0x9d13da1c, Etc/GMT+9 + &kZoneEtc_GMT_1, // 0x9d13da56, Etc/GMT-1 + &kZoneEtc_GMT_2, // 0x9d13da57, Etc/GMT-2 + &kZoneEtc_GMT_3, // 0x9d13da58, Etc/GMT-3 + &kZoneEtc_GMT_4, // 0x9d13da59, Etc/GMT-4 + &kZoneEtc_GMT_5, // 0x9d13da5a, Etc/GMT-5 + &kZoneEtc_GMT_6, // 0x9d13da5b, Etc/GMT-6 + &kZoneEtc_GMT_7, // 0x9d13da5c, Etc/GMT-7 + &kZoneEtc_GMT_8, // 0x9d13da5d, Etc/GMT-8 + &kZoneEtc_GMT_9, // 0x9d13da5e, Etc/GMT-9 + &kZoneAmerica_Nipigon, // 0x9d2a8b1a, America/Nipigon + &kZoneAmerica_Rio_Branco, // 0x9d352764, America/Rio_Branco + &kZoneAsia_Bangkok, // 0x9d6e3aaf, Asia/Bangkok + &kZoneAfrica_El_Aaiun, // 0x9d6fb118, Africa/El_Aaiun + &kZoneAmerica_North_Dakota_Center, // 0x9da42814, America/North_Dakota/Center + &kZoneAsia_Barnaul, // 0x9dba4997, Asia/Barnaul + &kZoneAfrica_Tripoli, // 0x9dfebd3d, Africa/Tripoli + &kZoneEurope_Istanbul, // 0x9e09d6e6, Europe/Istanbul + &kZoneAfrica_Ndjamena, // 0x9fe09898, Africa/Ndjamena + &kZoneAmerica_Guyana, // 0x9ff7bd0b, America/Guyana + &kZoneAmerica_Havana, // 0xa0e15675, America/Havana + &kZoneAsia_Novosibirsk, // 0xa2a435cb, Asia/Novosibirsk + &kZoneEurope_Kiev, // 0xa2c19eb3, Europe/Kiev + &kZoneEurope_Oslo, // 0xa2c3fba1, Europe/Oslo + &kZoneEurope_Riga, // 0xa2c57587, Europe/Riga + &kZoneEurope_Rome, // 0xa2c58fd7, Europe/Rome + &kZoneAmerica_Inuvik, // 0xa42189fc, America/Inuvik + &kZoneAmerica_Argentina_La_Rioja, // 0xa46b7eef, America/Argentina/La_Rioja + &kZoneAsia_Almaty, // 0xa61f41fa, Asia/Almaty + &kZoneAsia_Anadyr, // 0xa63cebd1, Asia/Anadyr + &kZoneAsia_Aqtobe, // 0xa67dcc4e, Asia/Aqtobe + &kZoneAsia_Atyrau, // 0xa6b6e068, Asia/Atyrau + &kZoneAmerica_Juneau, // 0xa6f13e2e, America/Juneau + &kZoneAustralia_Lord_Howe, // 0xa748b67d, Australia/Lord_Howe + &kZonePacific_Port_Moresby, // 0xa7ba7f68, Pacific/Port_Moresby + &kZoneAsia_Beirut, // 0xa7f3d5fd, Asia/Beirut + &kZoneAfrica_Nairobi, // 0xa87ab57e, Africa/Nairobi + &kZoneAsia_Brunei, // 0xa8e595f7, Asia/Brunei + &kZonePacific_Galapagos, // 0xa952f752, Pacific/Galapagos + &kZoneAmerica_Argentina_Mendoza, // 0xa9f72d5c, America/Argentina/Mendoza + &kZoneAmerica_La_Paz, // 0xaa29125d, America/La_Paz + &kZoneAmerica_Noronha, // 0xab5116fb, America/Noronha + &kZoneAmerica_Maceio, // 0xac80c6d4, America/Maceio + &kZoneAmerica_Manaus, // 0xac86bf8b, America/Manaus + &kZoneAmerica_Merida, // 0xacd172d8, America/Merida + &kZoneEurope_Chisinau, // 0xad58aa18, Europe/Chisinau + &kZoneAmerica_Nassau, // 0xaedef011, America/Nassau + &kZoneEurope_Uzhgorod, // 0xb066f5d6, Europe/Uzhgorod + &kZoneAustralia_Broken_Hill, // 0xb06eada3, Australia/Broken_Hill + &kZoneAsia_Bishkek, // 0xb0728553, Asia/Bishkek + &kZoneAmerica_Paramaribo, // 0xb319e4c4, America/Paramaribo + &kZoneAmerica_Panama, // 0xb3863854, America/Panama + &kZoneAsia_Hebron, // 0xb5eef250, Asia/Hebron + &kZoneAmerica_Goose_Bay, // 0xb649541e, America/Goose_Bay + &kZoneAmerica_Los_Angeles, // 0xb7f7e8f2, America/Los_Angeles + &kZoneAmerica_Recife, // 0xb8730494, America/Recife + &kZoneAmerica_Regina, // 0xb875371c, America/Regina + &kZoneAsia_Ashgabat, // 0xba87598d, Asia/Ashgabat + &kZoneAmerica_Halifax, // 0xbc5b7183, America/Halifax + &kZoneAsia_Srednekolymsk, // 0xbf8e337d, Asia/Srednekolymsk + &kZoneAmerica_Argentina_Cordoba, // 0xbfccc308, America/Argentina/Cordoba + &kZoneAmerica_Tegucigalpa, // 0xbfd6fd4c, America/Tegucigalpa + &kZoneAsia_Manila, // 0xc156c944, Asia/Manila + &kZoneAfrica_Abidjan, // 0xc21305a3, Africa/Abidjan + &kZoneAmerica_Punta_Arenas, // 0xc2c3bce7, America/Punta_Arenas + &kZoneAfrica_Casablanca, // 0xc59f1b33, Africa/Casablanca + &kZoneAmerica_Argentina_Rio_Gallegos, // 0xc5b0f565, America/Argentina/Rio_Gallegos + &kZoneAsia_Jayapura, // 0xc6833c2f, Asia/Jayapura + &kZoneAmerica_Resolute, // 0xc7093459, America/Resolute + &kZoneAmerica_Rankin_Inlet, // 0xc8de4984, America/Rankin_Inlet + &kZoneAmerica_Barbados, // 0xcbbc3b04, America/Barbados + &kZoneAsia_Riyadh, // 0xcd973d93, Asia/Riyadh + &kZonePacific_Easter, // 0xcf54f7e7, Pacific/Easter + &kZoneAsia_Singapore, // 0xcf8581fa, Asia/Singapore + &kZoneAsia_Krasnoyarsk, // 0xd0376c6a, Asia/Krasnoyarsk + &kZoneAmerica_Mexico_City, // 0xd0d93f43, America/Mexico_City + &kZoneAsia_Taipei, // 0xd1a844ae, Asia/Taipei + &kZoneAsia_Tehran, // 0xd1f02254, Asia/Tehran + &kZoneEurope_Kaliningrad, // 0xd33b2f28, Europe/Kaliningrad + &kZoneAmerica_Argentina_Buenos_Aires, // 0xd43b4c0d, America/Argentina/Buenos_Aires + &kZoneAfrica_Juba, // 0xd51b395c, Africa/Juba + &kZoneAsia_Urumqi, // 0xd5379735, Asia/Urumqi + &kZoneAmerica_Cambridge_Bay, // 0xd5a44aff, America/Cambridge_Bay + &kZoneAfrica_Johannesburg, // 0xd5d157a0, Africa/Johannesburg + &kZoneAmerica_Port_of_Spain, // 0xd8b28d59, America/Port_of_Spain + &kZoneEtc_GMT, // 0xd8e2de58, Etc/GMT + &kZoneEtc_UTC, // 0xd8e31abc, Etc/UTC + &kZoneAmerica_Yakutat, // 0xd8ee31e9, America/Yakutat + &kZoneAfrica_Algiers, // 0xd94515c1, Africa/Algiers + &kZonePST8PDT, // 0xd99ee2dc, PST8PDT + &kZoneEurope_Simferopol, // 0xda9eb724, Europe/Simferopol + &kZonePacific_Funafuti, // 0xdb402d65, Pacific/Funafuti + &kZoneAmerica_Matamoros, // 0xdd1b0259, America/Matamoros + &kZoneAsia_Yangon, // 0xdd54a8be, Asia/Yangon + &kZoneEurope_Vilnius, // 0xdd63b8ce, Europe/Vilnius + &kZonePacific_Kosrae, // 0xde5139a8, Pacific/Kosrae + &kZoneAmerica_Kentucky_Monticello, // 0xde71c439, America/Kentucky/Monticello + &kZoneEurope_Brussels, // 0xdee07337, Europe/Brussels + &kZoneAmerica_Swift_Current, // 0xdef98e55, America/Swift_Current + &kZoneAsia_Irkutsk, // 0xdfbf213f, Asia/Irkutsk + &kZoneEurope_Ulyanovsk, // 0xe03783d0, Europe/Ulyanovsk + &kZoneAustralia_Lindeman, // 0xe05029e2, Australia/Lindeman + &kZoneEurope_Belgrade, // 0xe0532b3a, Europe/Belgrade + &kZoneAmerica_Menominee, // 0xe0e9c583, America/Menominee + &kZoneEurope_Copenhagen, // 0xe0ed30bc, Europe/Copenhagen + &kZoneAtlantic_Faroe, // 0xe110a971, Atlantic/Faroe + &kZonePacific_Majuro, // 0xe1f95371, Pacific/Majuro + &kZoneAntarctica_Casey, // 0xe2022583, Antarctica/Casey + &kZoneAntarctica_Davis, // 0xe2144b45, Antarctica/Davis + &kZoneEurope_Astrakhan, // 0xe22256e1, Europe/Astrakhan + &kZoneAntarctica_Syowa, // 0xe330c7e1, Antarctica/Syowa + &kZoneAntarctica_Troll, // 0xe33f085b, Antarctica/Troll + &kZoneEurope_Saratov, // 0xe4315da4, Europe/Saratov + &kZonePacific_Noumea, // 0xe551b788, Pacific/Noumea + &kZonePacific_Honolulu, // 0xe6e70af9, Pacific/Honolulu + &kZoneAmerica_Argentina_Tucuman, // 0xe96399eb, America/Argentina/Tucuman + &kZoneEurope_Zaporozhye, // 0xeab9767f, Europe/Zaporozhye + &kZoneAsia_Magadan, // 0xebacc19b, Asia/Magadan + &kZoneAmerica_Ojinaga, // 0xebfde83f, America/Ojinaga + &kZoneCST6CDT, // 0xf0e87d00, CST6CDT + &kZonePacific_Tahiti, // 0xf24c2446, Pacific/Tahiti + &kZonePacific_Tarawa, // 0xf2517e63, Pacific/Tarawa + &kZoneMST7MDT, // 0xf2af9375, MST7MDT + &kZoneAsia_Tashkent, // 0xf3924254, Asia/Tashkent + &kZoneAsia_Sakhalin, // 0xf4a1c9bd, Asia/Sakhalin + &kZonePacific_Guadalcanal, // 0xf4dd25f0, Pacific/Guadalcanal + &kZoneAmerica_Danmarkshavn, // 0xf554d204, America/Danmarkshavn + &kZoneAsia_Shanghai, // 0xf895a7f5, Asia/Shanghai + &kZoneEurope_Gibraltar, // 0xf8e325fc, Europe/Gibraltar + &kZoneAtlantic_Azores, // 0xf93ed918, Atlantic/Azores + &kZonePacific_Wallis, // 0xf94ddb0f, Pacific/Wallis + &kZoneAmerica_Thunder_Bay, // 0xf962e71b, America/Thunder_Bay + &kZoneAmerica_Eirunepe, // 0xf9b29683, America/Eirunepe + &kZoneAmerica_Montevideo, // 0xfa214780, America/Montevideo + &kZoneEurope_Kirov, // 0xfaf5abef, Europe/Kirov + &kZoneEurope_Malta, // 0xfb1560f3, Europe/Malta + &kZoneEurope_Minsk, // 0xfb19cc66, Europe/Minsk + &kZoneEurope_Bucharest, // 0xfb349ec5, Europe/Bucharest + &kZoneAfrica_Khartoum, // 0xfb3d4205, Africa/Khartoum + &kZoneEurope_Paris, // 0xfb4bc2a3, Europe/Paris + &kZoneAsia_Yekaterinburg, // 0xfb544c6e, Asia/Yekaterinburg + &kZoneEurope_Sofia, // 0xfb898656, Europe/Sofia + &kZoneAtlantic_Canary, // 0xfc23f2c2, Atlantic/Canary + &kZoneAmerica_Campo_Grande, // 0xfec3e7a6, America/Campo_Grande + +}; + +//--------------------------------------------------------------------------- +// Zone and Link registry. Sorted by zoneId. +//--------------------------------------------------------------------------- +const extended::ZoneInfo* const kZoneAndLinkRegistry[593] ACE_TIME_PROGMEM = { + &kZoneGB, // 0x005973ae, GB -> Europe/London + &kZoneNZ, // 0x005974ad, NZ -> Pacific/Auckland + &kZoneAsia_Kuala_Lumpur, // 0x014763c4, Asia/Kuala_Lumpur + &kZoneAfrica_Libreville, // 0x01d96de4, Africa/Libreville -> Africa/Lagos + &kZoneIndian_Cocos, // 0x021e86de, Indian/Cocos + &kZoneAustralia_Victoria, // 0x0260d5db, Australia/Victoria -> Australia/Melbourne + &kZoneAtlantic_Faeroe, // 0x031ec516, Atlantic/Faeroe -> Atlantic/Faroe + &kZoneAmerica_St_Johns, // 0x04b14e6e, America/St_Johns + &kZoneAmerica_St_Kitts, // 0x04c0507b, America/St_Kitts -> America/Port_of_Spain + &kZoneAfrica_Ouagadougou, // 0x04d7219a, Africa/Ouagadougou -> Africa/Abidjan + &kZoneAmerica_St_Lucia, // 0x04d8b3ba, America/St_Lucia -> America/Port_of_Spain + &kZoneAmerica_North_Dakota_New_Salem, // 0x04f9958e, America/North_Dakota/New_Salem + &kZoneAsia_Jakarta, // 0x0506ab50, Asia/Jakarta + &kZoneAfrica_Bujumbura, // 0x05232a47, Africa/Bujumbura -> Africa/Maputo + &kZoneAmerica_Mazatlan, // 0x0532189e, America/Mazatlan + &kZoneAmerica_St_Barthelemy, // 0x054e6a79, America/St_Barthelemy -> America/Port_of_Spain + &kZoneAfrica_Addis_Ababa, // 0x05ae1e65, Africa/Addis_Ababa -> Africa/Nairobi + &kZonePacific_Fakaofo, // 0x06532bba, Pacific/Fakaofo + &kZoneAmerica_Hermosillo, // 0x065d21c4, America/Hermosillo + &kZoneMexico_BajaSur, // 0x08ee3641, Mexico/BajaSur -> America/Mazatlan + &kZoneAsia_Tbilisi, // 0x0903e442, Asia/Tbilisi + &kZoneAmerica_Indiana_Tell_City, // 0x09263612, America/Indiana/Tell_City + &kZoneUS_Hawaii, // 0x09c8de2f, US/Hawaii -> Pacific/Honolulu + &kZoneAmerica_Boa_Vista, // 0x0a7b7efe, America/Boa_Vista + &kZoneAsia_Colombo, // 0x0af0e91d, Asia/Colombo + &kZoneCET, // 0x0b87d921, CET + &kZoneEET, // 0x0b87e1a3, EET + &kZoneEST, // 0x0b87e371, EST + &kZoneGMT, // 0x0b87eb2d, GMT -> Etc/GMT + &kZoneHST, // 0x0b87f034, HST + &kZoneMET, // 0x0b8803ab, MET + &kZoneMST, // 0x0b880579, MST + &kZonePRC, // 0x0b88120a, PRC -> Asia/Shanghai + &kZoneROC, // 0x0b881a29, ROC -> Asia/Taipei + &kZoneROK, // 0x0b881a31, ROK -> Asia/Seoul + &kZoneUCT, // 0x0b882571, UCT -> Etc/UTC + &kZoneUTC, // 0x0b882791, UTC -> Etc/UTC + &kZoneWET, // 0x0b882e35, WET + &kZoneAmerica_Guatemala, // 0x0c8259f7, America/Guatemala + &kZoneEurope_Mariehamn, // 0x0caa6496, Europe/Mariehamn -> Europe/Helsinki + &kZoneAfrica_Monrovia, // 0x0ce90385, Africa/Monrovia + &kZoneEgypt, // 0x0d1a278e, Egypt -> Africa/Cairo + &kZoneGMT_PLUS_0, // 0x0d2f7028, GMT+0 -> Etc/GMT + &kZoneGMT_0, // 0x0d2f706a, GMT-0 -> Etc/GMT + &kZoneJapan, // 0x0d712f8f, Japan -> Asia/Tokyo + &kZoneLibya, // 0x0d998b16, Libya -> Africa/Tripoli + &kZoneKwajalein, // 0x0e57afbb, Kwajalein -> Pacific/Kwajalein + &kZoneAntarctica_Rothera, // 0x0e86d203, Antarctica/Rothera + &kZoneAmerica_Yellowknife, // 0x0f76c76f, America/Yellowknife + &kZoneAustralia_Melbourne, // 0x0fe559a3, Australia/Melbourne + &kZoneAmerica_Sao_Paulo, // 0x1063bfc9, America/Sao_Paulo + &kZoneEurope_Amsterdam, // 0x109395c2, Europe/Amsterdam + &kZoneAmerica_Indiana_Vevay, // 0x10aca054, America/Indiana/Vevay + &kZoneAmerica_Scoresbysund, // 0x123f8d2a, America/Scoresbysund + &kZoneAsia_Samarkand, // 0x13ae5104, Asia/Samarkand + &kZoneAsia_Amman, // 0x148d21bc, Asia/Amman + &kZoneAsia_Aqtau, // 0x148f710e, Asia/Aqtau + &kZoneAsia_Chita, // 0x14ae863b, Asia/Chita + &kZoneAsia_Dacca, // 0x14bcac5e, Asia/Dacca -> Asia/Dhaka + &kZoneAsia_Dhaka, // 0x14c07b8b, Asia/Dhaka + &kZoneAsia_Dubai, // 0x14c79f77, Asia/Dubai + &kZoneAmerica_Bahia_Banderas, // 0x14f6329a, America/Bahia_Banderas + &kZoneAsia_Kabul, // 0x153b5601, Asia/Kabul + &kZoneAsia_Ashkhabad, // 0x15454f09, Asia/Ashkhabad -> Asia/Ashgabat + &kZoneAsia_Macao, // 0x155f88b3, Asia/Macao -> Asia/Macau + &kZoneAsia_Macau, // 0x155f88b9, Asia/Macau + &kZoneAsia_Qatar, // 0x15a8330b, Asia/Qatar + &kZoneAsia_Seoul, // 0x15ce82da, Asia/Seoul + &kZoneAsia_Tokyo, // 0x15e606a8, Asia/Tokyo + &kZoneAsia_Tomsk, // 0x15e60e60, Asia/Tomsk + &kZoneAsia_Tel_Aviv, // 0x166d7c2c, Asia/Tel_Aviv -> Asia/Jerusalem + &kZoneAsia_Thimphu, // 0x170380d1, Asia/Thimphu + &kZoneAmerica_Guayaquil, // 0x17e64958, America/Guayaquil + &kZoneAmerica_Montserrat, // 0x199b0a35, America/Montserrat -> America/Port_of_Spain + &kZoneAmerica_Kentucky_Louisville, // 0x1a21024b, America/Kentucky/Louisville + &kZoneAsia_Pontianak, // 0x1a76c057, Asia/Pontianak + &kZoneEurope_Podgorica, // 0x1c1a499c, Europe/Podgorica -> Europe/Belgrade + &kZoneAtlantic_Reykjavik, // 0x1c2b4f74, Atlantic/Reykjavik + &kZoneAmerica_New_York, // 0x1e2a7654, America/New_York + &kZoneEurope_Luxembourg, // 0x1f8bc6ce, Europe/Luxembourg + &kZoneAsia_Aden, // 0x1fa7084a, Asia/Aden -> Asia/Riyadh + &kZoneAsia_Baku, // 0x1fa788b5, Asia/Baku + &kZoneAsia_Dili, // 0x1fa8c394, Asia/Dili + &kZoneAsia_Gaza, // 0x1faa4875, Asia/Gaza + &kZoneAsia_Hovd, // 0x1fab0fe3, Asia/Hovd + &kZoneAsia_Omsk, // 0x1faeddac, Asia/Omsk + &kZoneAsia_Oral, // 0x1faef0a0, Asia/Oral + &kZoneAmerica_Montreal, // 0x203a1ea8, America/Montreal -> America/Toronto + &kZoneAsia_Ho_Chi_Minh, // 0x20f2d127, Asia/Ho_Chi_Minh + &kZoneAsia_Damascus, // 0x20fbb063, Asia/Damascus + &kZoneAmerica_Argentina_ComodRivadavia, // 0x22758877, America/Argentina/ComodRivadavia -> America/Argentina/Catamarca + &kZonePacific_Apia, // 0x23359b5e, Pacific/Apia + &kZonePacific_Fiji, // 0x23383ba5, Pacific/Fiji + &kZonePacific_Guam, // 0x2338f9ed, Pacific/Guam + &kZonePacific_Niue, // 0x233ca014, Pacific/Niue + &kZonePacific_Truk, // 0x234010a9, Pacific/Truk -> Pacific/Chuuk + &kZonePacific_Wake, // 0x23416c2b, Pacific/Wake + &kZoneAustralia_Adelaide, // 0x2428e8a3, Australia/Adelaide + &kZonePacific_Auckland, // 0x25062f86, Pacific/Auckland + &kZonePacific_Tongatapu, // 0x262ca836, Pacific/Tongatapu + &kZoneAmerica_Monterrey, // 0x269a1deb, America/Monterrey + &kZoneEtc_Greenwich, // 0x26daa98c, Etc/Greenwich -> Etc/GMT + &kZoneAustralia_Currie, // 0x278b6a24, Australia/Currie -> Australia/Hobart + &kZoneAustralia_Darwin, // 0x2876bdff, Australia/Darwin + &kZonePacific_Pohnpei, // 0x28929f96, Pacific/Pohnpei + &kZoneAsia_Famagusta, // 0x289b4f8b, Asia/Famagusta + &kZoneAmerica_Indiana_Vincennes, // 0x28a0b212, America/Indiana/Vincennes + &kZoneAmerica_Indiana_Indianapolis, // 0x28a669a4, America/Indiana/Indianapolis + &kZoneAsia_Vladivostok, // 0x29de34a8, Asia/Vladivostok + &kZoneAustralia_Canberra, // 0x2a09ae58, Australia/Canberra -> Australia/Sydney + &kZoneAmerica_Fortaleza, // 0x2ad018ee, America/Fortaleza + &kZoneAmerica_Vancouver, // 0x2c6f6b1f, America/Vancouver + &kZoneAmerica_Pangnirtung, // 0x2d999193, America/Pangnirtung + &kZoneAmerica_Iqaluit, // 0x2de310bf, America/Iqaluit + &kZoneJamaica, // 0x2e44fdab, Jamaica -> America/Jamaica + &kZonePacific_Chatham, // 0x2f0de999, Pacific/Chatham + &kZoneEtc_Universal, // 0x2f8cb9a9, Etc/Universal -> Etc/UTC + &kZoneAmerica_Indiana_Marengo, // 0x2feeee72, America/Indiana/Marengo + &kZoneEurope_Tallinn, // 0x30c4e096, Europe/Tallinn + &kZoneAfrica_Djibouti, // 0x30ea01d4, Africa/Djibouti -> Africa/Nairobi + &kZoneAsia_Ulaanbaatar, // 0x30f0cc4e, Asia/Ulaanbaatar + &kZoneAfrica_Gaborone, // 0x317c0aa7, Africa/Gaborone -> Africa/Maputo + &kZoneAmerica_Argentina_Ushuaia, // 0x320dcdde, America/Argentina/Ushuaia + &kZoneAsia_Calcutta, // 0x328a44c3, Asia/Calcutta -> Asia/Kolkata + &kZoneAustralia_Hobart, // 0x32bf951a, Australia/Hobart + &kZoneAsia_Dushanbe, // 0x32fc5c3c, Asia/Dushanbe + &kZoneAtlantic_South_Georgia, // 0x33013174, Atlantic/South_Georgia + &kZoneAmerica_Phoenix, // 0x34b5af01, America/Phoenix + &kZoneAsia_Istanbul, // 0x382e7894, Asia/Istanbul -> Europe/Istanbul + &kZoneAsia_Ulan_Bator, // 0x394db4d9, Asia/Ulan_Bator -> Asia/Ulaanbaatar + &kZoneAntarctica_Mawson, // 0x399cd863, Antarctica/Mawson + &kZoneAfrica_Brazzaville, // 0x39cda760, Africa/Brazzaville -> Africa/Lagos + &kZoneAmerica_Caracas, // 0x3be064f4, America/Caracas + &kZoneAmerica_Cayenne, // 0x3c617269, America/Cayenne + &kZoneAfrica_Porto_Novo, // 0x3d1bf95d, Africa/Porto-Novo -> Africa/Lagos + &kZoneAtlantic_Bermuda, // 0x3d4bb1c4, Atlantic/Bermuda + &kZoneAmerica_Managua, // 0x3d5e7600, America/Managua + &kZoneAmerica_Marigot, // 0x3dab3a59, America/Marigot -> America/Port_of_Spain + &kZoneEurope_Guernsey, // 0x3db12c16, Europe/Guernsey -> Europe/London + &kZoneAfrica_Nouakchott, // 0x3dc49dba, Africa/Nouakchott -> Africa/Abidjan + &kZoneAmerica_Louisville, // 0x3dcb47ee, America/Louisville -> America/Kentucky/Louisville + &kZoneAmerica_Argentina_San_Juan, // 0x3e1009bd, America/Argentina/San_Juan + &kZoneAmerica_Argentina_San_Luis, // 0x3e11238c, America/Argentina/San_Luis + &kZoneEurope_Volgograd, // 0x3ed0f389, Europe/Volgograd + &kZoneAmerica_Fort_Nelson, // 0x3f437e0f, America/Fort_Nelson + &kZoneEtc_GMT_PLUS_10, // 0x3f8f1cc4, Etc/GMT+10 + &kZoneEtc_GMT_PLUS_11, // 0x3f8f1cc5, Etc/GMT+11 + &kZoneEtc_GMT_PLUS_12, // 0x3f8f1cc6, Etc/GMT+12 + &kZoneEtc_GMT_10, // 0x3f8f2546, Etc/GMT-10 + &kZoneEtc_GMT_11, // 0x3f8f2547, Etc/GMT-11 + &kZoneEtc_GMT_12, // 0x3f8f2548, Etc/GMT-12 + &kZoneEtc_GMT_13, // 0x3f8f2549, Etc/GMT-13 + &kZoneEtc_GMT_14, // 0x3f8f254a, Etc/GMT-14 + &kZoneAntarctica_Palmer, // 0x40962f4f, Antarctica/Palmer + &kZoneCanada_Pacific, // 0x40fa3c7b, Canada/Pacific -> America/Vancouver + &kZoneEurope_Athens, // 0x4318fa27, Europe/Athens + &kZoneIndian_Kerguelen, // 0x4351b389, Indian/Kerguelen + &kZoneAmerica_Indiana_Winamac, // 0x4413fa69, America/Indiana/Winamac + &kZoneEurope_Berlin, // 0x44644c20, Europe/Berlin + &kZoneAtlantic_St_Helena, // 0x451fc5f7, Atlantic/St_Helena -> Africa/Abidjan + &kZoneIndian_Chagos, // 0x456f7c3c, Indian/Chagos + &kZoneIndian_Mahe, // 0x45e725e2, Indian/Mahe + &kZoneIndian_Comoro, // 0x45f4deb6, Indian/Comoro -> Africa/Nairobi + &kZoneAmerica_Mendoza, // 0x46b4e054, America/Mendoza -> America/Argentina/Mendoza + &kZoneAsia_Ust_Nera, // 0x4785f921, Asia/Ust-Nera + &kZoneEurope_Dublin, // 0x4a275f62, Europe/Dublin + &kZoneAsia_Nicosia, // 0x4b0fcf78, Asia/Nicosia + &kZoneAmerica_Chicago, // 0x4b92b5d4, America/Chicago + &kZoneAustralia_Sydney, // 0x4d1e9776, Australia/Sydney + &kZoneNZ_CHAT, // 0x4d42afda, NZ-CHAT -> Pacific/Chatham + &kZoneUS_Arizona, // 0x4ec52670, US/Arizona -> America/Phoenix + &kZoneAntarctica_Vostok, // 0x4f966fd4, Antarctica/Vostok + &kZoneUS_Aleutian, // 0x4fe013ef, US/Aleutian -> America/Adak + &kZoneAustralia_Brisbane, // 0x4fedc9c0, Australia/Brisbane + &kZoneAmerica_Catamarca, // 0x5036e963, America/Catamarca -> America/Argentina/Catamarca + &kZoneAmerica_Asuncion, // 0x50ec79a6, America/Asuncion + &kZoneAsia_Karachi, // 0x527f5245, Asia/Karachi + &kZoneAsia_Kashgar, // 0x52955193, Asia/Kashgar -> Asia/Urumqi + &kZoneCanada_Atlantic, // 0x536b119c, Canada/Atlantic -> America/Halifax + &kZonePacific_Gambier, // 0x53720c3a, Pacific/Gambier + &kZoneAmerica_Whitehorse, // 0x54e0e3e8, America/Whitehorse + &kZoneAmerica_Martinique, // 0x551e84c5, America/Martinique + &kZoneAmerica_Jamaica, // 0x565dad6c, America/Jamaica + &kZoneUS_Samoa, // 0x566821cd, US/Samoa -> Pacific/Pago_Pago + &kZoneHongkong, // 0x56d36560, Hongkong -> Asia/Hong_Kong + &kZoneEurope_Jersey, // 0x570dae76, Europe/Jersey -> Europe/London + &kZoneAsia_Hong_Kong, // 0x577f28ac, Asia/Hong_Kong + &kZonePacific_Marquesas, // 0x57ca7135, Pacific/Marquesas + &kZoneAmerica_Miquelon, // 0x59674330, America/Miquelon + &kZoneAntarctica_DumontDUrville, // 0x5a3c656c, Antarctica/DumontDUrville + &kZoneAtlantic_Jan_Mayen, // 0x5a7535b6, Atlantic/Jan_Mayen -> Europe/Oslo + &kZoneAmerica_Anchorage, // 0x5a79260e, America/Anchorage + &kZoneUS_Eastern, // 0x5bb7e78e, US/Eastern -> America/New_York + &kZoneAsia_Jerusalem, // 0x5becd23a, Asia/Jerusalem + &kZoneEurope_Stockholm, // 0x5bf6fbb8, Europe/Stockholm + &kZoneEurope_Lisbon, // 0x5c00a70b, Europe/Lisbon + &kZoneAtlantic_Cape_Verde, // 0x5c5e1772, Atlantic/Cape_Verde + &kZoneEurope_London, // 0x5c6a84ae, Europe/London + &kZoneAmerica_Cordoba, // 0x5c8a7600, America/Cordoba -> America/Argentina/Cordoba + &kZoneAsia_Ujung_Pandang, // 0x5d001eb3, Asia/Ujung_Pandang -> Asia/Makassar + &kZoneAfrica_Mbabane, // 0x5d3bdd40, Africa/Mbabane -> Africa/Johannesburg + &kZoneEurope_Madrid, // 0x5dbd1535, Europe/Madrid + &kZoneAmerica_Moncton, // 0x5e07fe24, America/Moncton + &kZonePacific_Bougainville, // 0x5e10f7a4, Pacific/Bougainville + &kZoneEurope_Monaco, // 0x5ebf9f01, Europe/Monaco + &kZoneEurope_Moscow, // 0x5ec266fc, Europe/Moscow + &kZoneAmerica_Argentina_Jujuy, // 0x5f2f46c5, America/Argentina/Jujuy + &kZoneAmerica_Argentina_Salta, // 0x5fc73403, America/Argentina/Salta + &kZonePacific_Pago_Pago, // 0x603aebd0, Pacific/Pago_Pago + &kZonePacific_Enderbury, // 0x61599a93, Pacific/Enderbury + &kZoneAfrica_Sao_Tome, // 0x61b319d1, Africa/Sao_Tome + &kZoneCanada_Central, // 0x626710f5, Canada/Central -> America/Winnipeg + &kZoneAmerica_Creston, // 0x62a70204, America/Creston + &kZoneAmerica_Costa_Rica, // 0x63ff66be, America/Costa_Rica + &kZoneAsia_Qostanay, // 0x654fe522, Asia/Qostanay + &kZoneAmerica_Indiana_Knox, // 0x6554adc9, America/Indiana/Knox + &kZoneEurope_Prague, // 0x65ee5d48, Europe/Prague + &kZoneBrazil_Acre, // 0x66934f93, Brazil/Acre -> America/Rio_Branco + &kZoneBrazil_East, // 0x669578c5, Brazil/East -> America/Sao_Paulo + &kZoneAfrica_Kinshasa, // 0x6695d70c, Africa/Kinshasa -> Africa/Lagos + &kZoneBrazil_West, // 0x669f689b, Brazil/West -> America/Manaus + &kZoneAfrica_Mogadishu, // 0x66bc159b, Africa/Mogadishu -> Africa/Nairobi + &kZoneAmerica_Puerto_Rico, // 0x6752ca31, America/Puerto_Rico + &kZoneUS_Indiana_Starke, // 0x67977be7, US/Indiana-Starke -> America/Indiana/Knox + &kZoneAmerica_Buenos_Aires, // 0x67d79a05, America/Buenos_Aires -> America/Argentina/Buenos_Aires + &kZoneAfrica_Freetown, // 0x6823dd64, Africa/Freetown -> Africa/Abidjan + &kZoneIndian_Christmas, // 0x68c207d5, Indian/Christmas + &kZoneAsia_Novokuznetsk, // 0x69264f93, Asia/Novokuznetsk + &kZoneAmerica_Indianapolis, // 0x6a009ae1, America/Indianapolis -> America/Indiana/Indianapolis + &kZoneEurope_Sarajevo, // 0x6a576c3f, Europe/Sarajevo -> Europe/Belgrade + &kZoneAmerica_Curacao, // 0x6a879184, America/Curacao + &kZoneAmerica_Tijuana, // 0x6aa1df72, America/Tijuana + &kZoneAsia_Makassar, // 0x6aa21c85, Asia/Makassar + &kZoneEurope_Helsinki, // 0x6ab2975b, Europe/Helsinki + &kZoneAmerica_Lower_Princes, // 0x6ae45b62, America/Lower_Princes -> America/Curacao + &kZoneAmerica_Porto_Velho, // 0x6b1aac77, America/Porto_Velho + &kZoneEurope_Samara, // 0x6bc0b139, Europe/Samara + &kZoneEurope_Skopje, // 0x6c76fdd0, Europe/Skopje -> Europe/Belgrade + &kZoneAmerica_Edmonton, // 0x6cb9484a, America/Edmonton + &kZoneAmerica_Dawson_Creek, // 0x6cf24e5b, America/Dawson_Creek + &kZoneAsia_Rangoon, // 0x6d1217c6, Asia/Rangoon -> Asia/Yangon + &kZoneUS_East_Indiana, // 0x6dcf558a, US/East-Indiana -> America/Indiana/Indianapolis + &kZoneAmerica_Grand_Turk, // 0x6e216197, America/Grand_Turk + &kZoneAmerica_Blanc_Sablon, // 0x6e299892, America/Blanc-Sablon + &kZoneEurope_Tirane, // 0x6ea95b47, Europe/Tirane + &kZoneUS_Mountain, // 0x6eb88247, US/Mountain -> America/Denver + &kZoneAntarctica_McMurdo, // 0x6eeb5585, Antarctica/McMurdo -> Pacific/Auckland + &kZoneAmerica_Araguaina, // 0x6f9a3aef, America/Araguaina + &kZoneAfrica_Lubumbashi, // 0x6fd88566, Africa/Lubumbashi -> Africa/Maputo + &kZoneIndian_Reunion, // 0x7076c047, Indian/Reunion + &kZoneAsia_Qyzylorda, // 0x71282e81, Asia/Qyzylorda + &kZoneAsia_Kolkata, // 0x72c06cd9, Asia/Kolkata + &kZoneEurope_Vienna, // 0x734cc2e5, Europe/Vienna + &kZoneAfrica_Asmara, // 0x73b278ef, Africa/Asmara -> Africa/Nairobi + &kZoneAfrica_Asmera, // 0x73b289f3, Africa/Asmera -> Africa/Nairobi + &kZoneAsia_Kamchatka, // 0x73baf9d7, Asia/Kamchatka + &kZoneAmerica_Santarem, // 0x740caec1, America/Santarem + &kZoneAmerica_Santiago, // 0x7410c9bc, America/Santiago + &kZoneAfrica_Bamako, // 0x74c1e7a5, Africa/Bamako -> Africa/Abidjan + &kZoneAfrica_Bangui, // 0x74c28ed0, Africa/Bangui -> Africa/Lagos + &kZoneAfrica_Banjul, // 0x74c29b96, Africa/Banjul -> Africa/Abidjan + &kZoneEurope_Nicosia, // 0x74efab8a, Europe/Nicosia -> Asia/Nicosia + &kZoneEurope_Warsaw, // 0x75185c19, Europe/Warsaw + &kZoneAmerica_El_Salvador, // 0x752ad652, America/El_Salvador + &kZoneAfrica_Bissau, // 0x75564141, Africa/Bissau + &kZoneAmerica_Santo_Domingo, // 0x75a0d177, America/Santo_Domingo + &kZoneUS_Michigan, // 0x766bb7bc, US/Michigan -> America/Detroit + &kZoneCanada_Saskatchewan, // 0x77311f49, Canada/Saskatchewan -> America/Regina + &kZoneAfrica_Accra, // 0x77d5b054, Africa/Accra + &kZoneAfrica_Cairo, // 0x77f8e228, Africa/Cairo + &kZoneAfrica_Ceuta, // 0x77fb46ec, Africa/Ceuta + &kZoneAfrica_Dakar, // 0x780b00fd, Africa/Dakar -> Africa/Abidjan + &kZoneAfrica_Lagos, // 0x789bb5d0, Africa/Lagos + &kZoneAfrica_Windhoek, // 0x789c9bd3, Africa/Windhoek + &kZoneCanada_Yukon, // 0x78dd35c2, Canada/Yukon -> America/Whitehorse + &kZoneAmerica_Toronto, // 0x792e851b, America/Toronto + &kZoneAmerica_Tortola, // 0x7931462b, America/Tortola -> America/Port_of_Spain + &kZoneAfrica_Tunis, // 0x79378e6d, Africa/Tunis + &kZoneAfrica_Douala, // 0x7a6df310, Africa/Douala -> Africa/Lagos + &kZoneAfrica_Conakry, // 0x7ab36b31, Africa/Conakry -> Africa/Abidjan + &kZoneIndian_Mauritius, // 0x7b09c02a, Indian/Mauritius + &kZoneAtlantic_Stanley, // 0x7bb3e1c4, Atlantic/Stanley + &kZoneAmerica_Ensenada, // 0x7bc95445, America/Ensenada -> America/Tijuana + &kZoneEurope_Zagreb, // 0x7c11c9ff, Europe/Zagreb -> Europe/Belgrade + &kZoneCuba, // 0x7c83cba0, Cuba -> America/Havana + &kZoneEire, // 0x7c84b36a, Eire -> Europe/Dublin + &kZoneGMT0, // 0x7c8550fd, GMT0 -> Etc/GMT + &kZoneIran, // 0x7c87090f, Iran -> Asia/Tehran + &kZoneW_SU, // 0x7c8d8ef1, W-SU -> Europe/Moscow + &kZoneZulu, // 0x7c9069b5, Zulu -> Etc/UTC + &kZoneEurope_Zurich, // 0x7d8195b9, Europe/Zurich + &kZoneChile_Continental, // 0x7e2bdb18, Chile/Continental -> America/Santiago + &kZoneAmerica_Fort_Wayne, // 0x7eaaaf24, America/Fort_Wayne -> America/Indiana/Indianapolis + &kZoneAsia_Kuching, // 0x801b003b, Asia/Kuching + &kZoneAtlantic_Madeira, // 0x81b5c037, Atlantic/Madeira + &kZoneAmerica_Atikokan, // 0x81b92098, America/Atikokan + &kZoneAfrica_Harare, // 0x82c39a2d, Africa/Harare -> Africa/Maputo + &kZoneAmerica_Shiprock, // 0x82fb7049, America/Shiprock -> America/Denver + &kZonePacific_Kiritimati, // 0x8305073a, Pacific/Kiritimati + &kZoneAmerica_St_Vincent, // 0x8460e523, America/St_Vincent -> America/Port_of_Spain + &kZoneAmerica_Metlakatla, // 0x84de2686, America/Metlakatla + &kZoneAsia_Yakutsk, // 0x87bb3a9e, Asia/Yakutsk + &kZoneAmerica_Chihuahua, // 0x8827d776, America/Chihuahua + &kZonePacific_Pitcairn, // 0x8837d8bd, Pacific/Pitcairn + &kZoneAsia_Vientiane, // 0x89d68d75, Asia/Vientiane -> Asia/Bangkok + &kZonePacific_Chuuk, // 0x8a090b23, Pacific/Chuuk + &kZonePacific_Efate, // 0x8a2bce28, Pacific/Efate + &kZoneAfrica_Kigali, // 0x8a4dcf2b, Africa/Kigali -> Africa/Maputo + &kZoneAustralia_ACT, // 0x8a970eb2, Australia/ACT -> Australia/Sydney + &kZoneAustralia_LHI, // 0x8a973e17, Australia/LHI -> Australia/Lord_Howe + &kZoneAustralia_NSW, // 0x8a974812, Australia/NSW -> Australia/Sydney + &kZonePacific_Nauru, // 0x8acc41ae, Pacific/Nauru + &kZoneEST5EDT, // 0x8adc72a3, EST5EDT + &kZonePacific_Palau, // 0x8af04a36, Pacific/Palau + &kZonePacific_Samoa, // 0x8b2699b4, Pacific/Samoa -> Pacific/Pago_Pago + &kZoneAmerica_Winnipeg, // 0x8c7dafc7, America/Winnipeg + &kZoneAustralia_Eucla, // 0x8cf99e44, Australia/Eucla + &kZoneAmerica_Argentina_Catamarca, // 0x8d40986b, America/Argentina/Catamarca + &kZoneAfrica_Luanda, // 0x8d7909cf, Africa/Luanda -> Africa/Lagos + &kZoneAfrica_Lusaka, // 0x8d82b23b, Africa/Lusaka -> Africa/Maputo + &kZoneAustralia_North, // 0x8d997165, Australia/North -> Australia/Darwin + &kZoneAustralia_Perth, // 0x8db8269d, Australia/Perth + &kZoneAustralia_South, // 0x8df3f8ad, Australia/South -> Australia/Adelaide + &kZonePacific_Kwajalein, // 0x8e216759, Pacific/Kwajalein + &kZoneAmerica_Port_au_Prince, // 0x8e4a7bdc, America/Port-au-Prince + &kZoneAfrica_Malabo, // 0x8e6a1906, Africa/Malabo -> Africa/Lagos + &kZoneAfrica_Maputo, // 0x8e6ca1f0, Africa/Maputo + &kZoneAfrica_Maseru, // 0x8e6e02c7, Africa/Maseru -> Africa/Johannesburg + &kZonePacific_Norfolk, // 0x8f4eb4be, Pacific/Norfolk + &kZoneAmerica_Godthab, // 0x8f7eba1f, America/Godthab -> America/Nuuk + &kZoneAustralia_Yancowinna, // 0x90bac131, Australia/Yancowinna -> Australia/Broken_Hill + &kZoneAfrica_Niamey, // 0x914a30fd, Africa/Niamey -> Africa/Lagos + &kZoneAsia_Yerevan, // 0x9185c8cc, Asia/Yerevan + &kZoneAmerica_Detroit, // 0x925cfbc1, America/Detroit + &kZoneAsia_Choibalsan, // 0x928aa4a6, Asia/Choibalsan + &kZoneAntarctica_Macquarie, // 0x92f47626, Antarctica/Macquarie + &kZoneAmerica_Belize, // 0x93256c81, America/Belize + &kZoneMexico_General, // 0x93711d57, Mexico/General -> America/Mexico_City + &kZoneAmerica_Bogota, // 0x93d7bc62, America/Bogota + &kZoneAsia_Pyongyang, // 0x93ed1c8e, Asia/Pyongyang + &kZoneAmerica_Indiana_Petersburg, // 0x94ac7acc, America/Indiana/Petersburg + &kZoneAmerica_Cancun, // 0x953331be, America/Cancun + &kZoneAmerica_Cayman, // 0x953961df, America/Cayman -> America/Panama + &kZoneAmerica_Glace_Bay, // 0x9681f8dd, America/Glace_Bay + &kZoneAsia_Khandyga, // 0x9685a4d9, Asia/Khandyga + &kZoneAmerica_Grenada, // 0x968ce4d8, America/Grenada -> America/Port_of_Spain + &kZoneAmerica_Cuiaba, // 0x969a52eb, America/Cuiaba + &kZoneAmerica_Dawson, // 0x978d8d12, America/Dawson + &kZoneAmerica_Aruba, // 0x97cf8651, America/Aruba -> America/Curacao + &kZoneAmerica_Denver, // 0x97d10b2a, America/Denver + &kZoneAmerica_Bahia, // 0x97d815fb, America/Bahia + &kZoneAmerica_Belem, // 0x97da580b, America/Belem + &kZoneAmerica_Boise, // 0x97dfc8d8, America/Boise + &kZoneEurope_Andorra, // 0x97f6764b, Europe/Andorra + &kZoneAmerica_Adak, // 0x97fe49d7, America/Adak + &kZoneAmerica_Atka, // 0x97fe8f27, America/Atka -> America/Adak + &kZoneAmerica_Lima, // 0x980468c9, America/Lima + &kZoneAmerica_Nome, // 0x98059b15, America/Nome + &kZoneAmerica_Nuuk, // 0x9805b5a9, America/Nuuk + &kZoneIndian_Maldives, // 0x9869681c, Indian/Maldives + &kZoneAmerica_Jujuy, // 0x9873dbbd, America/Jujuy -> America/Argentina/Jujuy + &kZoneAmerica_Sitka, // 0x99104ce2, America/Sitka + &kZoneAmerica_Thule, // 0x9921dd68, America/Thule + &kZonePacific_Rarotonga, // 0x9981a3b0, Pacific/Rarotonga + &kZoneAsia_Kathmandu, // 0x9a96ce6f, Asia/Kathmandu + &kZoneBrazil_DeNoronha, // 0x9b4cb496, Brazil/DeNoronha -> America/Noronha + &kZoneAmerica_North_Dakota_Beulah, // 0x9b52b384, America/North_Dakota/Beulah + &kZoneAmerica_Rainy_River, // 0x9cd58a10, America/Rainy_River + &kZoneEurope_Budapest, // 0x9ce0197c, Europe/Budapest + &kZoneAsia_Baghdad, // 0x9ceffbed, Asia/Baghdad + &kZoneAsia_Bahrain, // 0x9d078487, Asia/Bahrain -> Asia/Qatar + &kZoneEtc_GMT_PLUS_0, // 0x9d13da13, Etc/GMT+0 -> Etc/GMT + &kZoneEtc_GMT_PLUS_1, // 0x9d13da14, Etc/GMT+1 + &kZoneEtc_GMT_PLUS_2, // 0x9d13da15, Etc/GMT+2 + &kZoneEtc_GMT_PLUS_3, // 0x9d13da16, Etc/GMT+3 + &kZoneEtc_GMT_PLUS_4, // 0x9d13da17, Etc/GMT+4 + &kZoneEtc_GMT_PLUS_5, // 0x9d13da18, Etc/GMT+5 + &kZoneEtc_GMT_PLUS_6, // 0x9d13da19, Etc/GMT+6 + &kZoneEtc_GMT_PLUS_7, // 0x9d13da1a, Etc/GMT+7 + &kZoneEtc_GMT_PLUS_8, // 0x9d13da1b, Etc/GMT+8 + &kZoneEtc_GMT_PLUS_9, // 0x9d13da1c, Etc/GMT+9 + &kZoneEtc_GMT_0, // 0x9d13da55, Etc/GMT-0 -> Etc/GMT + &kZoneEtc_GMT_1, // 0x9d13da56, Etc/GMT-1 + &kZoneEtc_GMT_2, // 0x9d13da57, Etc/GMT-2 + &kZoneEtc_GMT_3, // 0x9d13da58, Etc/GMT-3 + &kZoneEtc_GMT_4, // 0x9d13da59, Etc/GMT-4 + &kZoneEtc_GMT_5, // 0x9d13da5a, Etc/GMT-5 + &kZoneEtc_GMT_6, // 0x9d13da5b, Etc/GMT-6 + &kZoneEtc_GMT_7, // 0x9d13da5c, Etc/GMT-7 + &kZoneEtc_GMT_8, // 0x9d13da5d, Etc/GMT-8 + &kZoneEtc_GMT_9, // 0x9d13da5e, Etc/GMT-9 + &kZoneAmerica_Nipigon, // 0x9d2a8b1a, America/Nipigon + &kZoneAmerica_Rio_Branco, // 0x9d352764, America/Rio_Branco + &kZoneAsia_Bangkok, // 0x9d6e3aaf, Asia/Bangkok + &kZoneAfrica_El_Aaiun, // 0x9d6fb118, Africa/El_Aaiun + &kZoneAmerica_North_Dakota_Center, // 0x9da42814, America/North_Dakota/Center + &kZoneAsia_Barnaul, // 0x9dba4997, Asia/Barnaul + &kZoneAfrica_Tripoli, // 0x9dfebd3d, Africa/Tripoli + &kZoneEurope_Istanbul, // 0x9e09d6e6, Europe/Istanbul + &kZoneIndian_Antananarivo, // 0x9ebf5289, Indian/Antananarivo -> Africa/Nairobi + &kZoneAfrica_Ndjamena, // 0x9fe09898, Africa/Ndjamena + &kZoneAmerica_Guyana, // 0x9ff7bd0b, America/Guyana + &kZoneAfrica_Dar_es_Salaam, // 0xa04c47b6, Africa/Dar_es_Salaam -> Africa/Nairobi + &kZoneAmerica_Havana, // 0xa0e15675, America/Havana + &kZoneAsia_Novosibirsk, // 0xa2a435cb, Asia/Novosibirsk + &kZoneEurope_Kiev, // 0xa2c19eb3, Europe/Kiev + &kZoneEurope_Oslo, // 0xa2c3fba1, Europe/Oslo + &kZoneEurope_Riga, // 0xa2c57587, Europe/Riga + &kZoneEurope_Rome, // 0xa2c58fd7, Europe/Rome + &kZoneAmerica_Inuvik, // 0xa42189fc, America/Inuvik + &kZoneAmerica_Argentina_La_Rioja, // 0xa46b7eef, America/Argentina/La_Rioja + &kZoneAsia_Almaty, // 0xa61f41fa, Asia/Almaty + &kZoneAsia_Anadyr, // 0xa63cebd1, Asia/Anadyr + &kZoneAsia_Aqtobe, // 0xa67dcc4e, Asia/Aqtobe + &kZoneAsia_Atyrau, // 0xa6b6e068, Asia/Atyrau + &kZoneAmerica_Juneau, // 0xa6f13e2e, America/Juneau + &kZoneAustralia_Lord_Howe, // 0xa748b67d, Australia/Lord_Howe + &kZonePacific_Port_Moresby, // 0xa7ba7f68, Pacific/Port_Moresby + &kZoneAsia_Katmandu, // 0xa7ec12c7, Asia/Katmandu -> Asia/Kathmandu + &kZoneAsia_Beirut, // 0xa7f3d5fd, Asia/Beirut + &kZoneSingapore, // 0xa8598c8d, Singapore -> Asia/Singapore + &kZoneAfrica_Nairobi, // 0xa87ab57e, Africa/Nairobi + &kZoneAsia_Brunei, // 0xa8e595f7, Asia/Brunei + &kZoneUS_Pacific, // 0xa950f6ab, US/Pacific -> America/Los_Angeles + &kZonePacific_Galapagos, // 0xa952f752, Pacific/Galapagos + &kZoneAmerica_Argentina_Mendoza, // 0xa9f72d5c, America/Argentina/Mendoza + &kZoneAmerica_La_Paz, // 0xaa29125d, America/La_Paz + &kZoneAmerica_Noronha, // 0xab5116fb, America/Noronha + &kZoneAmerica_Coral_Harbour, // 0xabcb7569, America/Coral_Harbour -> America/Atikokan + &kZoneAmerica_Maceio, // 0xac80c6d4, America/Maceio + &kZoneAmerica_Manaus, // 0xac86bf8b, America/Manaus + &kZoneAmerica_Merida, // 0xacd172d8, America/Merida + &kZoneEurope_Chisinau, // 0xad58aa18, Europe/Chisinau + &kZoneAmerica_Nassau, // 0xaedef011, America/Nassau + &kZoneAmerica_Anguilla, // 0xafe31333, America/Anguilla -> America/Port_of_Spain + &kZoneEurope_Uzhgorod, // 0xb066f5d6, Europe/Uzhgorod + &kZoneAustralia_Broken_Hill, // 0xb06eada3, Australia/Broken_Hill + &kZoneAsia_Bishkek, // 0xb0728553, Asia/Bishkek + &kZoneChile_EasterIsland, // 0xb0982af8, Chile/EasterIsland -> Pacific/Easter + &kZonePacific_Johnston, // 0xb15d7b36, Pacific/Johnston -> Pacific/Honolulu + &kZoneAfrica_Timbuktu, // 0xb164d56f, Africa/Timbuktu -> Africa/Abidjan + &kZoneAmerica_St_Thomas, // 0xb1b3d778, America/St_Thomas -> America/Port_of_Spain + &kZoneAmerica_Paramaribo, // 0xb319e4c4, America/Paramaribo + &kZoneAmerica_Panama, // 0xb3863854, America/Panama + &kZoneCanada_Newfoundland, // 0xb396e991, Canada/Newfoundland -> America/St_Johns + &kZoneAsia_Harbin, // 0xb5af1186, Asia/Harbin -> Asia/Shanghai + &kZoneAsia_Hebron, // 0xb5eef250, Asia/Hebron + &kZoneAmerica_Goose_Bay, // 0xb649541e, America/Goose_Bay + &kZoneAmerica_Los_Angeles, // 0xb7f7e8f2, America/Los_Angeles + &kZoneAmerica_Recife, // 0xb8730494, America/Recife + &kZoneAmerica_Regina, // 0xb875371c, America/Regina + &kZoneAsia_Ashgabat, // 0xba87598d, Asia/Ashgabat + &kZoneIsrael, // 0xba88c9e5, Israel -> Asia/Jerusalem + &kZonePacific_Yap, // 0xbb40138d, Pacific/Yap -> Pacific/Chuuk + &kZoneAmerica_Halifax, // 0xbc5b7183, America/Halifax + &kZoneEurope_Ljubljana, // 0xbd98cdb7, Europe/Ljubljana -> Europe/Belgrade + &kZoneAsia_Kuwait, // 0xbe1b2f27, Asia/Kuwait -> Asia/Riyadh + &kZoneEurope_Tiraspol, // 0xbe704472, Europe/Tiraspol -> Europe/Chisinau + &kZoneAsia_Srednekolymsk, // 0xbf8e337d, Asia/Srednekolymsk + &kZoneAmerica_Argentina_Cordoba, // 0xbfccc308, America/Argentina/Cordoba + &kZoneAmerica_Tegucigalpa, // 0xbfd6fd4c, America/Tegucigalpa + &kZoneAmerica_Antigua, // 0xc067a32f, America/Antigua -> America/Port_of_Spain + &kZoneEurope_Busingen, // 0xc06d2cdf, Europe/Busingen -> Europe/Zurich + &kZoneAsia_Manila, // 0xc156c944, Asia/Manila + &kZoneAfrica_Kampala, // 0xc1d30e31, Africa/Kampala -> Africa/Nairobi + &kZoneAmerica_Knox_IN, // 0xc1db9a1c, America/Knox_IN -> America/Indiana/Knox + &kZoneAfrica_Abidjan, // 0xc21305a3, Africa/Abidjan + &kZoneAmerica_Virgin, // 0xc2183ab5, America/Virgin -> America/Port_of_Spain + &kZoneAsia_Phnom_Penh, // 0xc224945e, Asia/Phnom_Penh -> Asia/Bangkok + &kZoneAsia_Muscat, // 0xc2c3565f, Asia/Muscat -> Asia/Dubai + &kZoneAmerica_Punta_Arenas, // 0xc2c3bce7, America/Punta_Arenas + &kZonePortugal, // 0xc3274593, Portugal -> Europe/Lisbon + &kZoneNavajo, // 0xc4ef0e24, Navajo -> America/Denver + &kZoneAfrica_Casablanca, // 0xc59f1b33, Africa/Casablanca + &kZoneAmerica_Argentina_Rio_Gallegos, // 0xc5b0f565, America/Argentina/Rio_Gallegos + &kZoneAsia_Jayapura, // 0xc6833c2f, Asia/Jayapura + &kZoneAmerica_Resolute, // 0xc7093459, America/Resolute + &kZoneAsia_Chungking, // 0xc7121dd0, Asia/Chungking -> Asia/Shanghai + &kZoneGreenwich, // 0xc84d4221, Greenwich -> Etc/GMT + &kZoneAmerica_Rankin_Inlet, // 0xc8de4984, America/Rankin_Inlet + &kZonePoland, // 0xca913b23, Poland -> Europe/Warsaw + &kZoneUS_Central, // 0xcabdcb25, US/Central -> America/Chicago + &kZoneEurope_Vatican, // 0xcb485dca, Europe/Vatican -> Europe/Rome + &kZoneAmerica_Barbados, // 0xcbbc3b04, America/Barbados + &kZoneAmerica_Porto_Acre, // 0xcce5bf54, America/Porto_Acre -> America/Rio_Branco + &kZoneAmerica_Guadeloupe, // 0xcd1f8a31, America/Guadeloupe -> America/Port_of_Spain + &kZoneAntarctica_South_Pole, // 0xcd96b290, Antarctica/South_Pole -> Pacific/Auckland + &kZoneAsia_Riyadh, // 0xcd973d93, Asia/Riyadh + &kZoneAmerica_Dominica, // 0xcecb4c4a, America/Dominica -> America/Port_of_Spain + &kZoneEurope_San_Marino, // 0xcef7724b, Europe/San_Marino -> Europe/Rome + &kZoneAsia_Saigon, // 0xcf52f713, Asia/Saigon -> Asia/Ho_Chi_Minh + &kZonePacific_Easter, // 0xcf54f7e7, Pacific/Easter + &kZoneAsia_Singapore, // 0xcf8581fa, Asia/Singapore + &kZoneAsia_Krasnoyarsk, // 0xd0376c6a, Asia/Krasnoyarsk + &kZoneEurope_Belfast, // 0xd07dd1e5, Europe/Belfast -> Europe/London + &kZoneAmerica_Mexico_City, // 0xd0d93f43, America/Mexico_City + &kZoneUniversal, // 0xd0ff523e, Universal -> Etc/UTC + &kZoneAsia_Taipei, // 0xd1a844ae, Asia/Taipei + &kZoneAsia_Tehran, // 0xd1f02254, Asia/Tehran + &kZoneAsia_Thimbu, // 0xd226e31b, Asia/Thimbu -> Asia/Thimphu + &kZoneArctic_Longyearbyen, // 0xd23e7859, Arctic/Longyearbyen -> Europe/Oslo + &kZoneAustralia_Queensland, // 0xd326ed0a, Australia/Queensland -> Australia/Brisbane + &kZoneEurope_Kaliningrad, // 0xd33b2f28, Europe/Kaliningrad + &kZoneAmerica_Argentina_Buenos_Aires, // 0xd43b4c0d, America/Argentina/Buenos_Aires + &kZoneTurkey, // 0xd455e469, Turkey -> Europe/Istanbul + &kZoneAfrica_Juba, // 0xd51b395c, Africa/Juba + &kZoneAfrica_Lome, // 0xd51c3a07, Africa/Lome -> Africa/Abidjan + &kZoneAsia_Urumqi, // 0xd5379735, Asia/Urumqi + &kZoneAmerica_Cambridge_Bay, // 0xd5a44aff, America/Cambridge_Bay + &kZoneAfrica_Johannesburg, // 0xd5d157a0, Africa/Johannesburg + &kZoneAmerica_Port_of_Spain, // 0xd8b28d59, America/Port_of_Spain + &kZoneEtc_GMT, // 0xd8e2de58, Etc/GMT + &kZoneEtc_UCT, // 0xd8e3189c, Etc/UCT -> Etc/UTC + &kZoneEtc_UTC, // 0xd8e31abc, Etc/UTC + &kZoneAmerica_Yakutat, // 0xd8ee31e9, America/Yakutat + &kZoneAfrica_Algiers, // 0xd94515c1, Africa/Algiers + &kZonePST8PDT, // 0xd99ee2dc, PST8PDT + &kZoneEurope_Bratislava, // 0xda493bed, Europe/Bratislava -> Europe/Prague + &kZoneEurope_Simferopol, // 0xda9eb724, Europe/Simferopol + &kZonePacific_Funafuti, // 0xdb402d65, Pacific/Funafuti + &kZoneAmerica_Matamoros, // 0xdd1b0259, America/Matamoros + &kZoneAsia_Yangon, // 0xdd54a8be, Asia/Yangon + &kZoneEurope_Vilnius, // 0xdd63b8ce, Europe/Vilnius + &kZoneAustralia_West, // 0xdd858a5d, Australia/West -> Australia/Perth + &kZonePacific_Kosrae, // 0xde5139a8, Pacific/Kosrae + &kZoneAmerica_Kentucky_Monticello, // 0xde71c439, America/Kentucky/Monticello + &kZoneEurope_Brussels, // 0xdee07337, Europe/Brussels + &kZoneAmerica_Swift_Current, // 0xdef98e55, America/Swift_Current + &kZoneAmerica_Rosario, // 0xdf448665, America/Rosario -> America/Argentina/Cordoba + &kZoneAsia_Irkutsk, // 0xdfbf213f, Asia/Irkutsk + &kZoneEurope_Ulyanovsk, // 0xe03783d0, Europe/Ulyanovsk + &kZoneAustralia_Lindeman, // 0xe05029e2, Australia/Lindeman + &kZoneEurope_Belgrade, // 0xe0532b3a, Europe/Belgrade + &kZoneAfrica_Blantyre, // 0xe08d813b, Africa/Blantyre -> Africa/Maputo + &kZoneAmerica_Menominee, // 0xe0e9c583, America/Menominee + &kZoneEurope_Copenhagen, // 0xe0ed30bc, Europe/Copenhagen + &kZoneAtlantic_Faroe, // 0xe110a971, Atlantic/Faroe + &kZonePacific_Majuro, // 0xe1f95371, Pacific/Majuro + &kZoneAntarctica_Casey, // 0xe2022583, Antarctica/Casey + &kZoneAntarctica_Davis, // 0xe2144b45, Antarctica/Davis + &kZoneEurope_Astrakhan, // 0xe22256e1, Europe/Astrakhan + &kZonePacific_Midway, // 0xe286d38e, Pacific/Midway -> Pacific/Pago_Pago + &kZoneAntarctica_Syowa, // 0xe330c7e1, Antarctica/Syowa + &kZoneAntarctica_Troll, // 0xe33f085b, Antarctica/Troll + &kZoneEurope_Saratov, // 0xe4315da4, Europe/Saratov + &kZonePacific_Noumea, // 0xe551b788, Pacific/Noumea + &kZoneIceland, // 0xe56a35b5, Iceland -> Atlantic/Reykjavik + &kZoneIndian_Mayotte, // 0xe6880bca, Indian/Mayotte -> Africa/Nairobi + &kZoneAustralia_Tasmania, // 0xe6d76648, Australia/Tasmania -> Australia/Hobart + &kZonePacific_Honolulu, // 0xe6e70af9, Pacific/Honolulu + &kZoneAmerica_Kralendijk, // 0xe7c456c5, America/Kralendijk -> America/Curacao + &kZoneAmerica_Argentina_Tucuman, // 0xe96399eb, America/Argentina/Tucuman + &kZonePacific_Ponape, // 0xe9f80086, Pacific/Ponape -> Pacific/Pohnpei + &kZoneEurope_Zaporozhye, // 0xeab9767f, Europe/Zaporozhye + &kZoneEurope_Isle_of_Man, // 0xeaf84580, Europe/Isle_of_Man -> Europe/London + &kZoneAsia_Magadan, // 0xebacc19b, Asia/Magadan + &kZoneAmerica_Ojinaga, // 0xebfde83f, America/Ojinaga + &kZonePacific_Saipan, // 0xeff7a35f, Pacific/Saipan -> Pacific/Guam + &kZoneCST6CDT, // 0xf0e87d00, CST6CDT + &kZonePacific_Tahiti, // 0xf24c2446, Pacific/Tahiti + &kZonePacific_Tarawa, // 0xf2517e63, Pacific/Tarawa + &kZoneMST7MDT, // 0xf2af9375, MST7MDT + &kZoneCanada_Eastern, // 0xf3612d5e, Canada/Eastern -> America/Toronto + &kZoneAsia_Tashkent, // 0xf3924254, Asia/Tashkent + &kZoneAsia_Sakhalin, // 0xf4a1c9bd, Asia/Sakhalin + &kZonePacific_Guadalcanal, // 0xf4dd25f0, Pacific/Guadalcanal + &kZoneEtc_GMT0, // 0xf53ea988, Etc/GMT0 -> Etc/GMT + &kZoneEtc_Zulu, // 0xf549c240, Etc/Zulu -> Etc/UTC + &kZoneAmerica_Danmarkshavn, // 0xf554d204, America/Danmarkshavn + &kZoneAsia_Shanghai, // 0xf895a7f5, Asia/Shanghai + &kZoneEurope_Gibraltar, // 0xf8e325fc, Europe/Gibraltar + &kZoneAsia_Chongqing, // 0xf937fb90, Asia/Chongqing -> Asia/Shanghai + &kZoneAtlantic_Azores, // 0xf93ed918, Atlantic/Azores + &kZonePacific_Wallis, // 0xf94ddb0f, Pacific/Wallis + &kZoneAmerica_Thunder_Bay, // 0xf962e71b, America/Thunder_Bay + &kZoneAmerica_Eirunepe, // 0xf9b29683, America/Eirunepe + &kZoneAmerica_Montevideo, // 0xfa214780, America/Montevideo + &kZoneUS_Alaska, // 0xfa300bc9, US/Alaska -> America/Anchorage + &kZoneGB_Eire, // 0xfa70e300, GB-Eire -> Europe/London + &kZoneEurope_Kirov, // 0xfaf5abef, Europe/Kirov + &kZoneEurope_Malta, // 0xfb1560f3, Europe/Malta + &kZoneEurope_Minsk, // 0xfb19cc66, Europe/Minsk + &kZoneEurope_Bucharest, // 0xfb349ec5, Europe/Bucharest + &kZoneAfrica_Khartoum, // 0xfb3d4205, Africa/Khartoum + &kZoneEurope_Paris, // 0xfb4bc2a3, Europe/Paris + &kZoneAsia_Yekaterinburg, // 0xfb544c6e, Asia/Yekaterinburg + &kZoneEurope_Sofia, // 0xfb898656, Europe/Sofia + &kZoneCanada_Mountain, // 0xfb8a8217, Canada/Mountain -> America/Edmonton + &kZoneEurope_Vaduz, // 0xfbb81bae, Europe/Vaduz -> Europe/Zurich + &kZoneAtlantic_Canary, // 0xfc23f2c2, Atlantic/Canary + &kZoneMexico_BajaNorte, // 0xfcf7150f, Mexico/BajaNorte -> America/Tijuana + &kZoneAmerica_Santa_Isabel, // 0xfd18a56c, America/Santa_Isabel -> America/Tijuana + &kZoneAmerica_Campo_Grande, // 0xfec3e7a6, America/Campo_Grande }; diff --git a/src/ace_time/zonedbx/zone_registry.h b/src/ace_time/zonedbx/zone_registry.h index 7cb8b31f7..2935bd847 100644 --- a/src/ace_time/zonedbx/zone_registry.h +++ b/src/ace_time/zonedbx/zone_registry.h @@ -34,10 +34,14 @@ namespace ace_time { namespace zonedbx { +// Zones const uint16_t kZoneRegistrySize = 386; - extern const extended::ZoneInfo* const kZoneRegistry[386]; +// Zones and Links +const uint16_t kZoneAndLinkRegistrySize = 593; +extern const extended::ZoneInfo* const kZoneAndLinkRegistry[593]; + } } #endif From f6c2c2dd3dd3187a7fa260c29838f9148bcb9138 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Sat, 2 Jan 2021 17:11:29 -0800 Subject: [PATCH 28/74] tools/artransformer.py: Generate fragments_map of recurring zoneName fragments to zonedb.json --- tools/data_types/at_types.py | 4 +++ tools/transformer/artransformer.py | 43 +++++++++++++++++++++++++++++- tools/transformer/transformer.py | 1 + tools/tzcompiler.py | 1 + tools/validate.py | 1 + 5 files changed, 49 insertions(+), 1 deletion(-) diff --git a/tools/data_types/at_types.py b/tools/data_types/at_types.py index 33a6d5333..1cd5583a8 100644 --- a/tools/data_types/at_types.py +++ b/tools/data_types/at_types.py @@ -191,6 +191,7 @@ class TransformerResult(NamedTuple): * letters_per_policy: {policyName -> {letter -> index}} * letters_map: {letter -> index} * formats_map: {format -> index} + * fragments_map: {fragment -> index} """ zones_map: ZonesMap policies_map: PoliciesMap @@ -206,6 +207,7 @@ class TransformerResult(NamedTuple): letters_per_policy: LettersPerPolicy letters_map: IndexMap formats_map: IndexMap + fragments_map: IndexMap def add_comment(comments: CommentsMap, name: str, reason: str) -> None: @@ -291,6 +293,7 @@ class ZoneInfoDatabase(TypedDict): letters_per_policy: LettersPerPolicy # multi-char letters by zonePolicy letters_map: IndexMap # all multi-character letters formats_map: IndexMap # shortened format strings. + fragments_map: IndexMap # zoneName fragment -> index def create_zone_info_database( @@ -347,6 +350,7 @@ def create_zone_info_database( 'letters_per_policy': tresult.letters_per_policy, 'letters_map': tresult.letters_map, 'formats_map': tresult.formats_map, + 'fragments_map': tresult.fragments_map, } diff --git a/tools/transformer/artransformer.py b/tools/transformer/artransformer.py index cd5dc4d4c..8e6ef2e25 100644 --- a/tools/transformer/artransformer.py +++ b/tools/transformer/artransformer.py @@ -7,7 +7,8 @@ from typing import Dict from typing import Set from typing import Tuple -from collections import OrderedDict +from collections import OrderedDict, Counter +import itertools import logging from transformer.transformer import hash_name from data_types.at_types import ZonesMap @@ -56,6 +57,7 @@ def transform(self) -> None: self.zones_map = self._process_eras(self.zones_map) self.zone_ids = _generate_zone_ids(self.zones_map) self.link_ids = _generate_link_ids(self.links_map) + self.fragments_map = _generate_fragments(self.zones_map, self.links_map) def get_data(self) -> TransformerResult: return TransformerResult( @@ -73,6 +75,7 @@ def get_data(self) -> TransformerResult: letters_per_policy=self.letters_per_policy, letters_map=self.letters_map, formats_map=self.formats_map, + fragments_map=self.fragments_map, ) def print_summary(self) -> None: @@ -461,3 +464,41 @@ def _generate_link_ids( """Generate {linkName -> linkId} map of links.""" ids: Dict[str, int] = {name: hash_name(name) for name in links_map.keys()} return OrderedDict(sorted(ids.items())) + + +def _generate_fragments(zones_map: ZonesMap, links_map: LinksMap) -> IndexMap: + """Generate a list of fragments and their indexes, sorted by fragment. + E.g. { "Africa": 1, "America": 2, ... } + """ + # Collect the frequency of fragments longer than 3 characters + fragments: Dict[str, int] = Counter() + for name in itertools.chain(zones_map.keys(), links_map.keys()): + fragment = _extract_fragment(name) + if len(fragment) > 3: + fragments[fragment] += 1 + + # Collect fragments which occur more than 3 times. + fragments_map: IndexMap = OrderedDict() + index = 1 # start at 1 because '\0' is the c-string termination char + for fragment, count in sorted(fragments.items()): + if count > 3: + fragments_map[fragment] = index + index += 1 + else: + logging.info( + f"Ignoring fragment '{fragment}' with count {count}, too few" + ) + + # Make sure that index is < 32, before ASCII-space. + if index >= 32: + raise Exception("Too many fragments {index}") + + return fragments_map + + +def _extract_fragment(name: str) -> str: + """Return the fragment before '/' or None if no '/' in name.""" + pos = name.find('/') + if pos < 0: + return "" + return name[:pos] diff --git a/tools/transformer/transformer.py b/tools/transformer/transformer.py index d9850444b..6445f4515 100644 --- a/tools/transformer/transformer.py +++ b/tools/transformer/transformer.py @@ -183,6 +183,7 @@ def get_data(self) -> TransformerResult: letters_per_policy=self.tresult.letters_per_policy, letters_map=self.tresult.letters_map, formats_map=self.tresult.formats_map, + fragments_map=self.tresult.fragments_map, ) def print_summary(self) -> None: diff --git a/tools/tzcompiler.py b/tools/tzcompiler.py index b697e3303..fe4bc0302 100755 --- a/tools/tzcompiler.py +++ b/tools/tzcompiler.py @@ -349,6 +349,7 @@ def main() -> None: letters_per_policy={}, letters_map={}, formats_map={}, + fragments_map={}, ) # Transform the TZ zones and rules diff --git a/tools/validate.py b/tools/validate.py index a7778da66..6980474b2 100755 --- a/tools/validate.py +++ b/tools/validate.py @@ -316,6 +316,7 @@ def main() -> None: letters_per_policy={}, letters_map={}, formats_map={}, + fragments_map={}, ) # Transform the TZ zones and rules From 29a778d73996574bc247be23e29364606e94d51e Mon Sep 17 00:00:00 2001 From: Brian Park Date: Sun, 3 Jan 2021 17:05:47 -0800 Subject: [PATCH 29/74] tools/argenerator.py,src/ZoneContext.inc: Write zoneName fragments into ZoneContext --- src/ace_time/internal/ZoneContext.inc | 6 ++++++ tools/generator/argenerator.py | 19 ++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/ace_time/internal/ZoneContext.inc b/src/ace_time/internal/ZoneContext.inc index 21ed82d05..c48e52a33 100644 --- a/src/ace_time/internal/ZoneContext.inc +++ b/src/ace_time/internal/ZoneContext.inc @@ -33,4 +33,10 @@ struct ZoneContext { /** TZ Database version which generated the zone info. */ const char* const tzVersion; + + /** Number of fragments. */ + const uint8_t numFragments; + + /** Zone Name fragment list. */ + const char* const* const fragments; }; diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index d2d830011..13ba6cd00 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -93,6 +93,7 @@ def __init__( buf_sizes=zidb['buf_sizes'], zone_ids=zidb['zone_ids'], link_ids=zidb['link_ids'], + fragments_map=zidb['fragments_map'], ) self.zone_registry_generator = ZoneRegistryGenerator( invocation=wrapped_invocation, @@ -584,10 +585,16 @@ class ZoneInfosGenerator: const char kTzDatabaseVersion[] = "{tz_version}"; +const char* const kFragments[] = {{ +{fragments} +}}; + const {scope}::ZoneContext kZoneContext = {{ {start_year} /*startYear*/, {until_year} /*untilYear*/, kTzDatabaseVersion /*tzVersion*/, + {numFragments} /*numFragments*/, + kFragments /*fragments*/, }}; //--------------------------------------------------------------------------- @@ -671,6 +678,7 @@ def __init__( buf_sizes: BufSizeMap, zone_ids: Dict[str, int], link_ids: Dict[str, int], + fragments_map: IndexMap, ): self.invocation = invocation self.db_namespace = db_namespace @@ -691,6 +699,7 @@ def __init__( self.buf_sizes = buf_sizes self.zone_ids = zone_ids self.link_ids = link_ids + self.fragments_map = fragments_map self.db_header_namespace = self.db_namespace.upper() @@ -851,6 +860,11 @@ def generate_infos_cpp(self) -> str: + num_links * 4 # sizeof(kZoneAndLinkRegistry) ) + num_fragments = len(self.fragments_map) + fragments = '/*\\x00*/ nullptr,\n' + for fragment, index in self.fragments_map.items(): + fragments += f'/*\\x{index:02x}*/ "{fragment}",\n' + return self.ZONE_INFOS_CPP_FILE.format( invocation=self.invocation, tz_files=self.tz_files, @@ -870,7 +884,10 @@ def generate_infos_cpp(self) -> str: zoneAndLinkMemory8=zone_and_link_memory8, zoneAndLinkMemory32=zone_and_link_memory32, infoItems=info_items, - linkItems=link_items) + linkItems=link_items, + numFragments=num_fragments, + fragments=fragments, + ) def _generate_info_item( self, From 998bde9df07e31c83ed11799bfcb8f696d955c77 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 5 Jan 2021 15:06:09 -0800 Subject: [PATCH 30/74] tools/artransformer.py: Generate compression fragments from all components of the zoneName, not just the first --- tools/transformer/artransformer.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tools/transformer/artransformer.py b/tools/transformer/artransformer.py index 8e6ef2e25..aef88d6ee 100644 --- a/tools/transformer/artransformer.py +++ b/tools/transformer/artransformer.py @@ -5,6 +5,7 @@ from typing import NamedTuple from typing import Optional from typing import Dict +from typing import List from typing import Set from typing import Tuple from collections import OrderedDict, Counter @@ -473,9 +474,10 @@ def _generate_fragments(zones_map: ZonesMap, links_map: LinksMap) -> IndexMap: # Collect the frequency of fragments longer than 3 characters fragments: Dict[str, int] = Counter() for name in itertools.chain(zones_map.keys(), links_map.keys()): - fragment = _extract_fragment(name) - if len(fragment) > 3: - fragments[fragment] += 1 + fragment_list = _extract_fragments(name) + for fragment in fragment_list: + if len(fragment) > 3: + fragments[fragment] += 1 # Collect fragments which occur more than 3 times. fragments_map: IndexMap = OrderedDict() @@ -496,9 +498,10 @@ def _generate_fragments(zones_map: ZonesMap, links_map: LinksMap) -> IndexMap: return fragments_map -def _extract_fragment(name: str) -> str: - """Return the fragment before '/' or None if no '/' in name.""" - pos = name.find('/') - if pos < 0: - return "" - return name[:pos] +def _extract_fragments(name: str) -> List[str]: + """Return the fragments between '/', excluding the final fragment. In other + words "America/Argentina/Buenos_Aires" returns ["America", "Argentina"]. But + "UTC" returns []. + """ + fragments = name.split('/') + return fragments[:-1] From f37b4b5aa54dbcda488f7c6bfb6fe13d5d5c7d2e Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 5 Jan 2021 17:17:53 -0800 Subject: [PATCH 31/74] tools/argenerator.py: Simplify calculation of string size and total memory consumption for zonedb/zone_info.cpp files --- tools/generator/argenerator.py | 95 +++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index 13ba6cd00..41064b493 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -93,6 +93,7 @@ def __init__( buf_sizes=zidb['buf_sizes'], zone_ids=zidb['zone_ids'], link_ids=zidb['link_ids'], + formats_map=zidb['formats_map'], fragments_map=zidb['fragments_map'], ) self.zone_registry_generator = ZoneRegistryGenerator( @@ -616,7 +617,7 @@ class ZoneInfosGenerator: //--------------------------------------------------------------------------- // Zone name: {zoneFullName} // Zone Eras: {numEras} -// Strings (bytes): {stringLength} +// Strings (bytes): {stringSize} // Memory (8-bit): {memory8} // Memory (32-bit): {memory32} //--------------------------------------------------------------------------- @@ -653,9 +654,9 @@ class ZoneInfosGenerator: """ # noqa SIZEOF_ZONE_ERA_8 = 11 - SIZEOF_ZONE_ERA_32 = 16 + SIZEOF_ZONE_ERA_32 = 16 # 15 + 1 for 4-byte alignment SIZEOF_ZONE_INFO_8 = 11 - SIZEOF_ZONE_INFO_32 = 20 + SIZEOF_ZONE_INFO_32 = 20 # 18 + 2 for 4-byte alignment def __init__( self, @@ -678,6 +679,7 @@ def __init__( buf_sizes: BufSizeMap, zone_ids: Dict[str, int], link_ids: Dict[str, int], + formats_map: IndexMap, fragments_map: IndexMap, ): self.invocation = invocation @@ -699,6 +701,7 @@ def __init__( self.buf_sizes = buf_sizes self.zone_ids = zone_ids self.link_ids = link_ids + self.formats_map = formats_map self.fragments_map = fragments_map self.db_header_namespace = self.db_namespace.upper() @@ -813,36 +816,40 @@ def generate_infos_h(self) -> str: def generate_infos_cpp(self) -> str: # Generate the list of zone infos - zone_string_size = 0 - info_items = '' num_eras = 0 + info_items = '' for zone_name, eras in sorted(self.zones_map.items()): - info_item, string_length = self._generate_info_item( - zone_name, eras) + info_item = self._generate_info_item(zone_name, eras) info_items += info_item - zone_string_size += string_length num_eras += len(eras) # Generate links references. - link_string_size = 0 link_items = '' for link_name, zone_name in sorted(self.links_map.items()): - link_item, string_length = self._generate_link_item( - link_name, zone_name) + link_item = self._generate_link_item(link_name, zone_name) link_items += link_item - link_string_size += string_length - # Estimate size of entire zone info database. + # Estimate size of entire kZoneRegistry or kZoneAndLinkRegistry + # database, factoring in deduping. num_infos = len(self.zones_map) num_links = len(self.links_map) + zone_string_size = sum([ + len(name) + 1 for name in self.zones_map.keys() + ]) + link_string_size = sum([ + len(name) + 1 for name in self.links_map.keys() + ]) + format_size = sum([len(s) + 1 for s in self.formats_map.keys()]) zone_memory8 = ( zone_string_size + + format_size + num_eras * self.SIZEOF_ZONE_ERA_8 + num_infos * self.SIZEOF_ZONE_INFO_8 + num_infos * 2 # sizeof(kZoneRegistry) ) zone_memory32 = ( zone_string_size + + format_size + num_eras * self.SIZEOF_ZONE_ERA_32 + num_infos * self.SIZEOF_ZONE_INFO_32 + num_infos * 4 # sizeof(kZoneRegistry) @@ -860,7 +867,7 @@ def generate_infos_cpp(self) -> str: + num_links * 4 # sizeof(kZoneAndLinkRegistry) ) - num_fragments = len(self.fragments_map) + num_fragments = len(self.fragments_map) + 1 fragments = '/*\\x00*/ nullptr,\n' for fragment, index in self.fragments_map.items(): fragments += f'/*\\x{index:02x}*/ "{fragment}",\n' @@ -893,41 +900,44 @@ def _generate_info_item( self, zone_name: str, eras: List[ZoneEraRaw], - ) -> Tuple[str, int]: + ) -> str: era_items = '' - string_length = 0 for era in eras: - (era_item, length) = self._generate_era_item(zone_name, era) + era_item = self._generate_era_item(zone_name, era) era_items += era_item - string_length += length - string_length += len(zone_name) + 1 + # Calculate memory sizes + zone_name_size = len(zone_name) + 1 + format_size = 0 + for era in eras: + format_size += len(era['format_short']) + 1 num_eras = len(eras) - memory8 = ( - string_length - + num_eras * self.SIZEOF_ZONE_ERA_8 - + 1 * self.SIZEOF_ZONE_INFO_8) - memory32 = ( - string_length - + num_eras * self.SIZEOF_ZONE_ERA_32 - + 1 * self.SIZEOF_ZONE_INFO_32) + data_size8 = ( + num_eras * self.SIZEOF_ZONE_ERA_8 + + self.SIZEOF_ZONE_INFO_8 + ) + data_size32 = ( + num_eras * self.SIZEOF_ZONE_ERA_32 + + self.SIZEOF_ZONE_INFO_32 + ) + string_size = zone_name_size + format_size info_item = self.ZONE_INFOS_CPP_INFO_ITEM.format( scope=self.scope, zoneFullName=zone_name, zoneNormalizedName=normalize_name(zone_name), zoneId=self.zone_ids[zone_name], numEras=num_eras, - stringLength=string_length, - memory8=memory8, - memory32=memory32, + stringSize=string_size, + memory8=data_size8 + string_size, + memory32=data_size32 + string_size, eraItems=era_items, progmem='ACE_TIME_PROGMEM') - return (info_item, string_length) + return info_item def _generate_era_item( self, zone_name: str, era: ZoneEraRaw - ) -> Tuple[str, int]: + ) -> str: rules_policy_name = era['rules'] if rules_policy_name == '-' or rules_policy_name == ':': zone_policy = 'nullptr' @@ -951,7 +961,6 @@ def _generate_era_item( suffix=era['until_time_suffix'], ) format_short = era['format_short'] - string_length = len(format_short) + 1 era_item = self.ZONE_INFOS_CPP_ERA_ITEM.format( raw_line=normalize_raw(era['raw_line']), @@ -968,17 +977,17 @@ def _generate_era_item( until_time_modifier_comment=until_time_modifier_comment, ) - return (era_item, string_length) + return era_item def _generate_link_item( self, link_name: str, zone_name: str, - ) -> Tuple[str, int]: - """Return the Link item and the amount of string space consumed by this - Link entry. + ) -> str: + """Return the Link item. """ ZONE_INFOS_CPP_LINK_ITEM = """\ //--------------------------------------------------------------------------- // Link name: {linkFullName} -> {zoneFullName} +// Strings (bytes): {stringSize} // Memory (8-bit): {memory8} // Memory (32-bit): {memory32} //--------------------------------------------------------------------------- @@ -994,7 +1003,9 @@ def _generate_link_item( }}; """ - + link_name_size = len(link_name) + 1 + memory8 = link_name_size + self.SIZEOF_ZONE_INFO_8 + memory32 = link_name_size + self.SIZEOF_ZONE_INFO_32 link_item = ZONE_INFOS_CPP_LINK_ITEM.format( scope=self.scope, linkFullName=link_name, @@ -1002,14 +1013,14 @@ def _generate_link_item( linkId=self.link_ids[link_name], zoneFullName=zone_name, zoneNormalizedName=normalize_name(zone_name), + stringSize=link_name_size, + memory8=memory8, + memory32=memory32, numEras=len(self.zones_map[zone_name]), progmem='ACE_TIME_PROGMEM', - memory8=self.SIZEOF_ZONE_INFO_8, - memory32=self.SIZEOF_ZONE_INFO_32, ) - string_length = len(link_name) + 1 - return link_item, string_length + return link_item class ZoneRegistryGenerator: From 4602dcf75b23874c8dbaf140612fb6f884fdeaa7 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 5 Jan 2021 17:37:59 -0800 Subject: [PATCH 32/74] tools/argenerator.py: Write out memory consumed by LETTERs longer than 1-char as 'Letter Size' --- tools/generator/argenerator.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index 41064b493..a73a0a497 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -72,6 +72,7 @@ def __init__( notable_zones=zidb['notable_zones'], notable_policies=zidb['notable_policies'], letters_per_policy=zidb['letters_per_policy'], + letters_map=zidb['letters_map'], ) self.zone_infos_generator = ZoneInfosGenerator( invocation=wrapped_invocation, @@ -190,8 +191,9 @@ class ZonePoliciesGenerator: // // Policies: {numPolicies} // Rules: {numRules} -// Memory (8-bit): {memory8} -// Memory (32-bit): {memory32} +// Letter Size (bytes): {letterSize} +// Total Memory 8-bit (bytes): {memory8} +// Total Memory 32-bit (bytes): {memory32} // // DO NOT EDIT @@ -249,6 +251,7 @@ def __init__( notable_zones: CommentsMap, notable_policies: CommentsMap, letters_per_policy: LettersPerPolicy, + letters_map: IndexMap, ): self.invocation = invocation self.tz_version = tz_version @@ -262,6 +265,7 @@ def __init__( self.notable_zones = notable_zones self.notable_policies = notable_policies self.letters_per_policy = letters_per_policy + self.letters_map = letters_map self.db_header_namespace = self.db_namespace.upper() @@ -322,6 +326,9 @@ def generate_policies_cpp(self) -> str: memory32 += policy_memory32 num_policies = len(self.policies_map) + letter_size = sum([ + len(letter) + 1 for letter in self.letters_map.keys() + ]) return self.ZONE_POLICIES_CPP_FILE.format( invocation=self.invocation, @@ -331,6 +338,7 @@ def generate_policies_cpp(self) -> str: dbHeaderNamespace=self.db_header_namespace, numPolicies=num_policies, numRules=num_rules, + letterSize=letter_size, memory8=memory8, memory32=memory32, policyItems=policy_items) From 067e70cff949afd87218d11956b9cfd141bdbccd Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 5 Jan 2021 18:56:21 -0800 Subject: [PATCH 33/74] tools: Generate compressed zone names, saving ~2kB for zonedbx and ~1.3kB for zonedb --- tools/data_types/at_types.py | 4 +++ tools/generator/argenerator.py | 55 ++++++++++++++++++++++++++---- tools/transformer/artransformer.py | 33 ++++++++++++++++++ tools/transformer/transformer.py | 1 + tools/tzcompiler.py | 1 + tools/validate.py | 1 + 6 files changed, 88 insertions(+), 7 deletions(-) diff --git a/tools/data_types/at_types.py b/tools/data_types/at_types.py index 1cd5583a8..4fe89af83 100644 --- a/tools/data_types/at_types.py +++ b/tools/data_types/at_types.py @@ -192,6 +192,7 @@ class TransformerResult(NamedTuple): * letters_map: {letter -> index} * formats_map: {format -> index} * fragments_map: {fragment -> index} + * compressed_names: {zoneName -> compressedName} """ zones_map: ZonesMap policies_map: PoliciesMap @@ -208,6 +209,7 @@ class TransformerResult(NamedTuple): letters_map: IndexMap formats_map: IndexMap fragments_map: IndexMap + compressed_names: Dict[str, str] def add_comment(comments: CommentsMap, name: str, reason: str) -> None: @@ -294,6 +296,7 @@ class ZoneInfoDatabase(TypedDict): letters_map: IndexMap # all multi-character letters formats_map: IndexMap # shortened format strings. fragments_map: IndexMap # zoneName fragment -> index + compressed_names: Dict[str, str] # zoneName -> compressedName def create_zone_info_database( @@ -351,6 +354,7 @@ def create_zone_info_database( 'letters_map': tresult.letters_map, 'formats_map': tresult.formats_map, 'fragments_map': tresult.fragments_map, + 'compressed_names': tresult.compressed_names, } diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index a73a0a497..fb655ebf6 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -96,6 +96,7 @@ def __init__( link_ids=zidb['link_ids'], formats_map=zidb['formats_map'], fragments_map=zidb['fragments_map'], + compressed_names=zidb['compressed_names'], ) self.zone_registry_generator = ZoneRegistryGenerator( invocation=wrapped_invocation, @@ -571,11 +572,14 @@ class ZoneInfosGenerator: // Zones: {numInfos} // Links: {numLinks} // kZoneRegistry sizes (bytes): -// Strings: {zoneStringSize} +// Strings: {zoneStringSize} (originally {zoneStringOriginalSize}) +// Format Size: {formatSize} // Memory (8-bit): {zoneMemory8} // Memory (32-bit): {zoneMemory32} // kZoneAndLinkRegistry sizes (bytes): -// Strings: {zoneAndLinkStringSize} +// Strings: {zoneAndLinkStringSize} \ +(originally {zoneAndLinkStringOriginalSize}) +// Format Size: {formatSize} // Memory (8-bit): {zoneAndLinkMemory8} // Memory (32-bit): {zoneAndLinkMemory32} // @@ -625,7 +629,7 @@ class ZoneInfosGenerator: //--------------------------------------------------------------------------- // Zone name: {zoneFullName} // Zone Eras: {numEras} -// Strings (bytes): {stringSize} +// Strings (bytes): {stringSize} (originally {originalSize}) // Memory (8-bit): {memory8} // Memory (32-bit): {memory32} //--------------------------------------------------------------------------- @@ -634,7 +638,8 @@ class ZoneInfosGenerator: {eraItems} }}; -static const char kZoneName{zoneNormalizedName}[] {progmem} = "{zoneFullName}"; +static const char kZoneName{zoneNormalizedName}[] {progmem} = \ +"{compressedName}"; const {scope}::ZoneInfo kZone{zoneNormalizedName} {progmem} = {{ kZoneName{zoneNormalizedName} /*name*/, @@ -689,6 +694,7 @@ def __init__( link_ids: Dict[str, int], formats_map: IndexMap, fragments_map: IndexMap, + compressed_names: Dict[str, str], ): self.invocation = invocation self.db_namespace = db_namespace @@ -711,6 +717,7 @@ def __init__( self.link_ids = link_ids self.formats_map = formats_map self.fragments_map = fragments_map + self.compressed_names = compressed_names self.db_header_namespace = self.db_namespace.upper() @@ -841,12 +848,20 @@ def generate_infos_cpp(self) -> str: # database, factoring in deduping. num_infos = len(self.zones_map) num_links = len(self.links_map) - zone_string_size = sum([ + zone_string_original_size = sum([ len(name) + 1 for name in self.zones_map.keys() ]) - link_string_size = sum([ + zone_string_size = sum([ + self._compressed_len(self.compressed_names[name]) + 1 + for name in self.zones_map.keys() + ]) + link_string_original_size = sum([ len(name) + 1 for name in self.links_map.keys() ]) + link_string_size = sum([ + self._compressed_len(self.compressed_names[name]) + 1 + for name in self.links_map.keys() + ]) format_size = sum([len(s) + 1 for s in self.formats_map.keys()]) zone_memory8 = ( zone_string_size @@ -880,6 +895,9 @@ def generate_infos_cpp(self) -> str: for fragment, index in self.fragments_map.items(): fragments += f'/*\\x{index:02x}*/ "{fragment}",\n' + zone_and_link_string_original_size = ( + zone_string_original_size + link_string_original_size + ) return self.ZONE_INFOS_CPP_FILE.format( invocation=self.invocation, tz_files=self.tz_files, @@ -893,11 +911,14 @@ def generate_infos_cpp(self) -> str: numLinks=num_links, numEras=num_eras, zoneStringSize=zone_string_size, + zoneStringOriginalSize=zone_string_original_size, zoneMemory8=zone_memory8, zoneMemory32=zone_memory32, zoneAndLinkStringSize=(zone_string_size + link_string_size), + zoneAndLinkStringOriginalSize=zone_and_link_string_original_size, zoneAndLinkMemory8=zone_and_link_memory8, zoneAndLinkMemory32=zone_and_link_memory32, + formatSize=format_size, infoItems=info_items, linkItems=link_items, numFragments=num_fragments, @@ -914,8 +935,11 @@ def _generate_info_item( era_item = self._generate_era_item(zone_name, era) era_items += era_item + compressed_name = self.compressed_names[zone_name] + compressed_length = self._compressed_len(compressed_name) + # Calculate memory sizes - zone_name_size = len(zone_name) + 1 + zone_name_size = compressed_length + 1 format_size = 0 for era in eras: format_size += len(era['format_short']) + 1 @@ -930,19 +954,36 @@ def _generate_info_item( ) string_size = zone_name_size + format_size + original_size = len(zone_name) + 1 + format_size info_item = self.ZONE_INFOS_CPP_INFO_ITEM.format( scope=self.scope, zoneFullName=zone_name, zoneNormalizedName=normalize_name(zone_name), + compressedName=compressed_name, zoneId=self.zone_ids[zone_name], numEras=num_eras, stringSize=string_size, + originalSize=original_size, memory8=data_size8 + string_size, memory32=data_size32 + string_size, eraItems=era_items, progmem='ACE_TIME_PROGMEM') return info_item + def _compressed_len(self, compressed_name: str) -> int: + """Return the length of the compressed name, counting an escaped hex + character (\\xHH) as one character. + """ + i = 0 + compressed_length = 0 + total_length = len(compressed_name) + while i < total_length: + if compressed_name[i] == '\\': + i += 3 + i += 1 + compressed_length += 1 + return compressed_length + def _generate_era_item( self, zone_name: str, era: ZoneEraRaw ) -> str: diff --git a/tools/transformer/artransformer.py b/tools/transformer/artransformer.py index aef88d6ee..85ba58db8 100644 --- a/tools/transformer/artransformer.py +++ b/tools/transformer/artransformer.py @@ -59,6 +59,9 @@ def transform(self) -> None: self.zone_ids = _generate_zone_ids(self.zones_map) self.link_ids = _generate_link_ids(self.links_map) self.fragments_map = _generate_fragments(self.zones_map, self.links_map) + self.compressed_names = _generate_compressed_names( + self.zones_map, self.links_map, self.fragments_map + ) def get_data(self) -> TransformerResult: return TransformerResult( @@ -77,6 +80,7 @@ def get_data(self) -> TransformerResult: letters_map=self.letters_map, formats_map=self.formats_map, fragments_map=self.fragments_map, + compressed_names=self.compressed_names, ) def print_summary(self) -> None: @@ -505,3 +509,32 @@ def _extract_fragments(name: str) -> List[str]: """ fragments = name.split('/') return fragments[:-1] + + +def _generate_compressed_names( + zones_map: ZonesMap, + links_map: LinksMap, + fragments_map: IndexMap, +) -> Dict[str, str]: + compressed_names: Dict[str, str] = OrderedDict() + for name in sorted(zones_map.keys()): + compressed_names[name] = _compress_name(name, fragments_map) + for name in sorted(links_map.keys()): + compressed_names[name] = _compress_name(name, fragments_map) + return compressed_names + + +def _compress_name(name: str, fragments: IndexMap) -> str: + """Convert 'name' into keyword-compressed format suitable for the C++ + KString class. For example, "America/Chicago" -> "\x01/Chicago". + Returns the compressed name. + """ + exploded = name.split('/') + substituted: List[str] = [] + for fragment in exploded: + keyword_index = fragments.get(fragment) + if keyword_index is None: + substituted.append(fragment) + else: + substituted.append(f'\\x{keyword_index:02x}') + return '/'.join(substituted) diff --git a/tools/transformer/transformer.py b/tools/transformer/transformer.py index 6445f4515..8dc1fb258 100644 --- a/tools/transformer/transformer.py +++ b/tools/transformer/transformer.py @@ -184,6 +184,7 @@ def get_data(self) -> TransformerResult: letters_map=self.tresult.letters_map, formats_map=self.tresult.formats_map, fragments_map=self.tresult.fragments_map, + compressed_names=self.tresult.compressed_names, ) def print_summary(self) -> None: diff --git a/tools/tzcompiler.py b/tools/tzcompiler.py index fe4bc0302..2362fdfa9 100755 --- a/tools/tzcompiler.py +++ b/tools/tzcompiler.py @@ -350,6 +350,7 @@ def main() -> None: letters_map={}, formats_map={}, fragments_map={}, + compressed_names={}, ) # Transform the TZ zones and rules diff --git a/tools/validate.py b/tools/validate.py index 6980474b2..f08b72f0d 100755 --- a/tools/validate.py +++ b/tools/validate.py @@ -317,6 +317,7 @@ def main() -> None: letters_map={}, formats_map={}, fragments_map={}, + compressed_names={}, ) # Transform the TZ zones and rules From 3425f192b44674afc9641d458f538bf362f095d2 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 5 Jan 2021 19:52:25 -0800 Subject: [PATCH 34/74] tools/artransformer.py: Include trailing '/' into fragments, increasing compression by ~500 bytes; total ~2500 bytes saved --- tools/transformer/artransformer.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/tools/transformer/artransformer.py b/tools/transformer/artransformer.py index 85ba58db8..f2fef7e22 100644 --- a/tools/transformer/artransformer.py +++ b/tools/transformer/artransformer.py @@ -503,12 +503,14 @@ def _generate_fragments(zones_map: ZonesMap, links_map: LinksMap) -> IndexMap: def _extract_fragments(name: str) -> List[str]: - """Return the fragments between '/', excluding the final fragment. In other - words "America/Argentina/Buenos_Aires" returns ["America", "Argentina"]. But - "UTC" returns []. + """Return the fragments deliminted by '/', excluding the final component. + Since every component before the final component is followed by a '/', each + fragment returned by this method includes the trailing '/' to obtain higher + compression. For example, "America/Argentina/Buenos_Aires" returns + ["America/", "Argentina/"]. But "UTC" returns []. """ - fragments = name.split('/') - return fragments[:-1] + components = name.split('/') + return [component + '/' for component in components[:-1]] def _generate_compressed_names( @@ -526,15 +528,17 @@ def _generate_compressed_names( def _compress_name(name: str, fragments: IndexMap) -> str: """Convert 'name' into keyword-compressed format suitable for the C++ - KString class. For example, "America/Chicago" -> "\x01/Chicago". + KString class. For example, "America/Chicago" -> "\x01Chicago". Returns the compressed name. """ - exploded = name.split('/') - substituted: List[str] = [] - for fragment in exploded: + compressed = '' + components = name.split('/') + for component in components[:-1]: + fragment = component + '/' keyword_index = fragments.get(fragment) if keyword_index is None: - substituted.append(fragment) + compressed += fragment else: - substituted.append(f'\\x{keyword_index:02x}') - return '/'.join(substituted) + compressed += f'\\x{keyword_index:02x}' + compressed += components[-1] + return compressed From dfc3d76722f5c25f3d73db3c8a4c365106725ac2 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 08:24:05 -0800 Subject: [PATCH 35/74] tools/argenerator.py: Split hex escape characters into separate quoted strings --- tools/generator/argenerator.py | 54 +++++++++++++++++++----------- tools/tests/test_generator.py | 28 ++++++++++++++++ tools/transformer/artransformer.py | 2 +- 3 files changed, 63 insertions(+), 21 deletions(-) create mode 100644 tools/tests/test_generator.py diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index fb655ebf6..a455104a6 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -639,7 +639,7 @@ class ZoneInfosGenerator: }}; static const char kZoneName{zoneNormalizedName}[] {progmem} = \ -"{compressedName}"; +{compressedName}; const {scope}::ZoneInfo kZone{zoneNormalizedName} {progmem} = {{ kZoneName{zoneNormalizedName} /*name*/, @@ -852,14 +852,14 @@ def generate_infos_cpp(self) -> str: len(name) + 1 for name in self.zones_map.keys() ]) zone_string_size = sum([ - self._compressed_len(self.compressed_names[name]) + 1 + len(self.compressed_names[name]) + 1 for name in self.zones_map.keys() ]) link_string_original_size = sum([ len(name) + 1 for name in self.links_map.keys() ]) link_string_size = sum([ - self._compressed_len(self.compressed_names[name]) + 1 + len(self.compressed_names[name]) + 1 for name in self.links_map.keys() ]) format_size = sum([len(s) + 1 for s in self.formats_map.keys()]) @@ -936,10 +936,10 @@ def _generate_info_item( era_items += era_item compressed_name = self.compressed_names[zone_name] - compressed_length = self._compressed_len(compressed_name) + rendered_name = _compressed_name_to_c_string(compressed_name) # Calculate memory sizes - zone_name_size = compressed_length + 1 + zone_name_size = len(compressed_name) + 1 format_size = 0 for era in eras: format_size += len(era['format_short']) + 1 @@ -959,7 +959,7 @@ def _generate_info_item( scope=self.scope, zoneFullName=zone_name, zoneNormalizedName=normalize_name(zone_name), - compressedName=compressed_name, + compressedName=rendered_name, zoneId=self.zone_ids[zone_name], numEras=num_eras, stringSize=string_size, @@ -970,20 +970,6 @@ def _generate_info_item( progmem='ACE_TIME_PROGMEM') return info_item - def _compressed_len(self, compressed_name: str) -> int: - """Return the length of the compressed name, counting an escaped hex - character (\\xHH) as one character. - """ - i = 0 - compressed_length = 0 - total_length = len(compressed_name) - while i < total_length: - if compressed_name[i] == '\\': - i += 3 - i += 1 - compressed_length += 1 - return compressed_length - def _generate_era_item( self, zone_name: str, era: ZoneEraRaw ) -> str: @@ -1283,3 +1269,31 @@ def _get_rule_delta_code_comment( return f"deltaMinute={delta_minute}/15 + 4" else: return f"deltaMinute={delta_minute}/15" + + +def _compressed_name_to_c_string(compressed_name: str) -> str: + """Convert a compressed name (with fragment references) to a string that + the C++ compiler will accept. The primary reason for this function is + because the hex escape sequence (\\xHH) in C/C++ has no length limit, so + will happily run into the characters after the HH. So we have to break + those references into separate strings. Example: converts ("\x01ab") + into ("\x01" "ab"). + """ + rendered_string = '' + in_normal_string = False + for c in compressed_name: + if ord(c) < 0x20: + if in_normal_string: + rendered_string += f'" "\\x{ord(c):02x}" ' + in_normal_string = False + else: + rendered_string += f'"\\x{ord(c):02x}" ' + else: + if in_normal_string: + rendered_string += c + else: + rendered_string += f'"{c}' + in_normal_string = True + if in_normal_string: + rendered_string += '"' + return rendered_string.strip() diff --git a/tools/tests/test_generator.py b/tools/tests/test_generator.py new file mode 100644 index 000000000..69193fd3b --- /dev/null +++ b/tools/tests/test_generator.py @@ -0,0 +1,28 @@ +# Copyright 2021 Brian T. Park +# +# MIT License + +import unittest +from generator.argenerator import _compressed_name_to_c_string + + +class TestArduinoGenerator(unittest.TestCase): + def test_compressed_name_to_c_string(self) -> None: + self.assertEqual('"hello"', _compressed_name_to_c_string('hello')) + self.assertEqual('"\\x01"', _compressed_name_to_c_string('\u0001')) + self.assertEqual( + '"\\x01" "hello"', + _compressed_name_to_c_string('\u0001hello') + ) + self.assertEqual( + '"hello" "\\x02"', + _compressed_name_to_c_string('hello\u0002') + ) + self.assertEqual( + '"\\x01" "hello" "\\x02"', + _compressed_name_to_c_string('\u0001hello\u0002') + ) + self.assertEqual( + '"\\x01" "\\x02"', + _compressed_name_to_c_string('\u0001\u0002') + ) diff --git a/tools/transformer/artransformer.py b/tools/transformer/artransformer.py index f2fef7e22..a02fcdca1 100644 --- a/tools/transformer/artransformer.py +++ b/tools/transformer/artransformer.py @@ -539,6 +539,6 @@ def _compress_name(name: str, fragments: IndexMap) -> str: if keyword_index is None: compressed += fragment else: - compressed += f'\\x{keyword_index:02x}' + compressed += chr(keyword_index) compressed += components[-1] return compressed From 11044bcd880f114af3175f1b0e9f8d40ea9a4129 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 11:26:52 -0800 Subject: [PATCH 36/74] src/BasicZone,ExtendedZone: Change name() to printNameTo(), shortName() to printShortNameTo(); to support compressed zoneNames --- examples/AutoBenchmark/Benchmark.cpp | 6 +- src/ace_time/BasicZone.cpp | 78 +++++++++++++++++++ src/ace_time/BasicZone.h | 43 ++++------ src/ace_time/BasicZoneProcessor.cpp | 4 +- src/ace_time/ExtendedZone.cpp | 78 +++++++++++++++++++ src/ace_time/ExtendedZone.h | 43 ++++------ src/ace_time/ExtendedZoneProcessor.cpp | 4 +- .../BasicZoneRegistrarTest.ino | 27 ++++++- .../ExtendedZoneRegistrarTest.ino | 27 ++++++- 9 files changed, 246 insertions(+), 64 deletions(-) create mode 100644 src/ace_time/BasicZone.cpp create mode 100644 src/ace_time/ExtendedZone.cpp diff --git a/examples/AutoBenchmark/Benchmark.cpp b/examples/AutoBenchmark/Benchmark.cpp index ad7aaa633..d763ad46e 100644 --- a/examples/AutoBenchmark/Benchmark.cpp +++ b/examples/AutoBenchmark/Benchmark.cpp @@ -408,8 +408,7 @@ static void runIndexForZoneName() { PrintStr<20> printStr; // deliberately short to truncate some zones uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; - const __FlashStringHelper* name = ExtendedZone(info).name(); - printStr.print(name); + ExtendedZone(info).printNameTo(printStr); uint16_t index = registrar.findIndexForName(printStr.getCstr()); disableOptimization(index); @@ -419,8 +418,7 @@ static void runIndexForZoneName() { PrintStr<20> printStr; // deliberately short to truncate some zones uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; - const __FlashStringHelper* name = ExtendedZone(info).name(); - printStr.print(name); + ExtendedZone(info).printNameTo(printStr); uint16_t len = printStr.length(); const char* s = printStr.getCstr(); diff --git a/src/ace_time/BasicZone.cpp b/src/ace_time/BasicZone.cpp new file mode 100644 index 000000000..fdfbbc5a6 --- /dev/null +++ b/src/ace_time/BasicZone.cpp @@ -0,0 +1,78 @@ +/* + * MIT License + * Copyright (c) 2019 Brian T. Park + */ + +#include +#include // KString +#include "BasicZone.h" + +using ace_common::KString; + +namespace ace_time { + +#if ACE_TIME_USE_PROGMEM + +void BasicZone::printNameTo(Print& printer) const { + const auto* name = (const __FlashStringHelper*) mZoneInfoBroker.name(); + const basic::ZoneContext* zoneContext = mZoneInfoBroker.zoneContext(); + KString kname(name, zoneContext->fragments, zoneContext->numFragments); + kname.printTo(printer); +} + +void BasicZone::printShortNameTo(Print& printer) const { + const char* name = mZoneInfoBroker.name(); + const auto* shortName = (const __FlashStringHelper*) findShortName(name); + printer.print(shortName); +} + +const char* BasicZone::findShortName(const char* name) { + size_t len = strlen_P(name); + const char* begin = name + len; + bool separatorFound = false; + while (len--) { + begin--; + char c = pgm_read_byte(begin); + if (c == '/' || (0 < c && c < 32)) { + separatorFound = true; + break; + } + } + if (separatorFound) begin++; + return begin; +} + +#else + +void BasicZone::printNameTo(Print& printer) const { + const char* name = mZoneInfoBroker.name(); + const basic::ZoneContext* zoneContext = mZoneInfoBroker.zoneContext(); + KString kname(name, zoneContext->fragments, zoneContext->numFragments); + kname.printTo(printer); +} + +void BasicZone::printShortNameTo(Print& printer) const { + const char* name = mZoneInfoBroker.name(); + const char* shortName = findShortName(name); + printer.print(shortName); +} + +const char* BasicZone::findShortName(const char* name) { + size_t len = strlen(name); + const char* begin = name + len; + bool separatorFound = false; + while (len--) { + begin--; + char c = *begin; + if (c == '/' || (0 < c && c < 32)) { + separatorFound = true; + break; + } + } + if (separatorFound) begin++; + return begin; +} + +#endif // ACE_TIME_USE_PROGMEM + +} // ace_time diff --git a/src/ace_time/BasicZone.h b/src/ace_time/BasicZone.h index 65b56e0e1..939044386 100644 --- a/src/ace_time/BasicZone.h +++ b/src/ace_time/BasicZone.h @@ -8,9 +8,8 @@ #include "internal/ZoneInfo.h" #include "internal/Brokers.h" -#include "common/compat.h" -class __FlashStringHelper; +class Print; namespace ace_time { @@ -24,30 +23,8 @@ class BasicZone { BasicZone(const basic::ZoneInfo* zoneInfo): mZoneInfoBroker(zoneInfo) {} -// TODO: Merge this with ExtendedZone.h now that they both use the same -// ACE_TIME_USE_PROGMEM macro. -#if ACE_TIME_USE_PROGMEM - const __FlashStringHelper* name() const { - return (const __FlashStringHelper*) mZoneInfoBroker.name(); - } - - const __FlashStringHelper* shortName() const { - const char* name = mZoneInfoBroker.name(); - const char* slash = strrchr_P(name, '/'); - return (slash) ? (const __FlashStringHelper*) (slash + 1) - : (const __FlashStringHelper*) name; - } -#else - const char* name() const { - return (const char*) mZoneInfoBroker.name(); - } - - const char* shortName() const { - const char* name = mZoneInfoBroker.name(); - const char* slash = strrchr(name, '/'); - return (slash) ? (slash + 1) : name; - } -#endif + void printNameTo(Print& printer) const; + void printShortNameTo(Print& printer) const; uint32_t zoneId() const { return mZoneInfoBroker.zoneId(); @@ -58,6 +35,20 @@ class BasicZone { BasicZone(const BasicZone&) = delete; BasicZone& operator=(const BasicZone&) = delete; + /** + * Find the short name that begins after the last separator '/', a keyword + * reference, or at the beginning of the string if no separator or keyword. + * The last component of the full ZoneName is never compressed, which + * allows this to be implemented without using ace_common::KString. + * + * For example, "America/Los_Angeles" returns a pointer to "Los_Angeles", + * and "\x01Denver" returns a ponter to "Denver". This method returns + * either a (const char*) or a (const __FlashStringHelper*) depending on + * whether PROGMEM is used or not. The caller is responsible for casting to + * the correct type. + */ + static const char* findShortName(const char* name); + const basic::ZoneInfoBroker mZoneInfoBroker; }; diff --git a/src/ace_time/BasicZoneProcessor.cpp b/src/ace_time/BasicZoneProcessor.cpp index febe24a39..060b46cc2 100644 --- a/src/ace_time/BasicZoneProcessor.cpp +++ b/src/ace_time/BasicZoneProcessor.cpp @@ -10,11 +10,11 @@ namespace ace_time { void BasicZoneProcessor::printTo(Print& printer) const { - printer.print(BasicZone(mZoneInfo.zoneInfo()).name()); + BasicZone(mZoneInfo.zoneInfo()).printNameTo(printer); } void BasicZoneProcessor::printShortTo(Print& printer) const { - printer.print(BasicZone(mZoneInfo.zoneInfo()).shortName()); + BasicZone(mZoneInfo.zoneInfo()).printShortNameTo(printer); } } diff --git a/src/ace_time/ExtendedZone.cpp b/src/ace_time/ExtendedZone.cpp new file mode 100644 index 000000000..992108cda --- /dev/null +++ b/src/ace_time/ExtendedZone.cpp @@ -0,0 +1,78 @@ +/* + * MIT License + * Copyright (c) 2019 Brian T. Park + */ + +#include +#include // KString +#include "ExtendedZone.h" + +using ace_common::KString; + +namespace ace_time { + +#if ACE_TIME_USE_PROGMEM + +void ExtendedZone::printNameTo(Print& printer) const { + const auto* name = (const __FlashStringHelper*) mZoneInfoBroker.name(); + const extended::ZoneContext* zoneContext = mZoneInfoBroker.zoneContext(); + KString kname(name, zoneContext->fragments, zoneContext->numFragments); + kname.printTo(printer); +} + +void ExtendedZone::printShortNameTo(Print& printer) const { + const char* name = mZoneInfoBroker.name(); + const auto* shortName = (const __FlashStringHelper*) findShortName(name); + printer.print(shortName); +} + +const char* ExtendedZone::findShortName(const char* name) { + size_t len = strlen_P(name); + const char* begin = name + len; + bool separatorFound = false; + while (len--) { + begin--; + char c = pgm_read_byte(begin); + if (c == '/' || (0 < c && c < 32)) { + separatorFound = true; + break; + } + } + if (separatorFound) begin++; + return begin; +} + +#else + +void ExtendedZone::printNameTo(Print& printer) const { + const char* name = mZoneInfoBroker.name(); + const extended::ZoneContext* zoneContext = mZoneInfoBroker.zoneContext(); + KString kname(name, zoneContext->fragments, zoneContext->numFragments); + kname.printTo(printer); +} + +void ExtendedZone::printShortNameTo(Print& printer) const { + const char* name = mZoneInfoBroker.name(); + const char* shortName = findShortName(name); + printer.print(shortName); +} + +const char* ExtendedZone::findShortName(const char* name) { + size_t len = strlen(name); + const char* begin = name + len; + bool separatorFound = false; + while (len--) { + begin--; + char c = *begin; + if (c == '/' || (0 < c && c < 32)) { + separatorFound = true; + break; + } + } + if (separatorFound) begin++; + return begin; +} + +#endif // ACE_TIME_USE_PROGMEM + +} // ace_time diff --git a/src/ace_time/ExtendedZone.h b/src/ace_time/ExtendedZone.h index 4e5264268..6fd40a064 100644 --- a/src/ace_time/ExtendedZone.h +++ b/src/ace_time/ExtendedZone.h @@ -8,9 +8,8 @@ #include "internal/ZoneInfo.h" #include "internal/Brokers.h" -#include "common/compat.h" -class __FlashStringHelper; +class Print; namespace ace_time { @@ -25,30 +24,8 @@ class ExtendedZone { ExtendedZone(const extended::ZoneInfo* zoneInfo): mZoneInfoBroker(zoneInfo) {} -// TODO: Merge this with BasicZone.h now that they both use the same -// ACE_TIME_USE_PROGMEM macro. -#if ACE_TIME_USE_PROGMEM - const __FlashStringHelper* name() const { - return (const __FlashStringHelper*) mZoneInfoBroker.name(); - } - - const __FlashStringHelper* shortName() const { - const char* name = mZoneInfoBroker.name(); - const char* slash = strrchr_P(name, '/'); - return (slash) ? (const __FlashStringHelper*) (slash + 1) - : (const __FlashStringHelper*) name; - } -#else - const char* name() const { - return mZoneInfoBroker.name(); - } - - const char* shortName() const { - const char* name = mZoneInfoBroker.name(); - const char* slash = strrchr(name, '/'); - return (slash) ? (slash + 1) : name; - } -#endif + void printNameTo(Print& printer) const; + void printShortNameTo(Print& printer) const; uint32_t zoneId() const { return mZoneInfoBroker.zoneId(); @@ -59,6 +36,20 @@ class ExtendedZone { ExtendedZone(const ExtendedZone&) = delete; ExtendedZone& operator=(const ExtendedZone&) = delete; + /** + * Find the short name that begins after the last separator '/', a keyword + * reference, or at the beginning of the string if no separator or keyword. + * The last component of the full ZoneName is never compressed, which + * allows this to be implemented without using ace_common::KString. + * + * For example, "America/Los_Angeles" returns a pointer to "Los_Angeles", + * and "\x01Denver" returns a ponter to "Denver". This method returns + * either a (const char*) or a (const __FlashStringHelper*) depending on + * whether PROGMEM is used or not. The caller is responsible for casting to + * the correct type. + */ + static const char* findShortName(const char* name); + const extended::ZoneInfoBroker mZoneInfoBroker; }; diff --git a/src/ace_time/ExtendedZoneProcessor.cpp b/src/ace_time/ExtendedZoneProcessor.cpp index 1918e3dd9..c3ca29c37 100644 --- a/src/ace_time/ExtendedZoneProcessor.cpp +++ b/src/ace_time/ExtendedZoneProcessor.cpp @@ -25,11 +25,11 @@ const extended::ZoneEra ExtendedZoneProcessor::kAnchorEra ACE_TIME_PROGMEM = { }; void ExtendedZoneProcessor::printTo(Print& printer) const { - printer.print(ExtendedZone(mZoneInfo.zoneInfo()).name()); + ExtendedZone(mZoneInfo.zoneInfo()).printNameTo(printer); } void ExtendedZoneProcessor::printShortTo(Print& printer) const { - printer.print(ExtendedZone(mZoneInfo.zoneInfo()).shortName()); + ExtendedZone(mZoneInfo.zoneInfo()).printShortNameTo(printer); } } diff --git a/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino b/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino index 997e25d0d..76d7d4916 100644 --- a/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino +++ b/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino @@ -56,8 +56,31 @@ test(BasicZoneRegistrarTest, getZoneInfo_Los_Angeles) { zoneRegistrar.getZoneInfoForName("America/Los_Angeles"); assertNotEqual(zoneInfo, nullptr); - assertEqual(F("America/Los_Angeles"), BasicZone(zoneInfo).name()); - assertEqual(F("Los_Angeles"), BasicZone(zoneInfo).shortName()); + ace_common::PrintStr<32> printStr; + BasicZone(zoneInfo).printNameTo(printStr); + assertEqual(F("America/Los_Angeles"), printStr.getCstr()); + + printStr.flush(); + BasicZone(zoneInfo).printShortNameTo(printStr); + assertEqual(F("Los_Angeles"), printStr.getCstr()); +} + +// Test a zone without separators, "EST". +test(BasicZoneRegistrarTest, getZoneInfo_EST) { + BasicZoneRegistrar zoneRegistrar( + zonedb::kZoneRegistrySize, zonedb::kZoneRegistry); + assertTrue(zoneRegistrar.isSorted()); + + const basic::ZoneInfo* zoneInfo = zoneRegistrar.getZoneInfoForName("EST"); + assertNotEqual(zoneInfo, nullptr); + + ace_common::PrintStr<32> printStr; + BasicZone(zoneInfo).printNameTo(printStr); + assertEqual(F("EST"), printStr.getCstr()); + + printStr.flush(); + BasicZone(zoneInfo).printShortNameTo(printStr); + assertEqual(F("EST"), printStr.getCstr()); } test(BasicZoneRegistrarTest, getZoneInfo_not_found) { diff --git a/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino b/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino index c5dfb20dc..54fe9bb68 100644 --- a/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino +++ b/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino @@ -32,8 +32,31 @@ test(ExtendedZoneRegistrarTest, getZoneInfoForName_Los_Angeles) { zoneRegistrar.getZoneInfoForName("America/Los_Angeles"); assertNotEqual(zoneInfo, nullptr); - assertEqual(F("America/Los_Angeles"), ExtendedZone(zoneInfo).name()); - assertEqual(F("Los_Angeles"), ExtendedZone(zoneInfo).shortName()); + ace_common::PrintStr<32> printStr; + ExtendedZone(zoneInfo).printNameTo(printStr); + assertEqual(F("America/Los_Angeles"), printStr.getCstr()); + + printStr.flush(); + ExtendedZone(zoneInfo).printShortNameTo(printStr); + assertEqual(F("Los_Angeles"), printStr.getCstr()); +} + +// Test a zone without separators, "EST". +test(ExtendedZoneRegistrarTest, getZoneInfoForName_EST) { + ExtendedZoneRegistrar zoneRegistrar( + zonedbx::kZoneRegistrySize, zonedbx::kZoneRegistry); + assertTrue(zoneRegistrar.isSorted()); + + const extended::ZoneInfo* zoneInfo = zoneRegistrar.getZoneInfoForName("EST"); + assertNotEqual(zoneInfo, nullptr); + + ace_common::PrintStr<32> printStr; + ExtendedZone(zoneInfo).printNameTo(printStr); + assertEqual(F("EST"), printStr.getCstr()); + + printStr.flush(); + ExtendedZone(zoneInfo).printShortNameTo(printStr); + assertEqual(F("EST"), printStr.getCstr()); } test(ExtendedZoneRegistrarTest, getZoneInfoForName_not_found) { From 0a60b1030ca16f430e4624bad87186cc54514fbd Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 11:38:51 -0800 Subject: [PATCH 37/74] tools/argenerator.py: Print memory consumed by kFragments[] in zone_infos.cpp --- tools/generator/argenerator.py | 35 +++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index a455104a6..aedf9ffef 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -572,14 +572,15 @@ class ZoneInfosGenerator: // Zones: {numInfos} // Links: {numLinks} // kZoneRegistry sizes (bytes): -// Strings: {zoneStringSize} (originally {zoneStringOriginalSize}) -// Format Size: {formatSize} +// Names: {zoneStringSize} (originally {zoneStringOriginalSize}) +// Formats: {formatSize} +// Fragments: {fragmentSize} // Memory (8-bit): {zoneMemory8} // Memory (32-bit): {zoneMemory32} // kZoneAndLinkRegistry sizes (bytes): -// Strings: {zoneAndLinkStringSize} \ -(originally {zoneAndLinkStringOriginalSize}) -// Format Size: {formatSize} +// Names: {zoneAndLinkStringSize} (originally {zoneAndLinkStringOriginalSize}) +// Formats: {formatSize} +// Fragments: {fragmentSize} // Memory (8-bit): {zoneAndLinkMemory8} // Memory (32-bit): {zoneAndLinkMemory32} // @@ -844,8 +845,14 @@ def generate_infos_cpp(self) -> str: link_item = self._generate_link_item(link_name, zone_name) link_items += link_item - # Estimate size of entire kZoneRegistry or kZoneAndLinkRegistry - # database, factoring in deduping. + # Generate fragments. + num_fragments = len(self.fragments_map) + 1 + fragments = '/*\\x00*/ nullptr,\n' + for fragment, index in self.fragments_map.items(): + fragments += f'/*\\x{index:02x}*/ "{fragment}",\n' + + # Estimate size of entire ZoneInfo database, factoring in deduping + # of strings num_infos = len(self.zones_map) num_links = len(self.links_map) zone_string_original_size = sum([ @@ -863,19 +870,25 @@ def generate_infos_cpp(self) -> str: for name in self.links_map.keys() ]) format_size = sum([len(s) + 1 for s in self.formats_map.keys()]) + fragment_size = sum([len(s) + 1 for s in self.fragments_map.keys()]) + zone_memory8 = ( zone_string_size + format_size + + fragment_size + num_eras * self.SIZEOF_ZONE_ERA_8 + num_infos * self.SIZEOF_ZONE_INFO_8 + num_infos * 2 # sizeof(kZoneRegistry) + + num_fragments * 2 ) zone_memory32 = ( zone_string_size + format_size + + fragment_size + num_eras * self.SIZEOF_ZONE_ERA_32 + num_infos * self.SIZEOF_ZONE_INFO_32 + num_infos * 4 # sizeof(kZoneRegistry) + + num_fragments * 2 ) zone_and_link_memory8 = ( zone_memory8 @@ -889,15 +902,10 @@ def generate_infos_cpp(self) -> str: + num_links * self.SIZEOF_ZONE_INFO_32 + num_links * 4 # sizeof(kZoneAndLinkRegistry) ) - - num_fragments = len(self.fragments_map) + 1 - fragments = '/*\\x00*/ nullptr,\n' - for fragment, index in self.fragments_map.items(): - fragments += f'/*\\x{index:02x}*/ "{fragment}",\n' - zone_and_link_string_original_size = ( zone_string_original_size + link_string_original_size ) + return self.ZONE_INFOS_CPP_FILE.format( invocation=self.invocation, tz_files=self.tz_files, @@ -919,6 +927,7 @@ def generate_infos_cpp(self) -> str: zoneAndLinkMemory8=zone_and_link_memory8, zoneAndLinkMemory32=zone_and_link_memory32, formatSize=format_size, + fragmentSize=fragment_size, infoItems=info_items, linkItems=link_items, numFragments=num_fragments, From 93f38dd91d355d63881e963950321ec5f86c14eb Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 11:40:45 -0800 Subject: [PATCH 38/74] src/ZoneRegistrar,zonedb,zonedb: Generate compressed zoneNames, use KString in findIndexByName() --- src/ace_time/ZoneRegistrar.h | 24 +- src/ace_time/zonedb/zone_infos.cpp | 3019 +++++++++-------- src/ace_time/zonedb/zone_policies.cpp | 5 +- src/ace_time/zonedbx/zone_infos.cpp | 4096 +++++++++++++----------- src/ace_time/zonedbx/zone_policies.cpp | 5 +- 5 files changed, 3798 insertions(+), 3351 deletions(-) diff --git a/src/ace_time/ZoneRegistrar.h b/src/ace_time/ZoneRegistrar.h index f9b45f407..40a00c594 100644 --- a/src/ace_time/ZoneRegistrar.h +++ b/src/ace_time/ZoneRegistrar.h @@ -8,8 +8,8 @@ #include #include // strcmp(), strcmp_P() -#include // strcmp_PP() -#include "common/compat.h" +#include // KString +#include "common/compat.h" // ACE_TIME_USE_PROGMEM #include "internal/ZoneInfo.h" #include "internal/Brokers.h" @@ -25,6 +25,8 @@ class BasicZoneRegistrarTest_Sorted_binarySearchById_not_found; class BasicZoneRegistrarTest_Unsorted_linearSearchById; class BasicZoneRegistrarTest_Unsorted_linearSearchById_not_found; +class __FlashStringHelper; + namespace ace_time { /** Typedef for functions that work like a strcmp(). */ @@ -94,12 +96,18 @@ class ZoneRegistrar { if (index == kInvalidIndex) return kInvalidIndex; // Verify that the zoneName actually matches, in case of hash collision. - const char* foundName = ZIB(ZRB(mZoneRegistry).zoneInfo(index)).name(); - if (STRCMP_P(name, foundName) == 0) { - return index; - } else { - return kInvalidIndex; - } + ZIB zoneInfoBroker(ZRB(mZoneRegistry).zoneInfo(index)); + const char* foundName = zoneInfoBroker.name(); + ace_common::KString kname( +#if ACE_TIME_USE_PROGMEM + (const __FlashStringHelper*) foundName, +#else + foundName, +#endif + zoneInfoBroker.zoneContext()->fragments, + zoneInfoBroker.zoneContext()->numFragments + ); + return (kname.compareTo(name) == 0) ? index : kInvalidIndex; } /** Find the index for zone id. Return kInvalidIndex if not found. */ diff --git a/src/ace_time/zonedb/zone_infos.cpp b/src/ace_time/zonedb/zone_infos.cpp index dbdc73713..a25cb8bba 100644 --- a/src/ace_time/zonedb/zone_infos.cpp +++ b/src/ace_time/zonedb/zone_infos.cpp @@ -27,13 +27,17 @@ // Zones: 266 // Links: 183 // kZoneRegistry sizes (bytes): -// Strings: 5333 -// Memory (8-bit): 11860 -// Memory (32-bit): 16181 +// Names: 2461 (originally 3996) +// Formats: 465 +// Fragments: 94 +// Memory (8-bit): 9571 +// Memory (32-bit): 13892 // kZoneAndLinkRegistry sizes (bytes): -// Strings: 7888 -// Memory (8-bit): 16794 -// Memory (32-bit): 23128 +// Names: 4175 (originally 6551) +// Formats: 465 +// Fragments: 94 +// Memory (8-bit): 13664 +// Memory (32-bit): 19998 // // DO NOT EDIT @@ -50,10 +54,28 @@ namespace zonedb { const char kTzDatabaseVersion[] = "2020f"; +const char* const kFragments[] = { +/*\x00*/ nullptr, +/*\x01*/ "Africa/", +/*\x02*/ "America/", +/*\x03*/ "Antarctica/", +/*\x04*/ "Asia/", +/*\x05*/ "Atlantic/", +/*\x06*/ "Australia/", +/*\x07*/ "Canada/", +/*\x08*/ "Etc/", +/*\x09*/ "Europe/", +/*\x0a*/ "Indian/", +/*\x0b*/ "Pacific/", + +}; + const basic::ZoneContext kZoneContext = { 2000 /*startYear*/, 2050 /*untilYear*/, kTzDatabaseVersion /*tzVersion*/, + 12 /*numFragments*/, + kFragments /*fragments*/, }; //--------------------------------------------------------------------------- @@ -63,9 +85,9 @@ const basic::ZoneContext kZoneContext = { //--------------------------------------------------------------------------- // Zone name: Africa/Abidjan // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAfrica_Abidjan[] ACE_TIME_PROGMEM = { @@ -84,7 +106,7 @@ static const basic::ZoneEra kZoneEraAfrica_Abidjan[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Abidjan[] ACE_TIME_PROGMEM = "Africa/Abidjan"; +static const char kZoneNameAfrica_Abidjan[] ACE_TIME_PROGMEM = "\x01" "Abidjan"; const basic::ZoneInfo kZoneAfrica_Abidjan ACE_TIME_PROGMEM = { kZoneNameAfrica_Abidjan /*name*/, @@ -97,9 +119,9 @@ const basic::ZoneInfo kZoneAfrica_Abidjan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Algiers // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAfrica_Algiers[] ACE_TIME_PROGMEM = { @@ -118,7 +140,7 @@ static const basic::ZoneEra kZoneEraAfrica_Algiers[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Algiers[] ACE_TIME_PROGMEM = "Africa/Algiers"; +static const char kZoneNameAfrica_Algiers[] ACE_TIME_PROGMEM = "\x01" "Algiers"; const basic::ZoneInfo kZoneAfrica_Algiers ACE_TIME_PROGMEM = { kZoneNameAfrica_Algiers /*name*/, @@ -131,9 +153,9 @@ const basic::ZoneInfo kZoneAfrica_Algiers ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Bissau // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAfrica_Bissau[] ACE_TIME_PROGMEM = { @@ -152,7 +174,7 @@ static const basic::ZoneEra kZoneEraAfrica_Bissau[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Bissau[] ACE_TIME_PROGMEM = "Africa/Bissau"; +static const char kZoneNameAfrica_Bissau[] ACE_TIME_PROGMEM = "\x01" "Bissau"; const basic::ZoneInfo kZoneAfrica_Bissau ACE_TIME_PROGMEM = { kZoneNameAfrica_Bissau /*name*/, @@ -165,9 +187,9 @@ const basic::ZoneInfo kZoneAfrica_Bissau ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Ceuta // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAfrica_Ceuta[] ACE_TIME_PROGMEM = { @@ -186,7 +208,7 @@ static const basic::ZoneEra kZoneEraAfrica_Ceuta[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Ceuta[] ACE_TIME_PROGMEM = "Africa/Ceuta"; +static const char kZoneNameAfrica_Ceuta[] ACE_TIME_PROGMEM = "\x01" "Ceuta"; const basic::ZoneInfo kZoneAfrica_Ceuta ACE_TIME_PROGMEM = { kZoneNameAfrica_Ceuta /*name*/, @@ -199,9 +221,9 @@ const basic::ZoneInfo kZoneAfrica_Ceuta ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Johannesburg // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 19 (originally 25) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAfrica_Johannesburg[] ACE_TIME_PROGMEM = { @@ -220,7 +242,7 @@ static const basic::ZoneEra kZoneEraAfrica_Johannesburg[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Johannesburg[] ACE_TIME_PROGMEM = "Africa/Johannesburg"; +static const char kZoneNameAfrica_Johannesburg[] ACE_TIME_PROGMEM = "\x01" "Johannesburg"; const basic::ZoneInfo kZoneAfrica_Johannesburg ACE_TIME_PROGMEM = { kZoneNameAfrica_Johannesburg /*name*/, @@ -233,9 +255,9 @@ const basic::ZoneInfo kZoneAfrica_Johannesburg ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Lagos // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAfrica_Lagos[] ACE_TIME_PROGMEM = { @@ -254,7 +276,7 @@ static const basic::ZoneEra kZoneEraAfrica_Lagos[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Lagos[] ACE_TIME_PROGMEM = "Africa/Lagos"; +static const char kZoneNameAfrica_Lagos[] ACE_TIME_PROGMEM = "\x01" "Lagos"; const basic::ZoneInfo kZoneAfrica_Lagos ACE_TIME_PROGMEM = { kZoneNameAfrica_Lagos /*name*/, @@ -267,9 +289,9 @@ const basic::ZoneInfo kZoneAfrica_Lagos ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Maputo // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAfrica_Maputo[] ACE_TIME_PROGMEM = { @@ -288,7 +310,7 @@ static const basic::ZoneEra kZoneEraAfrica_Maputo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Maputo[] ACE_TIME_PROGMEM = "Africa/Maputo"; +static const char kZoneNameAfrica_Maputo[] ACE_TIME_PROGMEM = "\x01" "Maputo"; const basic::ZoneInfo kZoneAfrica_Maputo ACE_TIME_PROGMEM = { kZoneNameAfrica_Maputo /*name*/, @@ -301,9 +323,9 @@ const basic::ZoneInfo kZoneAfrica_Maputo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Monrovia // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 14 (originally 20) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAfrica_Monrovia[] ACE_TIME_PROGMEM = { @@ -322,7 +344,7 @@ static const basic::ZoneEra kZoneEraAfrica_Monrovia[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Monrovia[] ACE_TIME_PROGMEM = "Africa/Monrovia"; +static const char kZoneNameAfrica_Monrovia[] ACE_TIME_PROGMEM = "\x01" "Monrovia"; const basic::ZoneInfo kZoneAfrica_Monrovia ACE_TIME_PROGMEM = { kZoneNameAfrica_Monrovia /*name*/, @@ -335,9 +357,9 @@ const basic::ZoneInfo kZoneAfrica_Monrovia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Nairobi // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAfrica_Nairobi[] ACE_TIME_PROGMEM = { @@ -356,7 +378,7 @@ static const basic::ZoneEra kZoneEraAfrica_Nairobi[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Nairobi[] ACE_TIME_PROGMEM = "Africa/Nairobi"; +static const char kZoneNameAfrica_Nairobi[] ACE_TIME_PROGMEM = "\x01" "Nairobi"; const basic::ZoneInfo kZoneAfrica_Nairobi ACE_TIME_PROGMEM = { kZoneNameAfrica_Nairobi /*name*/, @@ -369,9 +391,9 @@ const basic::ZoneInfo kZoneAfrica_Nairobi ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Ndjamena // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 14 (originally 20) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAfrica_Ndjamena[] ACE_TIME_PROGMEM = { @@ -390,7 +412,7 @@ static const basic::ZoneEra kZoneEraAfrica_Ndjamena[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Ndjamena[] ACE_TIME_PROGMEM = "Africa/Ndjamena"; +static const char kZoneNameAfrica_Ndjamena[] ACE_TIME_PROGMEM = "\x01" "Ndjamena"; const basic::ZoneInfo kZoneAfrica_Ndjamena ACE_TIME_PROGMEM = { kZoneNameAfrica_Ndjamena /*name*/, @@ -403,9 +425,9 @@ const basic::ZoneInfo kZoneAfrica_Ndjamena ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Tunis // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAfrica_Tunis[] ACE_TIME_PROGMEM = { @@ -424,7 +446,7 @@ static const basic::ZoneEra kZoneEraAfrica_Tunis[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Tunis[] ACE_TIME_PROGMEM = "Africa/Tunis"; +static const char kZoneNameAfrica_Tunis[] ACE_TIME_PROGMEM = "\x01" "Tunis"; const basic::ZoneInfo kZoneAfrica_Tunis ACE_TIME_PROGMEM = { kZoneNameAfrica_Tunis /*name*/, @@ -437,9 +459,9 @@ const basic::ZoneInfo kZoneAfrica_Tunis ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Adak // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 32 +// Memory (32-bit): 46 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Adak[] ACE_TIME_PROGMEM = { @@ -458,7 +480,7 @@ static const basic::ZoneEra kZoneEraAmerica_Adak[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Adak[] ACE_TIME_PROGMEM = "America/Adak"; +static const char kZoneNameAmerica_Adak[] ACE_TIME_PROGMEM = "\x02" "Adak"; const basic::ZoneInfo kZoneAmerica_Adak ACE_TIME_PROGMEM = { kZoneNameAmerica_Adak /*name*/, @@ -471,9 +493,9 @@ const basic::ZoneInfo kZoneAmerica_Adak ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Anchorage // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Anchorage[] ACE_TIME_PROGMEM = { @@ -492,7 +514,7 @@ static const basic::ZoneEra kZoneEraAmerica_Anchorage[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Anchorage[] ACE_TIME_PROGMEM = "America/Anchorage"; +static const char kZoneNameAmerica_Anchorage[] ACE_TIME_PROGMEM = "\x02" "Anchorage"; const basic::ZoneInfo kZoneAmerica_Anchorage ACE_TIME_PROGMEM = { kZoneNameAmerica_Anchorage /*name*/, @@ -505,9 +527,9 @@ const basic::ZoneInfo kZoneAmerica_Anchorage ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Asuncion // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Asuncion[] ACE_TIME_PROGMEM = { @@ -526,7 +548,7 @@ static const basic::ZoneEra kZoneEraAmerica_Asuncion[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Asuncion[] ACE_TIME_PROGMEM = "America/Asuncion"; +static const char kZoneNameAmerica_Asuncion[] ACE_TIME_PROGMEM = "\x02" "Asuncion"; const basic::ZoneInfo kZoneAmerica_Asuncion ACE_TIME_PROGMEM = { kZoneNameAmerica_Asuncion /*name*/, @@ -539,9 +561,9 @@ const basic::ZoneInfo kZoneAmerica_Asuncion ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Atikokan // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Atikokan[] ACE_TIME_PROGMEM = { @@ -560,7 +582,7 @@ static const basic::ZoneEra kZoneEraAmerica_Atikokan[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Atikokan[] ACE_TIME_PROGMEM = "America/Atikokan"; +static const char kZoneNameAmerica_Atikokan[] ACE_TIME_PROGMEM = "\x02" "Atikokan"; const basic::ZoneInfo kZoneAmerica_Atikokan ACE_TIME_PROGMEM = { kZoneNameAmerica_Atikokan /*name*/, @@ -573,9 +595,9 @@ const basic::ZoneInfo kZoneAmerica_Atikokan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Barbados // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Barbados[] ACE_TIME_PROGMEM = { @@ -594,7 +616,7 @@ static const basic::ZoneEra kZoneEraAmerica_Barbados[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Barbados[] ACE_TIME_PROGMEM = "America/Barbados"; +static const char kZoneNameAmerica_Barbados[] ACE_TIME_PROGMEM = "\x02" "Barbados"; const basic::ZoneInfo kZoneAmerica_Barbados ACE_TIME_PROGMEM = { kZoneNameAmerica_Barbados /*name*/, @@ -607,9 +629,9 @@ const basic::ZoneInfo kZoneAmerica_Barbados ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Belem // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Belem[] ACE_TIME_PROGMEM = { @@ -628,7 +650,7 @@ static const basic::ZoneEra kZoneEraAmerica_Belem[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Belem[] ACE_TIME_PROGMEM = "America/Belem"; +static const char kZoneNameAmerica_Belem[] ACE_TIME_PROGMEM = "\x02" "Belem"; const basic::ZoneInfo kZoneAmerica_Belem ACE_TIME_PROGMEM = { kZoneNameAmerica_Belem /*name*/, @@ -641,9 +663,9 @@ const basic::ZoneInfo kZoneAmerica_Belem ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Blanc-Sablon // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Blanc_Sablon[] ACE_TIME_PROGMEM = { @@ -662,7 +684,7 @@ static const basic::ZoneEra kZoneEraAmerica_Blanc_Sablon[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Blanc_Sablon[] ACE_TIME_PROGMEM = "America/Blanc-Sablon"; +static const char kZoneNameAmerica_Blanc_Sablon[] ACE_TIME_PROGMEM = "\x02" "Blanc-Sablon"; const basic::ZoneInfo kZoneAmerica_Blanc_Sablon ACE_TIME_PROGMEM = { kZoneNameAmerica_Blanc_Sablon /*name*/, @@ -675,9 +697,9 @@ const basic::ZoneInfo kZoneAmerica_Blanc_Sablon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Bogota // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Bogota[] ACE_TIME_PROGMEM = { @@ -696,7 +718,7 @@ static const basic::ZoneEra kZoneEraAmerica_Bogota[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Bogota[] ACE_TIME_PROGMEM = "America/Bogota"; +static const char kZoneNameAmerica_Bogota[] ACE_TIME_PROGMEM = "\x02" "Bogota"; const basic::ZoneInfo kZoneAmerica_Bogota ACE_TIME_PROGMEM = { kZoneNameAmerica_Bogota /*name*/, @@ -709,9 +731,9 @@ const basic::ZoneInfo kZoneAmerica_Bogota ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Boise // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Boise[] ACE_TIME_PROGMEM = { @@ -730,7 +752,7 @@ static const basic::ZoneEra kZoneEraAmerica_Boise[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Boise[] ACE_TIME_PROGMEM = "America/Boise"; +static const char kZoneNameAmerica_Boise[] ACE_TIME_PROGMEM = "\x02" "Boise"; const basic::ZoneInfo kZoneAmerica_Boise ACE_TIME_PROGMEM = { kZoneNameAmerica_Boise /*name*/, @@ -743,9 +765,9 @@ const basic::ZoneInfo kZoneAmerica_Boise ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Campo_Grande // Zone Eras: 1 -// Strings (bytes): 29 -// Memory (8-bit): 51 -// Memory (32-bit): 65 +// Strings (bytes): 22 (originally 29) +// Memory (8-bit): 44 +// Memory (32-bit): 58 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Campo_Grande[] ACE_TIME_PROGMEM = { @@ -764,7 +786,7 @@ static const basic::ZoneEra kZoneEraAmerica_Campo_Grande[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Campo_Grande[] ACE_TIME_PROGMEM = "America/Campo_Grande"; +static const char kZoneNameAmerica_Campo_Grande[] ACE_TIME_PROGMEM = "\x02" "Campo_Grande"; const basic::ZoneInfo kZoneAmerica_Campo_Grande ACE_TIME_PROGMEM = { kZoneNameAmerica_Campo_Grande /*name*/, @@ -777,9 +799,9 @@ const basic::ZoneInfo kZoneAmerica_Campo_Grande ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Cayenne // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Cayenne[] ACE_TIME_PROGMEM = { @@ -798,7 +820,7 @@ static const basic::ZoneEra kZoneEraAmerica_Cayenne[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Cayenne[] ACE_TIME_PROGMEM = "America/Cayenne"; +static const char kZoneNameAmerica_Cayenne[] ACE_TIME_PROGMEM = "\x02" "Cayenne"; const basic::ZoneInfo kZoneAmerica_Cayenne ACE_TIME_PROGMEM = { kZoneNameAmerica_Cayenne /*name*/, @@ -811,9 +833,9 @@ const basic::ZoneInfo kZoneAmerica_Cayenne ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Chicago // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Chicago[] ACE_TIME_PROGMEM = { @@ -832,7 +854,7 @@ static const basic::ZoneEra kZoneEraAmerica_Chicago[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Chicago[] ACE_TIME_PROGMEM = "America/Chicago"; +static const char kZoneNameAmerica_Chicago[] ACE_TIME_PROGMEM = "\x02" "Chicago"; const basic::ZoneInfo kZoneAmerica_Chicago ACE_TIME_PROGMEM = { kZoneNameAmerica_Chicago /*name*/, @@ -845,9 +867,9 @@ const basic::ZoneInfo kZoneAmerica_Chicago ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Chihuahua // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Chihuahua[] ACE_TIME_PROGMEM = { @@ -866,7 +888,7 @@ static const basic::ZoneEra kZoneEraAmerica_Chihuahua[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Chihuahua[] ACE_TIME_PROGMEM = "America/Chihuahua"; +static const char kZoneNameAmerica_Chihuahua[] ACE_TIME_PROGMEM = "\x02" "Chihuahua"; const basic::ZoneInfo kZoneAmerica_Chihuahua ACE_TIME_PROGMEM = { kZoneNameAmerica_Chihuahua /*name*/, @@ -879,9 +901,9 @@ const basic::ZoneInfo kZoneAmerica_Chihuahua ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Costa_Rica // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Costa_Rica[] ACE_TIME_PROGMEM = { @@ -900,7 +922,7 @@ static const basic::ZoneEra kZoneEraAmerica_Costa_Rica[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Costa_Rica[] ACE_TIME_PROGMEM = "America/Costa_Rica"; +static const char kZoneNameAmerica_Costa_Rica[] ACE_TIME_PROGMEM = "\x02" "Costa_Rica"; const basic::ZoneInfo kZoneAmerica_Costa_Rica ACE_TIME_PROGMEM = { kZoneNameAmerica_Costa_Rica /*name*/, @@ -913,9 +935,9 @@ const basic::ZoneInfo kZoneAmerica_Costa_Rica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Creston // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Creston[] ACE_TIME_PROGMEM = { @@ -934,7 +956,7 @@ static const basic::ZoneEra kZoneEraAmerica_Creston[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Creston[] ACE_TIME_PROGMEM = "America/Creston"; +static const char kZoneNameAmerica_Creston[] ACE_TIME_PROGMEM = "\x02" "Creston"; const basic::ZoneInfo kZoneAmerica_Creston ACE_TIME_PROGMEM = { kZoneNameAmerica_Creston /*name*/, @@ -947,9 +969,9 @@ const basic::ZoneInfo kZoneAmerica_Creston ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Curacao // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Curacao[] ACE_TIME_PROGMEM = { @@ -968,7 +990,7 @@ static const basic::ZoneEra kZoneEraAmerica_Curacao[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Curacao[] ACE_TIME_PROGMEM = "America/Curacao"; +static const char kZoneNameAmerica_Curacao[] ACE_TIME_PROGMEM = "\x02" "Curacao"; const basic::ZoneInfo kZoneAmerica_Curacao ACE_TIME_PROGMEM = { kZoneNameAmerica_Curacao /*name*/, @@ -981,9 +1003,9 @@ const basic::ZoneInfo kZoneAmerica_Curacao ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Danmarkshavn // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Danmarkshavn[] ACE_TIME_PROGMEM = { @@ -1002,7 +1024,7 @@ static const basic::ZoneEra kZoneEraAmerica_Danmarkshavn[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Danmarkshavn[] ACE_TIME_PROGMEM = "America/Danmarkshavn"; +static const char kZoneNameAmerica_Danmarkshavn[] ACE_TIME_PROGMEM = "\x02" "Danmarkshavn"; const basic::ZoneInfo kZoneAmerica_Danmarkshavn ACE_TIME_PROGMEM = { kZoneNameAmerica_Danmarkshavn /*name*/, @@ -1015,9 +1037,9 @@ const basic::ZoneInfo kZoneAmerica_Danmarkshavn ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Dawson_Creek // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Dawson_Creek[] ACE_TIME_PROGMEM = { @@ -1036,7 +1058,7 @@ static const basic::ZoneEra kZoneEraAmerica_Dawson_Creek[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Dawson_Creek[] ACE_TIME_PROGMEM = "America/Dawson_Creek"; +static const char kZoneNameAmerica_Dawson_Creek[] ACE_TIME_PROGMEM = "\x02" "Dawson_Creek"; const basic::ZoneInfo kZoneAmerica_Dawson_Creek ACE_TIME_PROGMEM = { kZoneNameAmerica_Dawson_Creek /*name*/, @@ -1049,9 +1071,9 @@ const basic::ZoneInfo kZoneAmerica_Dawson_Creek ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Denver // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Denver[] ACE_TIME_PROGMEM = { @@ -1070,7 +1092,7 @@ static const basic::ZoneEra kZoneEraAmerica_Denver[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Denver[] ACE_TIME_PROGMEM = "America/Denver"; +static const char kZoneNameAmerica_Denver[] ACE_TIME_PROGMEM = "\x02" "Denver"; const basic::ZoneInfo kZoneAmerica_Denver ACE_TIME_PROGMEM = { kZoneNameAmerica_Denver /*name*/, @@ -1083,9 +1105,9 @@ const basic::ZoneInfo kZoneAmerica_Denver ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Detroit // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Detroit[] ACE_TIME_PROGMEM = { @@ -1104,7 +1126,7 @@ static const basic::ZoneEra kZoneEraAmerica_Detroit[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Detroit[] ACE_TIME_PROGMEM = "America/Detroit"; +static const char kZoneNameAmerica_Detroit[] ACE_TIME_PROGMEM = "\x02" "Detroit"; const basic::ZoneInfo kZoneAmerica_Detroit ACE_TIME_PROGMEM = { kZoneNameAmerica_Detroit /*name*/, @@ -1117,9 +1139,9 @@ const basic::ZoneInfo kZoneAmerica_Detroit ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Edmonton // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Edmonton[] ACE_TIME_PROGMEM = { @@ -1138,7 +1160,7 @@ static const basic::ZoneEra kZoneEraAmerica_Edmonton[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Edmonton[] ACE_TIME_PROGMEM = "America/Edmonton"; +static const char kZoneNameAmerica_Edmonton[] ACE_TIME_PROGMEM = "\x02" "Edmonton"; const basic::ZoneInfo kZoneAmerica_Edmonton ACE_TIME_PROGMEM = { kZoneNameAmerica_Edmonton /*name*/, @@ -1151,9 +1173,9 @@ const basic::ZoneInfo kZoneAmerica_Edmonton ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/El_Salvador // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_El_Salvador[] ACE_TIME_PROGMEM = { @@ -1172,7 +1194,7 @@ static const basic::ZoneEra kZoneEraAmerica_El_Salvador[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_El_Salvador[] ACE_TIME_PROGMEM = "America/El_Salvador"; +static const char kZoneNameAmerica_El_Salvador[] ACE_TIME_PROGMEM = "\x02" "El_Salvador"; const basic::ZoneInfo kZoneAmerica_El_Salvador ACE_TIME_PROGMEM = { kZoneNameAmerica_El_Salvador /*name*/, @@ -1185,9 +1207,9 @@ const basic::ZoneInfo kZoneAmerica_El_Salvador ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Glace_Bay // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Glace_Bay[] ACE_TIME_PROGMEM = { @@ -1206,7 +1228,7 @@ static const basic::ZoneEra kZoneEraAmerica_Glace_Bay[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Glace_Bay[] ACE_TIME_PROGMEM = "America/Glace_Bay"; +static const char kZoneNameAmerica_Glace_Bay[] ACE_TIME_PROGMEM = "\x02" "Glace_Bay"; const basic::ZoneInfo kZoneAmerica_Glace_Bay ACE_TIME_PROGMEM = { kZoneNameAmerica_Glace_Bay /*name*/, @@ -1219,9 +1241,9 @@ const basic::ZoneInfo kZoneAmerica_Glace_Bay ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Guatemala // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Guatemala[] ACE_TIME_PROGMEM = { @@ -1240,7 +1262,7 @@ static const basic::ZoneEra kZoneEraAmerica_Guatemala[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Guatemala[] ACE_TIME_PROGMEM = "America/Guatemala"; +static const char kZoneNameAmerica_Guatemala[] ACE_TIME_PROGMEM = "\x02" "Guatemala"; const basic::ZoneInfo kZoneAmerica_Guatemala ACE_TIME_PROGMEM = { kZoneNameAmerica_Guatemala /*name*/, @@ -1253,9 +1275,9 @@ const basic::ZoneInfo kZoneAmerica_Guatemala ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Guayaquil // Zone Eras: 1 -// Strings (bytes): 26 -// Memory (8-bit): 48 -// Memory (32-bit): 62 +// Strings (bytes): 19 (originally 26) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Guayaquil[] ACE_TIME_PROGMEM = { @@ -1274,7 +1296,7 @@ static const basic::ZoneEra kZoneEraAmerica_Guayaquil[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Guayaquil[] ACE_TIME_PROGMEM = "America/Guayaquil"; +static const char kZoneNameAmerica_Guayaquil[] ACE_TIME_PROGMEM = "\x02" "Guayaquil"; const basic::ZoneInfo kZoneAmerica_Guayaquil ACE_TIME_PROGMEM = { kZoneNameAmerica_Guayaquil /*name*/, @@ -1287,9 +1309,9 @@ const basic::ZoneInfo kZoneAmerica_Guayaquil ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Guyana // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Guyana[] ACE_TIME_PROGMEM = { @@ -1308,7 +1330,7 @@ static const basic::ZoneEra kZoneEraAmerica_Guyana[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Guyana[] ACE_TIME_PROGMEM = "America/Guyana"; +static const char kZoneNameAmerica_Guyana[] ACE_TIME_PROGMEM = "\x02" "Guyana"; const basic::ZoneInfo kZoneAmerica_Guyana ACE_TIME_PROGMEM = { kZoneNameAmerica_Guyana /*name*/, @@ -1321,9 +1343,9 @@ const basic::ZoneInfo kZoneAmerica_Guyana ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Halifax // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Halifax[] ACE_TIME_PROGMEM = { @@ -1342,7 +1364,7 @@ static const basic::ZoneEra kZoneEraAmerica_Halifax[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Halifax[] ACE_TIME_PROGMEM = "America/Halifax"; +static const char kZoneNameAmerica_Halifax[] ACE_TIME_PROGMEM = "\x02" "Halifax"; const basic::ZoneInfo kZoneAmerica_Halifax ACE_TIME_PROGMEM = { kZoneNameAmerica_Halifax /*name*/, @@ -1355,9 +1377,9 @@ const basic::ZoneInfo kZoneAmerica_Halifax ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Havana // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Havana[] ACE_TIME_PROGMEM = { @@ -1376,7 +1398,7 @@ static const basic::ZoneEra kZoneEraAmerica_Havana[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Havana[] ACE_TIME_PROGMEM = "America/Havana"; +static const char kZoneNameAmerica_Havana[] ACE_TIME_PROGMEM = "\x02" "Havana"; const basic::ZoneInfo kZoneAmerica_Havana ACE_TIME_PROGMEM = { kZoneNameAmerica_Havana /*name*/, @@ -1389,9 +1411,9 @@ const basic::ZoneInfo kZoneAmerica_Havana ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Hermosillo // Zone Eras: 2 -// Strings (bytes): 27 -// Memory (8-bit): 60 -// Memory (32-bit): 79 +// Strings (bytes): 20 (originally 27) +// Memory (8-bit): 53 +// Memory (32-bit): 72 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Hermosillo[] ACE_TIME_PROGMEM = { @@ -1422,7 +1444,7 @@ static const basic::ZoneEra kZoneEraAmerica_Hermosillo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Hermosillo[] ACE_TIME_PROGMEM = "America/Hermosillo"; +static const char kZoneNameAmerica_Hermosillo[] ACE_TIME_PROGMEM = "\x02" "Hermosillo"; const basic::ZoneInfo kZoneAmerica_Hermosillo ACE_TIME_PROGMEM = { kZoneNameAmerica_Hermosillo /*name*/, @@ -1435,9 +1457,9 @@ const basic::ZoneInfo kZoneAmerica_Hermosillo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Indiana/Indianapolis // Zone Eras: 2 -// Strings (bytes): 37 -// Memory (8-bit): 70 -// Memory (32-bit): 89 +// Strings (bytes): 30 (originally 37) +// Memory (8-bit): 63 +// Memory (32-bit): 82 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Indiana_Indianapolis[] ACE_TIME_PROGMEM = { @@ -1468,7 +1490,7 @@ static const basic::ZoneEra kZoneEraAmerica_Indiana_Indianapolis[] ACE_TIME_PROG }; -static const char kZoneNameAmerica_Indiana_Indianapolis[] ACE_TIME_PROGMEM = "America/Indiana/Indianapolis"; +static const char kZoneNameAmerica_Indiana_Indianapolis[] ACE_TIME_PROGMEM = "\x02" "Indiana/Indianapolis"; const basic::ZoneInfo kZoneAmerica_Indiana_Indianapolis ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Indianapolis /*name*/, @@ -1481,9 +1503,9 @@ const basic::ZoneInfo kZoneAmerica_Indiana_Indianapolis ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Indiana/Marengo // Zone Eras: 2 -// Strings (bytes): 32 -// Memory (8-bit): 65 -// Memory (32-bit): 84 +// Strings (bytes): 25 (originally 32) +// Memory (8-bit): 58 +// Memory (32-bit): 77 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Indiana_Marengo[] ACE_TIME_PROGMEM = { @@ -1514,7 +1536,7 @@ static const basic::ZoneEra kZoneEraAmerica_Indiana_Marengo[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Indiana_Marengo[] ACE_TIME_PROGMEM = "America/Indiana/Marengo"; +static const char kZoneNameAmerica_Indiana_Marengo[] ACE_TIME_PROGMEM = "\x02" "Indiana/Marengo"; const basic::ZoneInfo kZoneAmerica_Indiana_Marengo ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Marengo /*name*/, @@ -1527,9 +1549,9 @@ const basic::ZoneInfo kZoneAmerica_Indiana_Marengo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Indiana/Vevay // Zone Eras: 2 -// Strings (bytes): 30 -// Memory (8-bit): 63 -// Memory (32-bit): 82 +// Strings (bytes): 23 (originally 30) +// Memory (8-bit): 56 +// Memory (32-bit): 75 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Indiana_Vevay[] ACE_TIME_PROGMEM = { @@ -1560,7 +1582,7 @@ static const basic::ZoneEra kZoneEraAmerica_Indiana_Vevay[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Indiana_Vevay[] ACE_TIME_PROGMEM = "America/Indiana/Vevay"; +static const char kZoneNameAmerica_Indiana_Vevay[] ACE_TIME_PROGMEM = "\x02" "Indiana/Vevay"; const basic::ZoneInfo kZoneAmerica_Indiana_Vevay ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Vevay /*name*/, @@ -1573,9 +1595,9 @@ const basic::ZoneInfo kZoneAmerica_Indiana_Vevay ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Inuvik // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Inuvik[] ACE_TIME_PROGMEM = { @@ -1594,7 +1616,7 @@ static const basic::ZoneEra kZoneEraAmerica_Inuvik[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Inuvik[] ACE_TIME_PROGMEM = "America/Inuvik"; +static const char kZoneNameAmerica_Inuvik[] ACE_TIME_PROGMEM = "\x02" "Inuvik"; const basic::ZoneInfo kZoneAmerica_Inuvik ACE_TIME_PROGMEM = { kZoneNameAmerica_Inuvik /*name*/, @@ -1607,9 +1629,9 @@ const basic::ZoneInfo kZoneAmerica_Inuvik ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Jamaica // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Jamaica[] ACE_TIME_PROGMEM = { @@ -1628,7 +1650,7 @@ static const basic::ZoneEra kZoneEraAmerica_Jamaica[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Jamaica[] ACE_TIME_PROGMEM = "America/Jamaica"; +static const char kZoneNameAmerica_Jamaica[] ACE_TIME_PROGMEM = "\x02" "Jamaica"; const basic::ZoneInfo kZoneAmerica_Jamaica ACE_TIME_PROGMEM = { kZoneNameAmerica_Jamaica /*name*/, @@ -1641,9 +1663,9 @@ const basic::ZoneInfo kZoneAmerica_Jamaica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Juneau // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Juneau[] ACE_TIME_PROGMEM = { @@ -1662,7 +1684,7 @@ static const basic::ZoneEra kZoneEraAmerica_Juneau[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Juneau[] ACE_TIME_PROGMEM = "America/Juneau"; +static const char kZoneNameAmerica_Juneau[] ACE_TIME_PROGMEM = "\x02" "Juneau"; const basic::ZoneInfo kZoneAmerica_Juneau ACE_TIME_PROGMEM = { kZoneNameAmerica_Juneau /*name*/, @@ -1675,9 +1697,9 @@ const basic::ZoneInfo kZoneAmerica_Juneau ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Kentucky/Louisville // Zone Eras: 1 -// Strings (bytes): 32 -// Memory (8-bit): 54 -// Memory (32-bit): 68 +// Strings (bytes): 25 (originally 32) +// Memory (8-bit): 47 +// Memory (32-bit): 61 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Kentucky_Louisville[] ACE_TIME_PROGMEM = { @@ -1696,7 +1718,7 @@ static const basic::ZoneEra kZoneEraAmerica_Kentucky_Louisville[] ACE_TIME_PROGM }; -static const char kZoneNameAmerica_Kentucky_Louisville[] ACE_TIME_PROGMEM = "America/Kentucky/Louisville"; +static const char kZoneNameAmerica_Kentucky_Louisville[] ACE_TIME_PROGMEM = "\x02" "Kentucky/Louisville"; const basic::ZoneInfo kZoneAmerica_Kentucky_Louisville ACE_TIME_PROGMEM = { kZoneNameAmerica_Kentucky_Louisville /*name*/, @@ -1709,9 +1731,9 @@ const basic::ZoneInfo kZoneAmerica_Kentucky_Louisville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/La_Paz // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_La_Paz[] ACE_TIME_PROGMEM = { @@ -1730,7 +1752,7 @@ static const basic::ZoneEra kZoneEraAmerica_La_Paz[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_La_Paz[] ACE_TIME_PROGMEM = "America/La_Paz"; +static const char kZoneNameAmerica_La_Paz[] ACE_TIME_PROGMEM = "\x02" "La_Paz"; const basic::ZoneInfo kZoneAmerica_La_Paz ACE_TIME_PROGMEM = { kZoneNameAmerica_La_Paz /*name*/, @@ -1743,9 +1765,9 @@ const basic::ZoneInfo kZoneAmerica_La_Paz ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Lima // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Lima[] ACE_TIME_PROGMEM = { @@ -1764,7 +1786,7 @@ static const basic::ZoneEra kZoneEraAmerica_Lima[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Lima[] ACE_TIME_PROGMEM = "America/Lima"; +static const char kZoneNameAmerica_Lima[] ACE_TIME_PROGMEM = "\x02" "Lima"; const basic::ZoneInfo kZoneAmerica_Lima ACE_TIME_PROGMEM = { kZoneNameAmerica_Lima /*name*/, @@ -1777,9 +1799,9 @@ const basic::ZoneInfo kZoneAmerica_Lima ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Los_Angeles // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Los_Angeles[] ACE_TIME_PROGMEM = { @@ -1798,7 +1820,7 @@ static const basic::ZoneEra kZoneEraAmerica_Los_Angeles[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Los_Angeles[] ACE_TIME_PROGMEM = "America/Los_Angeles"; +static const char kZoneNameAmerica_Los_Angeles[] ACE_TIME_PROGMEM = "\x02" "Los_Angeles"; const basic::ZoneInfo kZoneAmerica_Los_Angeles ACE_TIME_PROGMEM = { kZoneNameAmerica_Los_Angeles /*name*/, @@ -1811,9 +1833,9 @@ const basic::ZoneInfo kZoneAmerica_Los_Angeles ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Managua // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Managua[] ACE_TIME_PROGMEM = { @@ -1832,7 +1854,7 @@ static const basic::ZoneEra kZoneEraAmerica_Managua[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Managua[] ACE_TIME_PROGMEM = "America/Managua"; +static const char kZoneNameAmerica_Managua[] ACE_TIME_PROGMEM = "\x02" "Managua"; const basic::ZoneInfo kZoneAmerica_Managua ACE_TIME_PROGMEM = { kZoneNameAmerica_Managua /*name*/, @@ -1845,9 +1867,9 @@ const basic::ZoneInfo kZoneAmerica_Managua ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Manaus // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Manaus[] ACE_TIME_PROGMEM = { @@ -1866,7 +1888,7 @@ static const basic::ZoneEra kZoneEraAmerica_Manaus[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Manaus[] ACE_TIME_PROGMEM = "America/Manaus"; +static const char kZoneNameAmerica_Manaus[] ACE_TIME_PROGMEM = "\x02" "Manaus"; const basic::ZoneInfo kZoneAmerica_Manaus ACE_TIME_PROGMEM = { kZoneNameAmerica_Manaus /*name*/, @@ -1879,9 +1901,9 @@ const basic::ZoneInfo kZoneAmerica_Manaus ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Martinique // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Martinique[] ACE_TIME_PROGMEM = { @@ -1900,7 +1922,7 @@ static const basic::ZoneEra kZoneEraAmerica_Martinique[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Martinique[] ACE_TIME_PROGMEM = "America/Martinique"; +static const char kZoneNameAmerica_Martinique[] ACE_TIME_PROGMEM = "\x02" "Martinique"; const basic::ZoneInfo kZoneAmerica_Martinique ACE_TIME_PROGMEM = { kZoneNameAmerica_Martinique /*name*/, @@ -1913,9 +1935,9 @@ const basic::ZoneInfo kZoneAmerica_Martinique ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Matamoros // Zone Eras: 2 -// Strings (bytes): 26 -// Memory (8-bit): 59 -// Memory (32-bit): 78 +// Strings (bytes): 19 (originally 26) +// Memory (8-bit): 52 +// Memory (32-bit): 71 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Matamoros[] ACE_TIME_PROGMEM = { @@ -1946,7 +1968,7 @@ static const basic::ZoneEra kZoneEraAmerica_Matamoros[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Matamoros[] ACE_TIME_PROGMEM = "America/Matamoros"; +static const char kZoneNameAmerica_Matamoros[] ACE_TIME_PROGMEM = "\x02" "Matamoros"; const basic::ZoneInfo kZoneAmerica_Matamoros ACE_TIME_PROGMEM = { kZoneNameAmerica_Matamoros /*name*/, @@ -1959,9 +1981,9 @@ const basic::ZoneInfo kZoneAmerica_Matamoros ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Mazatlan // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Mazatlan[] ACE_TIME_PROGMEM = { @@ -1980,7 +2002,7 @@ static const basic::ZoneEra kZoneEraAmerica_Mazatlan[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Mazatlan[] ACE_TIME_PROGMEM = "America/Mazatlan"; +static const char kZoneNameAmerica_Mazatlan[] ACE_TIME_PROGMEM = "\x02" "Mazatlan"; const basic::ZoneInfo kZoneAmerica_Mazatlan ACE_TIME_PROGMEM = { kZoneNameAmerica_Mazatlan /*name*/, @@ -1993,9 +2015,9 @@ const basic::ZoneInfo kZoneAmerica_Mazatlan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Menominee // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Menominee[] ACE_TIME_PROGMEM = { @@ -2014,7 +2036,7 @@ static const basic::ZoneEra kZoneEraAmerica_Menominee[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Menominee[] ACE_TIME_PROGMEM = "America/Menominee"; +static const char kZoneNameAmerica_Menominee[] ACE_TIME_PROGMEM = "\x02" "Menominee"; const basic::ZoneInfo kZoneAmerica_Menominee ACE_TIME_PROGMEM = { kZoneNameAmerica_Menominee /*name*/, @@ -2027,9 +2049,9 @@ const basic::ZoneInfo kZoneAmerica_Menominee ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Merida // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Merida[] ACE_TIME_PROGMEM = { @@ -2048,7 +2070,7 @@ static const basic::ZoneEra kZoneEraAmerica_Merida[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Merida[] ACE_TIME_PROGMEM = "America/Merida"; +static const char kZoneNameAmerica_Merida[] ACE_TIME_PROGMEM = "\x02" "Merida"; const basic::ZoneInfo kZoneAmerica_Merida ACE_TIME_PROGMEM = { kZoneNameAmerica_Merida /*name*/, @@ -2061,9 +2083,9 @@ const basic::ZoneInfo kZoneAmerica_Merida ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Miquelon // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Miquelon[] ACE_TIME_PROGMEM = { @@ -2082,7 +2104,7 @@ static const basic::ZoneEra kZoneEraAmerica_Miquelon[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Miquelon[] ACE_TIME_PROGMEM = "America/Miquelon"; +static const char kZoneNameAmerica_Miquelon[] ACE_TIME_PROGMEM = "\x02" "Miquelon"; const basic::ZoneInfo kZoneAmerica_Miquelon ACE_TIME_PROGMEM = { kZoneNameAmerica_Miquelon /*name*/, @@ -2095,9 +2117,9 @@ const basic::ZoneInfo kZoneAmerica_Miquelon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Moncton // Zone Eras: 2 -// Strings (bytes): 24 -// Memory (8-bit): 57 -// Memory (32-bit): 76 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 50 +// Memory (32-bit): 69 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Moncton[] ACE_TIME_PROGMEM = { @@ -2128,7 +2150,7 @@ static const basic::ZoneEra kZoneEraAmerica_Moncton[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Moncton[] ACE_TIME_PROGMEM = "America/Moncton"; +static const char kZoneNameAmerica_Moncton[] ACE_TIME_PROGMEM = "\x02" "Moncton"; const basic::ZoneInfo kZoneAmerica_Moncton ACE_TIME_PROGMEM = { kZoneNameAmerica_Moncton /*name*/, @@ -2141,9 +2163,9 @@ const basic::ZoneInfo kZoneAmerica_Moncton ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Monterrey // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Monterrey[] ACE_TIME_PROGMEM = { @@ -2162,7 +2184,7 @@ static const basic::ZoneEra kZoneEraAmerica_Monterrey[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Monterrey[] ACE_TIME_PROGMEM = "America/Monterrey"; +static const char kZoneNameAmerica_Monterrey[] ACE_TIME_PROGMEM = "\x02" "Monterrey"; const basic::ZoneInfo kZoneAmerica_Monterrey ACE_TIME_PROGMEM = { kZoneNameAmerica_Monterrey /*name*/, @@ -2175,9 +2197,9 @@ const basic::ZoneInfo kZoneAmerica_Monterrey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Montevideo // Zone Eras: 1 -// Strings (bytes): 27 -// Memory (8-bit): 49 -// Memory (32-bit): 63 +// Strings (bytes): 20 (originally 27) +// Memory (8-bit): 42 +// Memory (32-bit): 56 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Montevideo[] ACE_TIME_PROGMEM = { @@ -2196,7 +2218,7 @@ static const basic::ZoneEra kZoneEraAmerica_Montevideo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Montevideo[] ACE_TIME_PROGMEM = "America/Montevideo"; +static const char kZoneNameAmerica_Montevideo[] ACE_TIME_PROGMEM = "\x02" "Montevideo"; const basic::ZoneInfo kZoneAmerica_Montevideo ACE_TIME_PROGMEM = { kZoneNameAmerica_Montevideo /*name*/, @@ -2209,9 +2231,9 @@ const basic::ZoneInfo kZoneAmerica_Montevideo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Nassau // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Nassau[] ACE_TIME_PROGMEM = { @@ -2230,7 +2252,7 @@ static const basic::ZoneEra kZoneEraAmerica_Nassau[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Nassau[] ACE_TIME_PROGMEM = "America/Nassau"; +static const char kZoneNameAmerica_Nassau[] ACE_TIME_PROGMEM = "\x02" "Nassau"; const basic::ZoneInfo kZoneAmerica_Nassau ACE_TIME_PROGMEM = { kZoneNameAmerica_Nassau /*name*/, @@ -2243,9 +2265,9 @@ const basic::ZoneInfo kZoneAmerica_Nassau ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/New_York // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_New_York[] ACE_TIME_PROGMEM = { @@ -2264,7 +2286,7 @@ static const basic::ZoneEra kZoneEraAmerica_New_York[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_New_York[] ACE_TIME_PROGMEM = "America/New_York"; +static const char kZoneNameAmerica_New_York[] ACE_TIME_PROGMEM = "\x02" "New_York"; const basic::ZoneInfo kZoneAmerica_New_York ACE_TIME_PROGMEM = { kZoneNameAmerica_New_York /*name*/, @@ -2277,9 +2299,9 @@ const basic::ZoneInfo kZoneAmerica_New_York ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Nipigon // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Nipigon[] ACE_TIME_PROGMEM = { @@ -2298,7 +2320,7 @@ static const basic::ZoneEra kZoneEraAmerica_Nipigon[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Nipigon[] ACE_TIME_PROGMEM = "America/Nipigon"; +static const char kZoneNameAmerica_Nipigon[] ACE_TIME_PROGMEM = "\x02" "Nipigon"; const basic::ZoneInfo kZoneAmerica_Nipigon ACE_TIME_PROGMEM = { kZoneNameAmerica_Nipigon /*name*/, @@ -2311,9 +2333,9 @@ const basic::ZoneInfo kZoneAmerica_Nipigon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Nome // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Nome[] ACE_TIME_PROGMEM = { @@ -2332,7 +2354,7 @@ static const basic::ZoneEra kZoneEraAmerica_Nome[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Nome[] ACE_TIME_PROGMEM = "America/Nome"; +static const char kZoneNameAmerica_Nome[] ACE_TIME_PROGMEM = "\x02" "Nome"; const basic::ZoneInfo kZoneAmerica_Nome ACE_TIME_PROGMEM = { kZoneNameAmerica_Nome /*name*/, @@ -2345,9 +2367,9 @@ const basic::ZoneInfo kZoneAmerica_Nome ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/North_Dakota/Center // Zone Eras: 1 -// Strings (bytes): 32 -// Memory (8-bit): 54 -// Memory (32-bit): 68 +// Strings (bytes): 25 (originally 32) +// Memory (8-bit): 47 +// Memory (32-bit): 61 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_North_Dakota_Center[] ACE_TIME_PROGMEM = { @@ -2366,7 +2388,7 @@ static const basic::ZoneEra kZoneEraAmerica_North_Dakota_Center[] ACE_TIME_PROGM }; -static const char kZoneNameAmerica_North_Dakota_Center[] ACE_TIME_PROGMEM = "America/North_Dakota/Center"; +static const char kZoneNameAmerica_North_Dakota_Center[] ACE_TIME_PROGMEM = "\x02" "North_Dakota/Center"; const basic::ZoneInfo kZoneAmerica_North_Dakota_Center ACE_TIME_PROGMEM = { kZoneNameAmerica_North_Dakota_Center /*name*/, @@ -2379,9 +2401,9 @@ const basic::ZoneInfo kZoneAmerica_North_Dakota_Center ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Nuuk // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Nuuk[] ACE_TIME_PROGMEM = { @@ -2400,7 +2422,7 @@ static const basic::ZoneEra kZoneEraAmerica_Nuuk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Nuuk[] ACE_TIME_PROGMEM = "America/Nuuk"; +static const char kZoneNameAmerica_Nuuk[] ACE_TIME_PROGMEM = "\x02" "Nuuk"; const basic::ZoneInfo kZoneAmerica_Nuuk ACE_TIME_PROGMEM = { kZoneNameAmerica_Nuuk /*name*/, @@ -2413,9 +2435,9 @@ const basic::ZoneInfo kZoneAmerica_Nuuk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Ojinaga // Zone Eras: 2 -// Strings (bytes): 24 -// Memory (8-bit): 57 -// Memory (32-bit): 76 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 50 +// Memory (32-bit): 69 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Ojinaga[] ACE_TIME_PROGMEM = { @@ -2446,7 +2468,7 @@ static const basic::ZoneEra kZoneEraAmerica_Ojinaga[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Ojinaga[] ACE_TIME_PROGMEM = "America/Ojinaga"; +static const char kZoneNameAmerica_Ojinaga[] ACE_TIME_PROGMEM = "\x02" "Ojinaga"; const basic::ZoneInfo kZoneAmerica_Ojinaga ACE_TIME_PROGMEM = { kZoneNameAmerica_Ojinaga /*name*/, @@ -2459,9 +2481,9 @@ const basic::ZoneInfo kZoneAmerica_Ojinaga ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Panama // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Panama[] ACE_TIME_PROGMEM = { @@ -2480,7 +2502,7 @@ static const basic::ZoneEra kZoneEraAmerica_Panama[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Panama[] ACE_TIME_PROGMEM = "America/Panama"; +static const char kZoneNameAmerica_Panama[] ACE_TIME_PROGMEM = "\x02" "Panama"; const basic::ZoneInfo kZoneAmerica_Panama ACE_TIME_PROGMEM = { kZoneNameAmerica_Panama /*name*/, @@ -2493,9 +2515,9 @@ const basic::ZoneInfo kZoneAmerica_Panama ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Paramaribo // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Paramaribo[] ACE_TIME_PROGMEM = { @@ -2514,7 +2536,7 @@ static const basic::ZoneEra kZoneEraAmerica_Paramaribo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Paramaribo[] ACE_TIME_PROGMEM = "America/Paramaribo"; +static const char kZoneNameAmerica_Paramaribo[] ACE_TIME_PROGMEM = "\x02" "Paramaribo"; const basic::ZoneInfo kZoneAmerica_Paramaribo ACE_TIME_PROGMEM = { kZoneNameAmerica_Paramaribo /*name*/, @@ -2527,9 +2549,9 @@ const basic::ZoneInfo kZoneAmerica_Paramaribo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Phoenix // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Phoenix[] ACE_TIME_PROGMEM = { @@ -2548,7 +2570,7 @@ static const basic::ZoneEra kZoneEraAmerica_Phoenix[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Phoenix[] ACE_TIME_PROGMEM = "America/Phoenix"; +static const char kZoneNameAmerica_Phoenix[] ACE_TIME_PROGMEM = "\x02" "Phoenix"; const basic::ZoneInfo kZoneAmerica_Phoenix ACE_TIME_PROGMEM = { kZoneNameAmerica_Phoenix /*name*/, @@ -2561,9 +2583,9 @@ const basic::ZoneInfo kZoneAmerica_Phoenix ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Port-au-Prince // Zone Eras: 1 -// Strings (bytes): 27 -// Memory (8-bit): 49 -// Memory (32-bit): 63 +// Strings (bytes): 20 (originally 27) +// Memory (8-bit): 42 +// Memory (32-bit): 56 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Port_au_Prince[] ACE_TIME_PROGMEM = { @@ -2582,7 +2604,7 @@ static const basic::ZoneEra kZoneEraAmerica_Port_au_Prince[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Port_au_Prince[] ACE_TIME_PROGMEM = "America/Port-au-Prince"; +static const char kZoneNameAmerica_Port_au_Prince[] ACE_TIME_PROGMEM = "\x02" "Port-au-Prince"; const basic::ZoneInfo kZoneAmerica_Port_au_Prince ACE_TIME_PROGMEM = { kZoneNameAmerica_Port_au_Prince /*name*/, @@ -2595,9 +2617,9 @@ const basic::ZoneInfo kZoneAmerica_Port_au_Prince ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Port_of_Spain // Zone Eras: 1 -// Strings (bytes): 26 -// Memory (8-bit): 48 -// Memory (32-bit): 62 +// Strings (bytes): 19 (originally 26) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Port_of_Spain[] ACE_TIME_PROGMEM = { @@ -2616,7 +2638,7 @@ static const basic::ZoneEra kZoneEraAmerica_Port_of_Spain[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Port_of_Spain[] ACE_TIME_PROGMEM = "America/Port_of_Spain"; +static const char kZoneNameAmerica_Port_of_Spain[] ACE_TIME_PROGMEM = "\x02" "Port_of_Spain"; const basic::ZoneInfo kZoneAmerica_Port_of_Spain ACE_TIME_PROGMEM = { kZoneNameAmerica_Port_of_Spain /*name*/, @@ -2629,9 +2651,9 @@ const basic::ZoneInfo kZoneAmerica_Port_of_Spain ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Porto_Velho // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Porto_Velho[] ACE_TIME_PROGMEM = { @@ -2650,7 +2672,7 @@ static const basic::ZoneEra kZoneEraAmerica_Porto_Velho[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Porto_Velho[] ACE_TIME_PROGMEM = "America/Porto_Velho"; +static const char kZoneNameAmerica_Porto_Velho[] ACE_TIME_PROGMEM = "\x02" "Porto_Velho"; const basic::ZoneInfo kZoneAmerica_Porto_Velho ACE_TIME_PROGMEM = { kZoneNameAmerica_Porto_Velho /*name*/, @@ -2663,9 +2685,9 @@ const basic::ZoneInfo kZoneAmerica_Porto_Velho ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Puerto_Rico // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Puerto_Rico[] ACE_TIME_PROGMEM = { @@ -2684,7 +2706,7 @@ static const basic::ZoneEra kZoneEraAmerica_Puerto_Rico[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Puerto_Rico[] ACE_TIME_PROGMEM = "America/Puerto_Rico"; +static const char kZoneNameAmerica_Puerto_Rico[] ACE_TIME_PROGMEM = "\x02" "Puerto_Rico"; const basic::ZoneInfo kZoneAmerica_Puerto_Rico ACE_TIME_PROGMEM = { kZoneNameAmerica_Puerto_Rico /*name*/, @@ -2697,9 +2719,9 @@ const basic::ZoneInfo kZoneAmerica_Puerto_Rico ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Rainy_River // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Rainy_River[] ACE_TIME_PROGMEM = { @@ -2718,7 +2740,7 @@ static const basic::ZoneEra kZoneEraAmerica_Rainy_River[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Rainy_River[] ACE_TIME_PROGMEM = "America/Rainy_River"; +static const char kZoneNameAmerica_Rainy_River[] ACE_TIME_PROGMEM = "\x02" "Rainy_River"; const basic::ZoneInfo kZoneAmerica_Rainy_River ACE_TIME_PROGMEM = { kZoneNameAmerica_Rainy_River /*name*/, @@ -2731,9 +2753,9 @@ const basic::ZoneInfo kZoneAmerica_Rainy_River ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Regina // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Regina[] ACE_TIME_PROGMEM = { @@ -2752,7 +2774,7 @@ static const basic::ZoneEra kZoneEraAmerica_Regina[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Regina[] ACE_TIME_PROGMEM = "America/Regina"; +static const char kZoneNameAmerica_Regina[] ACE_TIME_PROGMEM = "\x02" "Regina"; const basic::ZoneInfo kZoneAmerica_Regina ACE_TIME_PROGMEM = { kZoneNameAmerica_Regina /*name*/, @@ -2765,9 +2787,9 @@ const basic::ZoneInfo kZoneAmerica_Regina ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Santiago // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Santiago[] ACE_TIME_PROGMEM = { @@ -2786,7 +2808,7 @@ static const basic::ZoneEra kZoneEraAmerica_Santiago[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Santiago[] ACE_TIME_PROGMEM = "America/Santiago"; +static const char kZoneNameAmerica_Santiago[] ACE_TIME_PROGMEM = "\x02" "Santiago"; const basic::ZoneInfo kZoneAmerica_Santiago ACE_TIME_PROGMEM = { kZoneNameAmerica_Santiago /*name*/, @@ -2799,9 +2821,9 @@ const basic::ZoneInfo kZoneAmerica_Santiago ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Sao_Paulo // Zone Eras: 1 -// Strings (bytes): 26 -// Memory (8-bit): 48 -// Memory (32-bit): 62 +// Strings (bytes): 19 (originally 26) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Sao_Paulo[] ACE_TIME_PROGMEM = { @@ -2820,7 +2842,7 @@ static const basic::ZoneEra kZoneEraAmerica_Sao_Paulo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Sao_Paulo[] ACE_TIME_PROGMEM = "America/Sao_Paulo"; +static const char kZoneNameAmerica_Sao_Paulo[] ACE_TIME_PROGMEM = "\x02" "Sao_Paulo"; const basic::ZoneInfo kZoneAmerica_Sao_Paulo ACE_TIME_PROGMEM = { kZoneNameAmerica_Sao_Paulo /*name*/, @@ -2833,9 +2855,9 @@ const basic::ZoneInfo kZoneAmerica_Sao_Paulo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Scoresbysund // Zone Eras: 1 -// Strings (bytes): 29 -// Memory (8-bit): 51 -// Memory (32-bit): 65 +// Strings (bytes): 22 (originally 29) +// Memory (8-bit): 44 +// Memory (32-bit): 58 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Scoresbysund[] ACE_TIME_PROGMEM = { @@ -2854,7 +2876,7 @@ static const basic::ZoneEra kZoneEraAmerica_Scoresbysund[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Scoresbysund[] ACE_TIME_PROGMEM = "America/Scoresbysund"; +static const char kZoneNameAmerica_Scoresbysund[] ACE_TIME_PROGMEM = "\x02" "Scoresbysund"; const basic::ZoneInfo kZoneAmerica_Scoresbysund ACE_TIME_PROGMEM = { kZoneNameAmerica_Scoresbysund /*name*/, @@ -2867,9 +2889,9 @@ const basic::ZoneInfo kZoneAmerica_Scoresbysund ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Sitka // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Sitka[] ACE_TIME_PROGMEM = { @@ -2888,7 +2910,7 @@ static const basic::ZoneEra kZoneEraAmerica_Sitka[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Sitka[] ACE_TIME_PROGMEM = "America/Sitka"; +static const char kZoneNameAmerica_Sitka[] ACE_TIME_PROGMEM = "\x02" "Sitka"; const basic::ZoneInfo kZoneAmerica_Sitka ACE_TIME_PROGMEM = { kZoneNameAmerica_Sitka /*name*/, @@ -2901,9 +2923,9 @@ const basic::ZoneInfo kZoneAmerica_Sitka ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Swift_Current // Zone Eras: 1 -// Strings (bytes): 26 -// Memory (8-bit): 48 -// Memory (32-bit): 62 +// Strings (bytes): 19 (originally 26) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Swift_Current[] ACE_TIME_PROGMEM = { @@ -2922,7 +2944,7 @@ static const basic::ZoneEra kZoneEraAmerica_Swift_Current[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Swift_Current[] ACE_TIME_PROGMEM = "America/Swift_Current"; +static const char kZoneNameAmerica_Swift_Current[] ACE_TIME_PROGMEM = "\x02" "Swift_Current"; const basic::ZoneInfo kZoneAmerica_Swift_Current ACE_TIME_PROGMEM = { kZoneNameAmerica_Swift_Current /*name*/, @@ -2935,9 +2957,9 @@ const basic::ZoneInfo kZoneAmerica_Swift_Current ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Tegucigalpa // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Tegucigalpa[] ACE_TIME_PROGMEM = { @@ -2956,7 +2978,7 @@ static const basic::ZoneEra kZoneEraAmerica_Tegucigalpa[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Tegucigalpa[] ACE_TIME_PROGMEM = "America/Tegucigalpa"; +static const char kZoneNameAmerica_Tegucigalpa[] ACE_TIME_PROGMEM = "\x02" "Tegucigalpa"; const basic::ZoneInfo kZoneAmerica_Tegucigalpa ACE_TIME_PROGMEM = { kZoneNameAmerica_Tegucigalpa /*name*/, @@ -2969,9 +2991,9 @@ const basic::ZoneInfo kZoneAmerica_Tegucigalpa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Thule // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Thule[] ACE_TIME_PROGMEM = { @@ -2990,7 +3012,7 @@ static const basic::ZoneEra kZoneEraAmerica_Thule[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Thule[] ACE_TIME_PROGMEM = "America/Thule"; +static const char kZoneNameAmerica_Thule[] ACE_TIME_PROGMEM = "\x02" "Thule"; const basic::ZoneInfo kZoneAmerica_Thule ACE_TIME_PROGMEM = { kZoneNameAmerica_Thule /*name*/, @@ -3003,9 +3025,9 @@ const basic::ZoneInfo kZoneAmerica_Thule ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Thunder_Bay // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Thunder_Bay[] ACE_TIME_PROGMEM = { @@ -3024,7 +3046,7 @@ static const basic::ZoneEra kZoneEraAmerica_Thunder_Bay[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Thunder_Bay[] ACE_TIME_PROGMEM = "America/Thunder_Bay"; +static const char kZoneNameAmerica_Thunder_Bay[] ACE_TIME_PROGMEM = "\x02" "Thunder_Bay"; const basic::ZoneInfo kZoneAmerica_Thunder_Bay ACE_TIME_PROGMEM = { kZoneNameAmerica_Thunder_Bay /*name*/, @@ -3037,9 +3059,9 @@ const basic::ZoneInfo kZoneAmerica_Thunder_Bay ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Toronto // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Toronto[] ACE_TIME_PROGMEM = { @@ -3058,7 +3080,7 @@ static const basic::ZoneEra kZoneEraAmerica_Toronto[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Toronto[] ACE_TIME_PROGMEM = "America/Toronto"; +static const char kZoneNameAmerica_Toronto[] ACE_TIME_PROGMEM = "\x02" "Toronto"; const basic::ZoneInfo kZoneAmerica_Toronto ACE_TIME_PROGMEM = { kZoneNameAmerica_Toronto /*name*/, @@ -3071,9 +3093,9 @@ const basic::ZoneInfo kZoneAmerica_Toronto ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Vancouver // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Vancouver[] ACE_TIME_PROGMEM = { @@ -3092,7 +3114,7 @@ static const basic::ZoneEra kZoneEraAmerica_Vancouver[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Vancouver[] ACE_TIME_PROGMEM = "America/Vancouver"; +static const char kZoneNameAmerica_Vancouver[] ACE_TIME_PROGMEM = "\x02" "Vancouver"; const basic::ZoneInfo kZoneAmerica_Vancouver ACE_TIME_PROGMEM = { kZoneNameAmerica_Vancouver /*name*/, @@ -3105,9 +3127,9 @@ const basic::ZoneInfo kZoneAmerica_Vancouver ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Winnipeg // Zone Eras: 2 -// Strings (bytes): 25 -// Memory (8-bit): 58 -// Memory (32-bit): 77 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 51 +// Memory (32-bit): 70 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Winnipeg[] ACE_TIME_PROGMEM = { @@ -3138,7 +3160,7 @@ static const basic::ZoneEra kZoneEraAmerica_Winnipeg[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Winnipeg[] ACE_TIME_PROGMEM = "America/Winnipeg"; +static const char kZoneNameAmerica_Winnipeg[] ACE_TIME_PROGMEM = "\x02" "Winnipeg"; const basic::ZoneInfo kZoneAmerica_Winnipeg ACE_TIME_PROGMEM = { kZoneNameAmerica_Winnipeg /*name*/, @@ -3151,9 +3173,9 @@ const basic::ZoneInfo kZoneAmerica_Winnipeg ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Yakutat // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Yakutat[] ACE_TIME_PROGMEM = { @@ -3172,7 +3194,7 @@ static const basic::ZoneEra kZoneEraAmerica_Yakutat[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Yakutat[] ACE_TIME_PROGMEM = "America/Yakutat"; +static const char kZoneNameAmerica_Yakutat[] ACE_TIME_PROGMEM = "\x02" "Yakutat"; const basic::ZoneInfo kZoneAmerica_Yakutat ACE_TIME_PROGMEM = { kZoneNameAmerica_Yakutat /*name*/, @@ -3185,9 +3207,9 @@ const basic::ZoneInfo kZoneAmerica_Yakutat ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Yellowknife // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAmerica_Yellowknife[] ACE_TIME_PROGMEM = { @@ -3206,7 +3228,7 @@ static const basic::ZoneEra kZoneEraAmerica_Yellowknife[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Yellowknife[] ACE_TIME_PROGMEM = "America/Yellowknife"; +static const char kZoneNameAmerica_Yellowknife[] ACE_TIME_PROGMEM = "\x02" "Yellowknife"; const basic::ZoneInfo kZoneAmerica_Yellowknife ACE_TIME_PROGMEM = { kZoneNameAmerica_Yellowknife /*name*/, @@ -3219,9 +3241,9 @@ const basic::ZoneInfo kZoneAmerica_Yellowknife ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/DumontDUrville // Zone Eras: 1 -// Strings (bytes): 30 -// Memory (8-bit): 52 -// Memory (32-bit): 66 +// Strings (bytes): 20 (originally 30) +// Memory (8-bit): 42 +// Memory (32-bit): 56 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAntarctica_DumontDUrville[] ACE_TIME_PROGMEM = { @@ -3240,7 +3262,7 @@ static const basic::ZoneEra kZoneEraAntarctica_DumontDUrville[] ACE_TIME_PROGMEM }; -static const char kZoneNameAntarctica_DumontDUrville[] ACE_TIME_PROGMEM = "Antarctica/DumontDUrville"; +static const char kZoneNameAntarctica_DumontDUrville[] ACE_TIME_PROGMEM = "\x03" "DumontDUrville"; const basic::ZoneInfo kZoneAntarctica_DumontDUrville ACE_TIME_PROGMEM = { kZoneNameAntarctica_DumontDUrville /*name*/, @@ -3253,9 +3275,9 @@ const basic::ZoneInfo kZoneAntarctica_DumontDUrville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/Rothera // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 13 (originally 23) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAntarctica_Rothera[] ACE_TIME_PROGMEM = { @@ -3274,7 +3296,7 @@ static const basic::ZoneEra kZoneEraAntarctica_Rothera[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAntarctica_Rothera[] ACE_TIME_PROGMEM = "Antarctica/Rothera"; +static const char kZoneNameAntarctica_Rothera[] ACE_TIME_PROGMEM = "\x03" "Rothera"; const basic::ZoneInfo kZoneAntarctica_Rothera ACE_TIME_PROGMEM = { kZoneNameAntarctica_Rothera /*name*/, @@ -3287,9 +3309,9 @@ const basic::ZoneInfo kZoneAntarctica_Rothera ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/Syowa // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 11 (originally 21) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAntarctica_Syowa[] ACE_TIME_PROGMEM = { @@ -3308,7 +3330,7 @@ static const basic::ZoneEra kZoneEraAntarctica_Syowa[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAntarctica_Syowa[] ACE_TIME_PROGMEM = "Antarctica/Syowa"; +static const char kZoneNameAntarctica_Syowa[] ACE_TIME_PROGMEM = "\x03" "Syowa"; const basic::ZoneInfo kZoneAntarctica_Syowa ACE_TIME_PROGMEM = { kZoneNameAntarctica_Syowa /*name*/, @@ -3321,9 +3343,9 @@ const basic::ZoneInfo kZoneAntarctica_Syowa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/Vostok // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 12 (originally 22) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAntarctica_Vostok[] ACE_TIME_PROGMEM = { @@ -3342,7 +3364,7 @@ static const basic::ZoneEra kZoneEraAntarctica_Vostok[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAntarctica_Vostok[] ACE_TIME_PROGMEM = "Antarctica/Vostok"; +static const char kZoneNameAntarctica_Vostok[] ACE_TIME_PROGMEM = "\x03" "Vostok"; const basic::ZoneInfo kZoneAntarctica_Vostok ACE_TIME_PROGMEM = { kZoneNameAntarctica_Vostok /*name*/, @@ -3355,9 +3377,9 @@ const basic::ZoneInfo kZoneAntarctica_Vostok ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Amman // Zone Eras: 1 -// Strings (bytes): 16 -// Memory (8-bit): 38 -// Memory (32-bit): 52 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Amman[] ACE_TIME_PROGMEM = { @@ -3376,7 +3398,7 @@ static const basic::ZoneEra kZoneEraAsia_Amman[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Amman[] ACE_TIME_PROGMEM = "Asia/Amman"; +static const char kZoneNameAsia_Amman[] ACE_TIME_PROGMEM = "\x04" "Amman"; const basic::ZoneInfo kZoneAsia_Amman ACE_TIME_PROGMEM = { kZoneNameAsia_Amman /*name*/, @@ -3389,9 +3411,9 @@ const basic::ZoneInfo kZoneAsia_Amman ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Ashgabat // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Ashgabat[] ACE_TIME_PROGMEM = { @@ -3410,7 +3432,7 @@ static const basic::ZoneEra kZoneEraAsia_Ashgabat[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Ashgabat[] ACE_TIME_PROGMEM = "Asia/Ashgabat"; +static const char kZoneNameAsia_Ashgabat[] ACE_TIME_PROGMEM = "\x04" "Ashgabat"; const basic::ZoneInfo kZoneAsia_Ashgabat ACE_TIME_PROGMEM = { kZoneNameAsia_Ashgabat /*name*/, @@ -3423,9 +3445,9 @@ const basic::ZoneInfo kZoneAsia_Ashgabat ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Baghdad // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 17 (originally 21) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Baghdad[] ACE_TIME_PROGMEM = { @@ -3444,7 +3466,7 @@ static const basic::ZoneEra kZoneEraAsia_Baghdad[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Baghdad[] ACE_TIME_PROGMEM = "Asia/Baghdad"; +static const char kZoneNameAsia_Baghdad[] ACE_TIME_PROGMEM = "\x04" "Baghdad"; const basic::ZoneInfo kZoneAsia_Baghdad ACE_TIME_PROGMEM = { kZoneNameAsia_Baghdad /*name*/, @@ -3457,9 +3479,9 @@ const basic::ZoneInfo kZoneAsia_Baghdad ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Baku // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Baku[] ACE_TIME_PROGMEM = { @@ -3478,7 +3500,7 @@ static const basic::ZoneEra kZoneEraAsia_Baku[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Baku[] ACE_TIME_PROGMEM = "Asia/Baku"; +static const char kZoneNameAsia_Baku[] ACE_TIME_PROGMEM = "\x04" "Baku"; const basic::ZoneInfo kZoneAsia_Baku ACE_TIME_PROGMEM = { kZoneNameAsia_Baku /*name*/, @@ -3491,9 +3513,9 @@ const basic::ZoneInfo kZoneAsia_Baku ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Bangkok // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 13 (originally 17) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Bangkok[] ACE_TIME_PROGMEM = { @@ -3512,7 +3534,7 @@ static const basic::ZoneEra kZoneEraAsia_Bangkok[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Bangkok[] ACE_TIME_PROGMEM = "Asia/Bangkok"; +static const char kZoneNameAsia_Bangkok[] ACE_TIME_PROGMEM = "\x04" "Bangkok"; const basic::ZoneInfo kZoneAsia_Bangkok ACE_TIME_PROGMEM = { kZoneNameAsia_Bangkok /*name*/, @@ -3525,9 +3547,9 @@ const basic::ZoneInfo kZoneAsia_Bangkok ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Beirut // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 13 (originally 17) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Beirut[] ACE_TIME_PROGMEM = { @@ -3546,7 +3568,7 @@ static const basic::ZoneEra kZoneEraAsia_Beirut[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Beirut[] ACE_TIME_PROGMEM = "Asia/Beirut"; +static const char kZoneNameAsia_Beirut[] ACE_TIME_PROGMEM = "\x04" "Beirut"; const basic::ZoneInfo kZoneAsia_Beirut ACE_TIME_PROGMEM = { kZoneNameAsia_Beirut /*name*/, @@ -3559,9 +3581,9 @@ const basic::ZoneInfo kZoneAsia_Beirut ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Brunei // Zone Eras: 1 -// Strings (bytes): 16 -// Memory (8-bit): 38 -// Memory (32-bit): 52 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Brunei[] ACE_TIME_PROGMEM = { @@ -3580,7 +3602,7 @@ static const basic::ZoneEra kZoneEraAsia_Brunei[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Brunei[] ACE_TIME_PROGMEM = "Asia/Brunei"; +static const char kZoneNameAsia_Brunei[] ACE_TIME_PROGMEM = "\x04" "Brunei"; const basic::ZoneInfo kZoneAsia_Brunei ACE_TIME_PROGMEM = { kZoneNameAsia_Brunei /*name*/, @@ -3593,9 +3615,9 @@ const basic::ZoneInfo kZoneAsia_Brunei ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Damascus // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 15 (originally 19) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Damascus[] ACE_TIME_PROGMEM = { @@ -3614,7 +3636,7 @@ static const basic::ZoneEra kZoneEraAsia_Damascus[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Damascus[] ACE_TIME_PROGMEM = "Asia/Damascus"; +static const char kZoneNameAsia_Damascus[] ACE_TIME_PROGMEM = "\x04" "Damascus"; const basic::ZoneInfo kZoneAsia_Damascus ACE_TIME_PROGMEM = { kZoneNameAsia_Damascus /*name*/, @@ -3627,9 +3649,9 @@ const basic::ZoneInfo kZoneAsia_Damascus ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Dhaka // Zone Eras: 2 -// Strings (bytes): 23 -// Memory (8-bit): 56 -// Memory (32-bit): 75 +// Strings (bytes): 19 (originally 23) +// Memory (8-bit): 52 +// Memory (32-bit): 71 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Dhaka[] ACE_TIME_PROGMEM = { @@ -3660,7 +3682,7 @@ static const basic::ZoneEra kZoneEraAsia_Dhaka[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Dhaka[] ACE_TIME_PROGMEM = "Asia/Dhaka"; +static const char kZoneNameAsia_Dhaka[] ACE_TIME_PROGMEM = "\x04" "Dhaka"; const basic::ZoneInfo kZoneAsia_Dhaka ACE_TIME_PROGMEM = { kZoneNameAsia_Dhaka /*name*/, @@ -3673,9 +3695,9 @@ const basic::ZoneInfo kZoneAsia_Dhaka ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Dubai // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Dubai[] ACE_TIME_PROGMEM = { @@ -3694,7 +3716,7 @@ static const basic::ZoneEra kZoneEraAsia_Dubai[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Dubai[] ACE_TIME_PROGMEM = "Asia/Dubai"; +static const char kZoneNameAsia_Dubai[] ACE_TIME_PROGMEM = "\x04" "Dubai"; const basic::ZoneInfo kZoneAsia_Dubai ACE_TIME_PROGMEM = { kZoneNameAsia_Dubai /*name*/, @@ -3707,9 +3729,9 @@ const basic::ZoneInfo kZoneAsia_Dubai ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Dushanbe // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Dushanbe[] ACE_TIME_PROGMEM = { @@ -3728,7 +3750,7 @@ static const basic::ZoneEra kZoneEraAsia_Dushanbe[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Dushanbe[] ACE_TIME_PROGMEM = "Asia/Dushanbe"; +static const char kZoneNameAsia_Dushanbe[] ACE_TIME_PROGMEM = "\x04" "Dushanbe"; const basic::ZoneInfo kZoneAsia_Dushanbe ACE_TIME_PROGMEM = { kZoneNameAsia_Dushanbe /*name*/, @@ -3741,9 +3763,9 @@ const basic::ZoneInfo kZoneAsia_Dushanbe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Ho_Chi_Minh // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 17 (originally 21) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Ho_Chi_Minh[] ACE_TIME_PROGMEM = { @@ -3762,7 +3784,7 @@ static const basic::ZoneEra kZoneEraAsia_Ho_Chi_Minh[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Ho_Chi_Minh[] ACE_TIME_PROGMEM = "Asia/Ho_Chi_Minh"; +static const char kZoneNameAsia_Ho_Chi_Minh[] ACE_TIME_PROGMEM = "\x04" "Ho_Chi_Minh"; const basic::ZoneInfo kZoneAsia_Ho_Chi_Minh ACE_TIME_PROGMEM = { kZoneNameAsia_Ho_Chi_Minh /*name*/, @@ -3775,9 +3797,9 @@ const basic::ZoneInfo kZoneAsia_Ho_Chi_Minh ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Hong_Kong // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 16 (originally 20) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Hong_Kong[] ACE_TIME_PROGMEM = { @@ -3796,7 +3818,7 @@ static const basic::ZoneEra kZoneEraAsia_Hong_Kong[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Hong_Kong[] ACE_TIME_PROGMEM = "Asia/Hong_Kong"; +static const char kZoneNameAsia_Hong_Kong[] ACE_TIME_PROGMEM = "\x04" "Hong_Kong"; const basic::ZoneInfo kZoneAsia_Hong_Kong ACE_TIME_PROGMEM = { kZoneNameAsia_Hong_Kong /*name*/, @@ -3809,9 +3831,9 @@ const basic::ZoneInfo kZoneAsia_Hong_Kong ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Hovd // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Hovd[] ACE_TIME_PROGMEM = { @@ -3830,7 +3852,7 @@ static const basic::ZoneEra kZoneEraAsia_Hovd[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Hovd[] ACE_TIME_PROGMEM = "Asia/Hovd"; +static const char kZoneNameAsia_Hovd[] ACE_TIME_PROGMEM = "\x04" "Hovd"; const basic::ZoneInfo kZoneAsia_Hovd ACE_TIME_PROGMEM = { kZoneNameAsia_Hovd /*name*/, @@ -3843,9 +3865,9 @@ const basic::ZoneInfo kZoneAsia_Hovd ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Jakarta // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 13 (originally 17) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Jakarta[] ACE_TIME_PROGMEM = { @@ -3864,7 +3886,7 @@ static const basic::ZoneEra kZoneEraAsia_Jakarta[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Jakarta[] ACE_TIME_PROGMEM = "Asia/Jakarta"; +static const char kZoneNameAsia_Jakarta[] ACE_TIME_PROGMEM = "\x04" "Jakarta"; const basic::ZoneInfo kZoneAsia_Jakarta ACE_TIME_PROGMEM = { kZoneNameAsia_Jakarta /*name*/, @@ -3877,9 +3899,9 @@ const basic::ZoneInfo kZoneAsia_Jakarta ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Jayapura // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Jayapura[] ACE_TIME_PROGMEM = { @@ -3898,7 +3920,7 @@ static const basic::ZoneEra kZoneEraAsia_Jayapura[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Jayapura[] ACE_TIME_PROGMEM = "Asia/Jayapura"; +static const char kZoneNameAsia_Jayapura[] ACE_TIME_PROGMEM = "\x04" "Jayapura"; const basic::ZoneInfo kZoneAsia_Jayapura ACE_TIME_PROGMEM = { kZoneNameAsia_Jayapura /*name*/, @@ -3911,9 +3933,9 @@ const basic::ZoneInfo kZoneAsia_Jayapura ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Jerusalem // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 15 (originally 19) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Jerusalem[] ACE_TIME_PROGMEM = { @@ -3932,7 +3954,7 @@ static const basic::ZoneEra kZoneEraAsia_Jerusalem[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Jerusalem[] ACE_TIME_PROGMEM = "Asia/Jerusalem"; +static const char kZoneNameAsia_Jerusalem[] ACE_TIME_PROGMEM = "\x04" "Jerusalem"; const basic::ZoneInfo kZoneAsia_Jerusalem ACE_TIME_PROGMEM = { kZoneNameAsia_Jerusalem /*name*/, @@ -3945,9 +3967,9 @@ const basic::ZoneInfo kZoneAsia_Jerusalem ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Kabul // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 13 (originally 17) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Kabul[] ACE_TIME_PROGMEM = { @@ -3966,7 +3988,7 @@ static const basic::ZoneEra kZoneEraAsia_Kabul[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Kabul[] ACE_TIME_PROGMEM = "Asia/Kabul"; +static const char kZoneNameAsia_Kabul[] ACE_TIME_PROGMEM = "\x04" "Kabul"; const basic::ZoneInfo kZoneAsia_Kabul ACE_TIME_PROGMEM = { kZoneNameAsia_Kabul /*name*/, @@ -3979,9 +4001,9 @@ const basic::ZoneInfo kZoneAsia_Kabul ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Karachi // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Karachi[] ACE_TIME_PROGMEM = { @@ -4000,7 +4022,7 @@ static const basic::ZoneEra kZoneEraAsia_Karachi[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Karachi[] ACE_TIME_PROGMEM = "Asia/Karachi"; +static const char kZoneNameAsia_Karachi[] ACE_TIME_PROGMEM = "\x04" "Karachi"; const basic::ZoneInfo kZoneAsia_Karachi ACE_TIME_PROGMEM = { kZoneNameAsia_Karachi /*name*/, @@ -4013,9 +4035,9 @@ const basic::ZoneInfo kZoneAsia_Karachi ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Kathmandu // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 17 (originally 21) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Kathmandu[] ACE_TIME_PROGMEM = { @@ -4034,7 +4056,7 @@ static const basic::ZoneEra kZoneEraAsia_Kathmandu[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Kathmandu[] ACE_TIME_PROGMEM = "Asia/Kathmandu"; +static const char kZoneNameAsia_Kathmandu[] ACE_TIME_PROGMEM = "\x04" "Kathmandu"; const basic::ZoneInfo kZoneAsia_Kathmandu ACE_TIME_PROGMEM = { kZoneNameAsia_Kathmandu /*name*/, @@ -4047,9 +4069,9 @@ const basic::ZoneInfo kZoneAsia_Kathmandu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Kolkata // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 13 (originally 17) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Kolkata[] ACE_TIME_PROGMEM = { @@ -4068,7 +4090,7 @@ static const basic::ZoneEra kZoneEraAsia_Kolkata[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Kolkata[] ACE_TIME_PROGMEM = "Asia/Kolkata"; +static const char kZoneNameAsia_Kolkata[] ACE_TIME_PROGMEM = "\x04" "Kolkata"; const basic::ZoneInfo kZoneAsia_Kolkata ACE_TIME_PROGMEM = { kZoneNameAsia_Kolkata /*name*/, @@ -4081,9 +4103,9 @@ const basic::ZoneInfo kZoneAsia_Kolkata ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Kuala_Lumpur // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 18 (originally 22) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Kuala_Lumpur[] ACE_TIME_PROGMEM = { @@ -4102,7 +4124,7 @@ static const basic::ZoneEra kZoneEraAsia_Kuala_Lumpur[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Kuala_Lumpur[] ACE_TIME_PROGMEM = "Asia/Kuala_Lumpur"; +static const char kZoneNameAsia_Kuala_Lumpur[] ACE_TIME_PROGMEM = "\x04" "Kuala_Lumpur"; const basic::ZoneInfo kZoneAsia_Kuala_Lumpur ACE_TIME_PROGMEM = { kZoneNameAsia_Kuala_Lumpur /*name*/, @@ -4115,9 +4137,9 @@ const basic::ZoneInfo kZoneAsia_Kuala_Lumpur ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Kuching // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 13 (originally 17) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Kuching[] ACE_TIME_PROGMEM = { @@ -4136,7 +4158,7 @@ static const basic::ZoneEra kZoneEraAsia_Kuching[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Kuching[] ACE_TIME_PROGMEM = "Asia/Kuching"; +static const char kZoneNameAsia_Kuching[] ACE_TIME_PROGMEM = "\x04" "Kuching"; const basic::ZoneInfo kZoneAsia_Kuching ACE_TIME_PROGMEM = { kZoneNameAsia_Kuching /*name*/, @@ -4149,9 +4171,9 @@ const basic::ZoneInfo kZoneAsia_Kuching ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Macau // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Macau[] ACE_TIME_PROGMEM = { @@ -4170,7 +4192,7 @@ static const basic::ZoneEra kZoneEraAsia_Macau[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Macau[] ACE_TIME_PROGMEM = "Asia/Macau"; +static const char kZoneNameAsia_Macau[] ACE_TIME_PROGMEM = "\x04" "Macau"; const basic::ZoneInfo kZoneAsia_Macau ACE_TIME_PROGMEM = { kZoneNameAsia_Macau /*name*/, @@ -4183,9 +4205,9 @@ const basic::ZoneInfo kZoneAsia_Macau ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Makassar // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 15 (originally 19) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Makassar[] ACE_TIME_PROGMEM = { @@ -4204,7 +4226,7 @@ static const basic::ZoneEra kZoneEraAsia_Makassar[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Makassar[] ACE_TIME_PROGMEM = "Asia/Makassar"; +static const char kZoneNameAsia_Makassar[] ACE_TIME_PROGMEM = "\x04" "Makassar"; const basic::ZoneInfo kZoneAsia_Makassar ACE_TIME_PROGMEM = { kZoneNameAsia_Makassar /*name*/, @@ -4217,9 +4239,9 @@ const basic::ZoneInfo kZoneAsia_Makassar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Manila // Zone Eras: 1 -// Strings (bytes): 16 -// Memory (8-bit): 38 -// Memory (32-bit): 52 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Manila[] ACE_TIME_PROGMEM = { @@ -4238,7 +4260,7 @@ static const basic::ZoneEra kZoneEraAsia_Manila[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Manila[] ACE_TIME_PROGMEM = "Asia/Manila"; +static const char kZoneNameAsia_Manila[] ACE_TIME_PROGMEM = "\x04" "Manila"; const basic::ZoneInfo kZoneAsia_Manila ACE_TIME_PROGMEM = { kZoneNameAsia_Manila /*name*/, @@ -4251,9 +4273,9 @@ const basic::ZoneInfo kZoneAsia_Manila ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Nicosia // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Nicosia[] ACE_TIME_PROGMEM = { @@ -4272,7 +4294,7 @@ static const basic::ZoneEra kZoneEraAsia_Nicosia[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Nicosia[] ACE_TIME_PROGMEM = "Asia/Nicosia"; +static const char kZoneNameAsia_Nicosia[] ACE_TIME_PROGMEM = "\x04" "Nicosia"; const basic::ZoneInfo kZoneAsia_Nicosia ACE_TIME_PROGMEM = { kZoneNameAsia_Nicosia /*name*/, @@ -4285,9 +4307,9 @@ const basic::ZoneInfo kZoneAsia_Nicosia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Pontianak // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 15 (originally 19) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Pontianak[] ACE_TIME_PROGMEM = { @@ -4306,7 +4328,7 @@ static const basic::ZoneEra kZoneEraAsia_Pontianak[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Pontianak[] ACE_TIME_PROGMEM = "Asia/Pontianak"; +static const char kZoneNameAsia_Pontianak[] ACE_TIME_PROGMEM = "\x04" "Pontianak"; const basic::ZoneInfo kZoneAsia_Pontianak ACE_TIME_PROGMEM = { kZoneNameAsia_Pontianak /*name*/, @@ -4319,9 +4341,9 @@ const basic::ZoneInfo kZoneAsia_Pontianak ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Qatar // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Qatar[] ACE_TIME_PROGMEM = { @@ -4340,7 +4362,7 @@ static const basic::ZoneEra kZoneEraAsia_Qatar[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Qatar[] ACE_TIME_PROGMEM = "Asia/Qatar"; +static const char kZoneNameAsia_Qatar[] ACE_TIME_PROGMEM = "\x04" "Qatar"; const basic::ZoneInfo kZoneAsia_Qatar ACE_TIME_PROGMEM = { kZoneNameAsia_Qatar /*name*/, @@ -4353,9 +4375,9 @@ const basic::ZoneInfo kZoneAsia_Qatar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Riyadh // Zone Eras: 1 -// Strings (bytes): 16 -// Memory (8-bit): 38 -// Memory (32-bit): 52 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Riyadh[] ACE_TIME_PROGMEM = { @@ -4374,7 +4396,7 @@ static const basic::ZoneEra kZoneEraAsia_Riyadh[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Riyadh[] ACE_TIME_PROGMEM = "Asia/Riyadh"; +static const char kZoneNameAsia_Riyadh[] ACE_TIME_PROGMEM = "\x04" "Riyadh"; const basic::ZoneInfo kZoneAsia_Riyadh ACE_TIME_PROGMEM = { kZoneNameAsia_Riyadh /*name*/, @@ -4387,9 +4409,9 @@ const basic::ZoneInfo kZoneAsia_Riyadh ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Samarkand // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 15 (originally 19) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Samarkand[] ACE_TIME_PROGMEM = { @@ -4408,7 +4430,7 @@ static const basic::ZoneEra kZoneEraAsia_Samarkand[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Samarkand[] ACE_TIME_PROGMEM = "Asia/Samarkand"; +static const char kZoneNameAsia_Samarkand[] ACE_TIME_PROGMEM = "\x04" "Samarkand"; const basic::ZoneInfo kZoneAsia_Samarkand ACE_TIME_PROGMEM = { kZoneNameAsia_Samarkand /*name*/, @@ -4421,9 +4443,9 @@ const basic::ZoneInfo kZoneAsia_Samarkand ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Seoul // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Seoul[] ACE_TIME_PROGMEM = { @@ -4442,7 +4464,7 @@ static const basic::ZoneEra kZoneEraAsia_Seoul[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Seoul[] ACE_TIME_PROGMEM = "Asia/Seoul"; +static const char kZoneNameAsia_Seoul[] ACE_TIME_PROGMEM = "\x04" "Seoul"; const basic::ZoneInfo kZoneAsia_Seoul ACE_TIME_PROGMEM = { kZoneNameAsia_Seoul /*name*/, @@ -4455,9 +4477,9 @@ const basic::ZoneInfo kZoneAsia_Seoul ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Shanghai // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Shanghai[] ACE_TIME_PROGMEM = { @@ -4476,7 +4498,7 @@ static const basic::ZoneEra kZoneEraAsia_Shanghai[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Shanghai[] ACE_TIME_PROGMEM = "Asia/Shanghai"; +static const char kZoneNameAsia_Shanghai[] ACE_TIME_PROGMEM = "\x04" "Shanghai"; const basic::ZoneInfo kZoneAsia_Shanghai ACE_TIME_PROGMEM = { kZoneNameAsia_Shanghai /*name*/, @@ -4489,9 +4511,9 @@ const basic::ZoneInfo kZoneAsia_Shanghai ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Singapore // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 15 (originally 19) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Singapore[] ACE_TIME_PROGMEM = { @@ -4510,7 +4532,7 @@ static const basic::ZoneEra kZoneEraAsia_Singapore[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Singapore[] ACE_TIME_PROGMEM = "Asia/Singapore"; +static const char kZoneNameAsia_Singapore[] ACE_TIME_PROGMEM = "\x04" "Singapore"; const basic::ZoneInfo kZoneAsia_Singapore ACE_TIME_PROGMEM = { kZoneNameAsia_Singapore /*name*/, @@ -4523,9 +4545,9 @@ const basic::ZoneInfo kZoneAsia_Singapore ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Taipei // Zone Eras: 1 -// Strings (bytes): 16 -// Memory (8-bit): 38 -// Memory (32-bit): 52 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Taipei[] ACE_TIME_PROGMEM = { @@ -4544,7 +4566,7 @@ static const basic::ZoneEra kZoneEraAsia_Taipei[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Taipei[] ACE_TIME_PROGMEM = "Asia/Taipei"; +static const char kZoneNameAsia_Taipei[] ACE_TIME_PROGMEM = "\x04" "Taipei"; const basic::ZoneInfo kZoneAsia_Taipei ACE_TIME_PROGMEM = { kZoneNameAsia_Taipei /*name*/, @@ -4557,9 +4579,9 @@ const basic::ZoneInfo kZoneAsia_Taipei ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Tashkent // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Tashkent[] ACE_TIME_PROGMEM = { @@ -4578,7 +4600,7 @@ static const basic::ZoneEra kZoneEraAsia_Tashkent[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Tashkent[] ACE_TIME_PROGMEM = "Asia/Tashkent"; +static const char kZoneNameAsia_Tashkent[] ACE_TIME_PROGMEM = "\x04" "Tashkent"; const basic::ZoneInfo kZoneAsia_Tashkent ACE_TIME_PROGMEM = { kZoneNameAsia_Tashkent /*name*/, @@ -4591,9 +4613,9 @@ const basic::ZoneInfo kZoneAsia_Tashkent ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Tehran // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 20 (originally 24) +// Memory (8-bit): 42 +// Memory (32-bit): 56 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Tehran[] ACE_TIME_PROGMEM = { @@ -4612,7 +4634,7 @@ static const basic::ZoneEra kZoneEraAsia_Tehran[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Tehran[] ACE_TIME_PROGMEM = "Asia/Tehran"; +static const char kZoneNameAsia_Tehran[] ACE_TIME_PROGMEM = "\x04" "Tehran"; const basic::ZoneInfo kZoneAsia_Tehran ACE_TIME_PROGMEM = { kZoneNameAsia_Tehran /*name*/, @@ -4625,9 +4647,9 @@ const basic::ZoneInfo kZoneAsia_Tehran ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Thimphu // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 13 (originally 17) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Thimphu[] ACE_TIME_PROGMEM = { @@ -4646,7 +4668,7 @@ static const basic::ZoneEra kZoneEraAsia_Thimphu[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Thimphu[] ACE_TIME_PROGMEM = "Asia/Thimphu"; +static const char kZoneNameAsia_Thimphu[] ACE_TIME_PROGMEM = "\x04" "Thimphu"; const basic::ZoneInfo kZoneAsia_Thimphu ACE_TIME_PROGMEM = { kZoneNameAsia_Thimphu /*name*/, @@ -4659,9 +4681,9 @@ const basic::ZoneInfo kZoneAsia_Thimphu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Tokyo // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Tokyo[] ACE_TIME_PROGMEM = { @@ -4680,7 +4702,7 @@ static const basic::ZoneEra kZoneEraAsia_Tokyo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Tokyo[] ACE_TIME_PROGMEM = "Asia/Tokyo"; +static const char kZoneNameAsia_Tokyo[] ACE_TIME_PROGMEM = "\x04" "Tokyo"; const basic::ZoneInfo kZoneAsia_Tokyo ACE_TIME_PROGMEM = { kZoneNameAsia_Tokyo /*name*/, @@ -4693,9 +4715,9 @@ const basic::ZoneInfo kZoneAsia_Tokyo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Ulaanbaatar // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 21 (originally 25) +// Memory (8-bit): 43 +// Memory (32-bit): 57 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Ulaanbaatar[] ACE_TIME_PROGMEM = { @@ -4714,7 +4736,7 @@ static const basic::ZoneEra kZoneEraAsia_Ulaanbaatar[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Ulaanbaatar[] ACE_TIME_PROGMEM = "Asia/Ulaanbaatar"; +static const char kZoneNameAsia_Ulaanbaatar[] ACE_TIME_PROGMEM = "\x04" "Ulaanbaatar"; const basic::ZoneInfo kZoneAsia_Ulaanbaatar ACE_TIME_PROGMEM = { kZoneNameAsia_Ulaanbaatar /*name*/, @@ -4727,9 +4749,9 @@ const basic::ZoneInfo kZoneAsia_Ulaanbaatar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Urumqi // Zone Eras: 1 -// Strings (bytes): 16 -// Memory (8-bit): 38 -// Memory (32-bit): 52 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Urumqi[] ACE_TIME_PROGMEM = { @@ -4748,7 +4770,7 @@ static const basic::ZoneEra kZoneEraAsia_Urumqi[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Urumqi[] ACE_TIME_PROGMEM = "Asia/Urumqi"; +static const char kZoneNameAsia_Urumqi[] ACE_TIME_PROGMEM = "\x04" "Urumqi"; const basic::ZoneInfo kZoneAsia_Urumqi ACE_TIME_PROGMEM = { kZoneNameAsia_Urumqi /*name*/, @@ -4761,9 +4783,9 @@ const basic::ZoneInfo kZoneAsia_Urumqi ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Yangon // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Yangon[] ACE_TIME_PROGMEM = { @@ -4782,7 +4804,7 @@ static const basic::ZoneEra kZoneEraAsia_Yangon[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Yangon[] ACE_TIME_PROGMEM = "Asia/Yangon"; +static const char kZoneNameAsia_Yangon[] ACE_TIME_PROGMEM = "\x04" "Yangon"; const basic::ZoneInfo kZoneAsia_Yangon ACE_TIME_PROGMEM = { kZoneNameAsia_Yangon /*name*/, @@ -4795,9 +4817,9 @@ const basic::ZoneInfo kZoneAsia_Yangon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Yerevan // Zone Eras: 2 -// Strings (bytes): 29 -// Memory (8-bit): 62 -// Memory (32-bit): 81 +// Strings (bytes): 25 (originally 29) +// Memory (8-bit): 58 +// Memory (32-bit): 77 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAsia_Yerevan[] ACE_TIME_PROGMEM = { @@ -4828,7 +4850,7 @@ static const basic::ZoneEra kZoneEraAsia_Yerevan[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Yerevan[] ACE_TIME_PROGMEM = "Asia/Yerevan"; +static const char kZoneNameAsia_Yerevan[] ACE_TIME_PROGMEM = "\x04" "Yerevan"; const basic::ZoneInfo kZoneAsia_Yerevan ACE_TIME_PROGMEM = { kZoneNameAsia_Yerevan /*name*/, @@ -4841,9 +4863,9 @@ const basic::ZoneInfo kZoneAsia_Yerevan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/Azores // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 16 (originally 24) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAtlantic_Azores[] ACE_TIME_PROGMEM = { @@ -4862,7 +4884,7 @@ static const basic::ZoneEra kZoneEraAtlantic_Azores[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAtlantic_Azores[] ACE_TIME_PROGMEM = "Atlantic/Azores"; +static const char kZoneNameAtlantic_Azores[] ACE_TIME_PROGMEM = "\x05" "Azores"; const basic::ZoneInfo kZoneAtlantic_Azores ACE_TIME_PROGMEM = { kZoneNameAtlantic_Azores /*name*/, @@ -4875,9 +4897,9 @@ const basic::ZoneInfo kZoneAtlantic_Azores ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/Bermuda // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 13 (originally 21) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAtlantic_Bermuda[] ACE_TIME_PROGMEM = { @@ -4896,7 +4918,7 @@ static const basic::ZoneEra kZoneEraAtlantic_Bermuda[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAtlantic_Bermuda[] ACE_TIME_PROGMEM = "Atlantic/Bermuda"; +static const char kZoneNameAtlantic_Bermuda[] ACE_TIME_PROGMEM = "\x05" "Bermuda"; const basic::ZoneInfo kZoneAtlantic_Bermuda ACE_TIME_PROGMEM = { kZoneNameAtlantic_Bermuda /*name*/, @@ -4909,9 +4931,9 @@ const basic::ZoneInfo kZoneAtlantic_Bermuda ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/Canary // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 13 (originally 21) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAtlantic_Canary[] ACE_TIME_PROGMEM = { @@ -4930,7 +4952,7 @@ static const basic::ZoneEra kZoneEraAtlantic_Canary[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAtlantic_Canary[] ACE_TIME_PROGMEM = "Atlantic/Canary"; +static const char kZoneNameAtlantic_Canary[] ACE_TIME_PROGMEM = "\x05" "Canary"; const basic::ZoneInfo kZoneAtlantic_Canary ACE_TIME_PROGMEM = { kZoneNameAtlantic_Canary /*name*/, @@ -4943,9 +4965,9 @@ const basic::ZoneInfo kZoneAtlantic_Canary ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/Cape_Verde // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 16 (originally 24) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAtlantic_Cape_Verde[] ACE_TIME_PROGMEM = { @@ -4964,7 +4986,7 @@ static const basic::ZoneEra kZoneEraAtlantic_Cape_Verde[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAtlantic_Cape_Verde[] ACE_TIME_PROGMEM = "Atlantic/Cape_Verde"; +static const char kZoneNameAtlantic_Cape_Verde[] ACE_TIME_PROGMEM = "\x05" "Cape_Verde"; const basic::ZoneInfo kZoneAtlantic_Cape_Verde ACE_TIME_PROGMEM = { kZoneNameAtlantic_Cape_Verde /*name*/, @@ -4977,9 +4999,9 @@ const basic::ZoneInfo kZoneAtlantic_Cape_Verde ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/Faroe // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 12 (originally 20) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAtlantic_Faroe[] ACE_TIME_PROGMEM = { @@ -4998,7 +5020,7 @@ static const basic::ZoneEra kZoneEraAtlantic_Faroe[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAtlantic_Faroe[] ACE_TIME_PROGMEM = "Atlantic/Faroe"; +static const char kZoneNameAtlantic_Faroe[] ACE_TIME_PROGMEM = "\x05" "Faroe"; const basic::ZoneInfo kZoneAtlantic_Faroe ACE_TIME_PROGMEM = { kZoneNameAtlantic_Faroe /*name*/, @@ -5011,9 +5033,9 @@ const basic::ZoneInfo kZoneAtlantic_Faroe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/Madeira // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 14 (originally 22) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAtlantic_Madeira[] ACE_TIME_PROGMEM = { @@ -5032,7 +5054,7 @@ static const basic::ZoneEra kZoneEraAtlantic_Madeira[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAtlantic_Madeira[] ACE_TIME_PROGMEM = "Atlantic/Madeira"; +static const char kZoneNameAtlantic_Madeira[] ACE_TIME_PROGMEM = "\x05" "Madeira"; const basic::ZoneInfo kZoneAtlantic_Madeira ACE_TIME_PROGMEM = { kZoneNameAtlantic_Madeira /*name*/, @@ -5045,9 +5067,9 @@ const basic::ZoneInfo kZoneAtlantic_Madeira ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/Reykjavik // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 15 (originally 23) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAtlantic_Reykjavik[] ACE_TIME_PROGMEM = { @@ -5066,7 +5088,7 @@ static const basic::ZoneEra kZoneEraAtlantic_Reykjavik[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAtlantic_Reykjavik[] ACE_TIME_PROGMEM = "Atlantic/Reykjavik"; +static const char kZoneNameAtlantic_Reykjavik[] ACE_TIME_PROGMEM = "\x05" "Reykjavik"; const basic::ZoneInfo kZoneAtlantic_Reykjavik ACE_TIME_PROGMEM = { kZoneNameAtlantic_Reykjavik /*name*/, @@ -5079,9 +5101,9 @@ const basic::ZoneInfo kZoneAtlantic_Reykjavik ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/South_Georgia // Zone Eras: 1 -// Strings (bytes): 27 -// Memory (8-bit): 49 -// Memory (32-bit): 63 +// Strings (bytes): 19 (originally 27) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAtlantic_South_Georgia[] ACE_TIME_PROGMEM = { @@ -5100,7 +5122,7 @@ static const basic::ZoneEra kZoneEraAtlantic_South_Georgia[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAtlantic_South_Georgia[] ACE_TIME_PROGMEM = "Atlantic/South_Georgia"; +static const char kZoneNameAtlantic_South_Georgia[] ACE_TIME_PROGMEM = "\x05" "South_Georgia"; const basic::ZoneInfo kZoneAtlantic_South_Georgia ACE_TIME_PROGMEM = { kZoneNameAtlantic_South_Georgia /*name*/, @@ -5113,9 +5135,9 @@ const basic::ZoneInfo kZoneAtlantic_South_Georgia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Adelaide // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 15 (originally 24) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAustralia_Adelaide[] ACE_TIME_PROGMEM = { @@ -5134,7 +5156,7 @@ static const basic::ZoneEra kZoneEraAustralia_Adelaide[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Adelaide[] ACE_TIME_PROGMEM = "Australia/Adelaide"; +static const char kZoneNameAustralia_Adelaide[] ACE_TIME_PROGMEM = "\x06" "Adelaide"; const basic::ZoneInfo kZoneAustralia_Adelaide ACE_TIME_PROGMEM = { kZoneNameAustralia_Adelaide /*name*/, @@ -5147,9 +5169,9 @@ const basic::ZoneInfo kZoneAustralia_Adelaide ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Brisbane // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 15 (originally 24) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAustralia_Brisbane[] ACE_TIME_PROGMEM = { @@ -5168,7 +5190,7 @@ static const basic::ZoneEra kZoneEraAustralia_Brisbane[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Brisbane[] ACE_TIME_PROGMEM = "Australia/Brisbane"; +static const char kZoneNameAustralia_Brisbane[] ACE_TIME_PROGMEM = "\x06" "Brisbane"; const basic::ZoneInfo kZoneAustralia_Brisbane ACE_TIME_PROGMEM = { kZoneNameAustralia_Brisbane /*name*/, @@ -5181,9 +5203,9 @@ const basic::ZoneInfo kZoneAustralia_Brisbane ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Broken_Hill // Zone Eras: 2 -// Strings (bytes): 32 -// Memory (8-bit): 65 -// Memory (32-bit): 84 +// Strings (bytes): 23 (originally 32) +// Memory (8-bit): 56 +// Memory (32-bit): 75 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAustralia_Broken_Hill[] ACE_TIME_PROGMEM = { @@ -5214,7 +5236,7 @@ static const basic::ZoneEra kZoneEraAustralia_Broken_Hill[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Broken_Hill[] ACE_TIME_PROGMEM = "Australia/Broken_Hill"; +static const char kZoneNameAustralia_Broken_Hill[] ACE_TIME_PROGMEM = "\x06" "Broken_Hill"; const basic::ZoneInfo kZoneAustralia_Broken_Hill ACE_TIME_PROGMEM = { kZoneNameAustralia_Broken_Hill /*name*/, @@ -5227,9 +5249,9 @@ const basic::ZoneInfo kZoneAustralia_Broken_Hill ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Darwin // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 13 (originally 22) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAustralia_Darwin[] ACE_TIME_PROGMEM = { @@ -5248,7 +5270,7 @@ static const basic::ZoneEra kZoneEraAustralia_Darwin[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Darwin[] ACE_TIME_PROGMEM = "Australia/Darwin"; +static const char kZoneNameAustralia_Darwin[] ACE_TIME_PROGMEM = "\x06" "Darwin"; const basic::ZoneInfo kZoneAustralia_Darwin ACE_TIME_PROGMEM = { kZoneNameAustralia_Darwin /*name*/, @@ -5261,9 +5283,9 @@ const basic::ZoneInfo kZoneAustralia_Darwin ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Eucla // Zone Eras: 1 -// Strings (bytes): 28 -// Memory (8-bit): 50 -// Memory (32-bit): 64 +// Strings (bytes): 19 (originally 28) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAustralia_Eucla[] ACE_TIME_PROGMEM = { @@ -5282,7 +5304,7 @@ static const basic::ZoneEra kZoneEraAustralia_Eucla[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Eucla[] ACE_TIME_PROGMEM = "Australia/Eucla"; +static const char kZoneNameAustralia_Eucla[] ACE_TIME_PROGMEM = "\x06" "Eucla"; const basic::ZoneInfo kZoneAustralia_Eucla ACE_TIME_PROGMEM = { kZoneNameAustralia_Eucla /*name*/, @@ -5295,9 +5317,9 @@ const basic::ZoneInfo kZoneAustralia_Eucla ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Hobart // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 13 (originally 22) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAustralia_Hobart[] ACE_TIME_PROGMEM = { @@ -5316,7 +5338,7 @@ static const basic::ZoneEra kZoneEraAustralia_Hobart[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Hobart[] ACE_TIME_PROGMEM = "Australia/Hobart"; +static const char kZoneNameAustralia_Hobart[] ACE_TIME_PROGMEM = "\x06" "Hobart"; const basic::ZoneInfo kZoneAustralia_Hobart ACE_TIME_PROGMEM = { kZoneNameAustralia_Hobart /*name*/, @@ -5329,9 +5351,9 @@ const basic::ZoneInfo kZoneAustralia_Hobart ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Lindeman // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 15 (originally 24) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAustralia_Lindeman[] ACE_TIME_PROGMEM = { @@ -5350,7 +5372,7 @@ static const basic::ZoneEra kZoneEraAustralia_Lindeman[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Lindeman[] ACE_TIME_PROGMEM = "Australia/Lindeman"; +static const char kZoneNameAustralia_Lindeman[] ACE_TIME_PROGMEM = "\x06" "Lindeman"; const basic::ZoneInfo kZoneAustralia_Lindeman ACE_TIME_PROGMEM = { kZoneNameAustralia_Lindeman /*name*/, @@ -5363,9 +5385,9 @@ const basic::ZoneInfo kZoneAustralia_Lindeman ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Lord_Howe // Zone Eras: 1 -// Strings (bytes): 30 -// Memory (8-bit): 52 -// Memory (32-bit): 66 +// Strings (bytes): 21 (originally 30) +// Memory (8-bit): 43 +// Memory (32-bit): 57 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAustralia_Lord_Howe[] ACE_TIME_PROGMEM = { @@ -5384,7 +5406,7 @@ static const basic::ZoneEra kZoneEraAustralia_Lord_Howe[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Lord_Howe[] ACE_TIME_PROGMEM = "Australia/Lord_Howe"; +static const char kZoneNameAustralia_Lord_Howe[] ACE_TIME_PROGMEM = "\x06" "Lord_Howe"; const basic::ZoneInfo kZoneAustralia_Lord_Howe ACE_TIME_PROGMEM = { kZoneNameAustralia_Lord_Howe /*name*/, @@ -5397,9 +5419,9 @@ const basic::ZoneInfo kZoneAustralia_Lord_Howe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Melbourne // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 16 (originally 25) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAustralia_Melbourne[] ACE_TIME_PROGMEM = { @@ -5418,7 +5440,7 @@ static const basic::ZoneEra kZoneEraAustralia_Melbourne[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Melbourne[] ACE_TIME_PROGMEM = "Australia/Melbourne"; +static const char kZoneNameAustralia_Melbourne[] ACE_TIME_PROGMEM = "\x06" "Melbourne"; const basic::ZoneInfo kZoneAustralia_Melbourne ACE_TIME_PROGMEM = { kZoneNameAustralia_Melbourne /*name*/, @@ -5431,9 +5453,9 @@ const basic::ZoneInfo kZoneAustralia_Melbourne ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Perth // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 12 (originally 21) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAustralia_Perth[] ACE_TIME_PROGMEM = { @@ -5452,7 +5474,7 @@ static const basic::ZoneEra kZoneEraAustralia_Perth[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Perth[] ACE_TIME_PROGMEM = "Australia/Perth"; +static const char kZoneNameAustralia_Perth[] ACE_TIME_PROGMEM = "\x06" "Perth"; const basic::ZoneInfo kZoneAustralia_Perth ACE_TIME_PROGMEM = { kZoneNameAustralia_Perth /*name*/, @@ -5465,9 +5487,9 @@ const basic::ZoneInfo kZoneAustralia_Perth ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Sydney // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 13 (originally 22) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraAustralia_Sydney[] ACE_TIME_PROGMEM = { @@ -5486,7 +5508,7 @@ static const basic::ZoneEra kZoneEraAustralia_Sydney[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Sydney[] ACE_TIME_PROGMEM = "Australia/Sydney"; +static const char kZoneNameAustralia_Sydney[] ACE_TIME_PROGMEM = "\x06" "Sydney"; const basic::ZoneInfo kZoneAustralia_Sydney ACE_TIME_PROGMEM = { kZoneNameAustralia_Sydney /*name*/, @@ -5499,7 +5521,7 @@ const basic::ZoneInfo kZoneAustralia_Sydney ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: CET // Zone Eras: 1 -// Strings (bytes): 9 +// Strings (bytes): 9 (originally 9) // Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- @@ -5533,7 +5555,7 @@ const basic::ZoneInfo kZoneCET ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: CST6CDT // Zone Eras: 1 -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -5567,7 +5589,7 @@ const basic::ZoneInfo kZoneCST6CDT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: EET // Zone Eras: 1 -// Strings (bytes): 9 +// Strings (bytes): 9 (originally 9) // Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- @@ -5601,7 +5623,7 @@ const basic::ZoneInfo kZoneEET ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: EST // Zone Eras: 1 -// Strings (bytes): 8 +// Strings (bytes): 8 (originally 8) // Memory (8-bit): 30 // Memory (32-bit): 44 //--------------------------------------------------------------------------- @@ -5635,7 +5657,7 @@ const basic::ZoneInfo kZoneEST ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: EST5EDT // Zone Eras: 1 -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -5669,9 +5691,9 @@ const basic::ZoneInfo kZoneEST5EDT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT // Zone Eras: 1 -// Strings (bytes): 12 -// Memory (8-bit): 34 -// Memory (32-bit): 48 +// Strings (bytes): 9 (originally 12) +// Memory (8-bit): 31 +// Memory (32-bit): 45 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT[] ACE_TIME_PROGMEM = { @@ -5690,7 +5712,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT[] ACE_TIME_PROGMEM = "Etc/GMT"; +static const char kZoneNameEtc_GMT[] ACE_TIME_PROGMEM = "\x08" "GMT"; const basic::ZoneInfo kZoneEtc_GMT ACE_TIME_PROGMEM = { kZoneNameEtc_GMT /*name*/, @@ -5703,9 +5725,9 @@ const basic::ZoneInfo kZoneEtc_GMT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+1 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_1[] ACE_TIME_PROGMEM = { @@ -5724,7 +5746,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_1[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_1[] ACE_TIME_PROGMEM = "Etc/GMT+1"; +static const char kZoneNameEtc_GMT_PLUS_1[] ACE_TIME_PROGMEM = "\x08" "GMT+1"; const basic::ZoneInfo kZoneEtc_GMT_PLUS_1 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_1 /*name*/, @@ -5737,9 +5759,9 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_1 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+10 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_10[] ACE_TIME_PROGMEM = { @@ -5758,7 +5780,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_10[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_10[] ACE_TIME_PROGMEM = "Etc/GMT+10"; +static const char kZoneNameEtc_GMT_PLUS_10[] ACE_TIME_PROGMEM = "\x08" "GMT+10"; const basic::ZoneInfo kZoneEtc_GMT_PLUS_10 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_10 /*name*/, @@ -5771,9 +5793,9 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_10 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+11 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_11[] ACE_TIME_PROGMEM = { @@ -5792,7 +5814,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_11[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_11[] ACE_TIME_PROGMEM = "Etc/GMT+11"; +static const char kZoneNameEtc_GMT_PLUS_11[] ACE_TIME_PROGMEM = "\x08" "GMT+11"; const basic::ZoneInfo kZoneEtc_GMT_PLUS_11 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_11 /*name*/, @@ -5805,9 +5827,9 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_11 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+12 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_12[] ACE_TIME_PROGMEM = { @@ -5826,7 +5848,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_12[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_12[] ACE_TIME_PROGMEM = "Etc/GMT+12"; +static const char kZoneNameEtc_GMT_PLUS_12[] ACE_TIME_PROGMEM = "\x08" "GMT+12"; const basic::ZoneInfo kZoneEtc_GMT_PLUS_12 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_12 /*name*/, @@ -5839,9 +5861,9 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_12 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+2 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_2[] ACE_TIME_PROGMEM = { @@ -5860,7 +5882,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_2[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_2[] ACE_TIME_PROGMEM = "Etc/GMT+2"; +static const char kZoneNameEtc_GMT_PLUS_2[] ACE_TIME_PROGMEM = "\x08" "GMT+2"; const basic::ZoneInfo kZoneEtc_GMT_PLUS_2 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_2 /*name*/, @@ -5873,9 +5895,9 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_2 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+3 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_3[] ACE_TIME_PROGMEM = { @@ -5894,7 +5916,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_3[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_3[] ACE_TIME_PROGMEM = "Etc/GMT+3"; +static const char kZoneNameEtc_GMT_PLUS_3[] ACE_TIME_PROGMEM = "\x08" "GMT+3"; const basic::ZoneInfo kZoneEtc_GMT_PLUS_3 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_3 /*name*/, @@ -5907,9 +5929,9 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_3 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+4 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_4[] ACE_TIME_PROGMEM = { @@ -5928,7 +5950,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_4[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_4[] ACE_TIME_PROGMEM = "Etc/GMT+4"; +static const char kZoneNameEtc_GMT_PLUS_4[] ACE_TIME_PROGMEM = "\x08" "GMT+4"; const basic::ZoneInfo kZoneEtc_GMT_PLUS_4 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_4 /*name*/, @@ -5941,9 +5963,9 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_4 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+5 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_5[] ACE_TIME_PROGMEM = { @@ -5962,7 +5984,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_5[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_5[] ACE_TIME_PROGMEM = "Etc/GMT+5"; +static const char kZoneNameEtc_GMT_PLUS_5[] ACE_TIME_PROGMEM = "\x08" "GMT+5"; const basic::ZoneInfo kZoneEtc_GMT_PLUS_5 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_5 /*name*/, @@ -5975,9 +5997,9 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_5 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+6 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_6[] ACE_TIME_PROGMEM = { @@ -5996,7 +6018,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_6[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_6[] ACE_TIME_PROGMEM = "Etc/GMT+6"; +static const char kZoneNameEtc_GMT_PLUS_6[] ACE_TIME_PROGMEM = "\x08" "GMT+6"; const basic::ZoneInfo kZoneEtc_GMT_PLUS_6 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_6 /*name*/, @@ -6007,11 +6029,11 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_6 ACE_TIME_PROGMEM = { }; //--------------------------------------------------------------------------- -// Zone name: Etc/GMT+7 -// Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Zone name: Etc/GMT+7 +// Zone Eras: 1 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_7[] ACE_TIME_PROGMEM = { @@ -6030,7 +6052,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_7[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_7[] ACE_TIME_PROGMEM = "Etc/GMT+7"; +static const char kZoneNameEtc_GMT_PLUS_7[] ACE_TIME_PROGMEM = "\x08" "GMT+7"; const basic::ZoneInfo kZoneEtc_GMT_PLUS_7 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_7 /*name*/, @@ -6043,9 +6065,9 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_7 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+8 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_8[] ACE_TIME_PROGMEM = { @@ -6064,7 +6086,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_8[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_8[] ACE_TIME_PROGMEM = "Etc/GMT+8"; +static const char kZoneNameEtc_GMT_PLUS_8[] ACE_TIME_PROGMEM = "\x08" "GMT+8"; const basic::ZoneInfo kZoneEtc_GMT_PLUS_8 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_8 /*name*/, @@ -6077,9 +6099,9 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_8 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+9 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_9[] ACE_TIME_PROGMEM = { @@ -6098,7 +6120,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_9[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_9[] ACE_TIME_PROGMEM = "Etc/GMT+9"; +static const char kZoneNameEtc_GMT_PLUS_9[] ACE_TIME_PROGMEM = "\x08" "GMT+9"; const basic::ZoneInfo kZoneEtc_GMT_PLUS_9 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_9 /*name*/, @@ -6111,9 +6133,9 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_9 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-1 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_1[] ACE_TIME_PROGMEM = { @@ -6132,7 +6154,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_1[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_1[] ACE_TIME_PROGMEM = "Etc/GMT-1"; +static const char kZoneNameEtc_GMT_1[] ACE_TIME_PROGMEM = "\x08" "GMT-1"; const basic::ZoneInfo kZoneEtc_GMT_1 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_1 /*name*/, @@ -6145,9 +6167,9 @@ const basic::ZoneInfo kZoneEtc_GMT_1 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-10 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_10[] ACE_TIME_PROGMEM = { @@ -6166,7 +6188,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_10[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_10[] ACE_TIME_PROGMEM = "Etc/GMT-10"; +static const char kZoneNameEtc_GMT_10[] ACE_TIME_PROGMEM = "\x08" "GMT-10"; const basic::ZoneInfo kZoneEtc_GMT_10 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_10 /*name*/, @@ -6179,9 +6201,9 @@ const basic::ZoneInfo kZoneEtc_GMT_10 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-11 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_11[] ACE_TIME_PROGMEM = { @@ -6200,7 +6222,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_11[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_11[] ACE_TIME_PROGMEM = "Etc/GMT-11"; +static const char kZoneNameEtc_GMT_11[] ACE_TIME_PROGMEM = "\x08" "GMT-11"; const basic::ZoneInfo kZoneEtc_GMT_11 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_11 /*name*/, @@ -6213,9 +6235,9 @@ const basic::ZoneInfo kZoneEtc_GMT_11 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-12 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_12[] ACE_TIME_PROGMEM = { @@ -6234,7 +6256,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_12[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_12[] ACE_TIME_PROGMEM = "Etc/GMT-12"; +static const char kZoneNameEtc_GMT_12[] ACE_TIME_PROGMEM = "\x08" "GMT-12"; const basic::ZoneInfo kZoneEtc_GMT_12 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_12 /*name*/, @@ -6247,9 +6269,9 @@ const basic::ZoneInfo kZoneEtc_GMT_12 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-13 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_13[] ACE_TIME_PROGMEM = { @@ -6268,7 +6290,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_13[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_13[] ACE_TIME_PROGMEM = "Etc/GMT-13"; +static const char kZoneNameEtc_GMT_13[] ACE_TIME_PROGMEM = "\x08" "GMT-13"; const basic::ZoneInfo kZoneEtc_GMT_13 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_13 /*name*/, @@ -6281,9 +6303,9 @@ const basic::ZoneInfo kZoneEtc_GMT_13 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-14 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_14[] ACE_TIME_PROGMEM = { @@ -6302,7 +6324,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_14[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_14[] ACE_TIME_PROGMEM = "Etc/GMT-14"; +static const char kZoneNameEtc_GMT_14[] ACE_TIME_PROGMEM = "\x08" "GMT-14"; const basic::ZoneInfo kZoneEtc_GMT_14 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_14 /*name*/, @@ -6315,9 +6337,9 @@ const basic::ZoneInfo kZoneEtc_GMT_14 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-2 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_2[] ACE_TIME_PROGMEM = { @@ -6336,7 +6358,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_2[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_2[] ACE_TIME_PROGMEM = "Etc/GMT-2"; +static const char kZoneNameEtc_GMT_2[] ACE_TIME_PROGMEM = "\x08" "GMT-2"; const basic::ZoneInfo kZoneEtc_GMT_2 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_2 /*name*/, @@ -6349,9 +6371,9 @@ const basic::ZoneInfo kZoneEtc_GMT_2 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-3 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_3[] ACE_TIME_PROGMEM = { @@ -6370,7 +6392,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_3[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_3[] ACE_TIME_PROGMEM = "Etc/GMT-3"; +static const char kZoneNameEtc_GMT_3[] ACE_TIME_PROGMEM = "\x08" "GMT-3"; const basic::ZoneInfo kZoneEtc_GMT_3 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_3 /*name*/, @@ -6383,9 +6405,9 @@ const basic::ZoneInfo kZoneEtc_GMT_3 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-4 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_4[] ACE_TIME_PROGMEM = { @@ -6404,7 +6426,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_4[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_4[] ACE_TIME_PROGMEM = "Etc/GMT-4"; +static const char kZoneNameEtc_GMT_4[] ACE_TIME_PROGMEM = "\x08" "GMT-4"; const basic::ZoneInfo kZoneEtc_GMT_4 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_4 /*name*/, @@ -6417,9 +6439,9 @@ const basic::ZoneInfo kZoneEtc_GMT_4 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-5 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_5[] ACE_TIME_PROGMEM = { @@ -6438,7 +6460,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_5[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_5[] ACE_TIME_PROGMEM = "Etc/GMT-5"; +static const char kZoneNameEtc_GMT_5[] ACE_TIME_PROGMEM = "\x08" "GMT-5"; const basic::ZoneInfo kZoneEtc_GMT_5 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_5 /*name*/, @@ -6451,9 +6473,9 @@ const basic::ZoneInfo kZoneEtc_GMT_5 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-6 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_6[] ACE_TIME_PROGMEM = { @@ -6472,7 +6494,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_6[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_6[] ACE_TIME_PROGMEM = "Etc/GMT-6"; +static const char kZoneNameEtc_GMT_6[] ACE_TIME_PROGMEM = "\x08" "GMT-6"; const basic::ZoneInfo kZoneEtc_GMT_6 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_6 /*name*/, @@ -6485,9 +6507,9 @@ const basic::ZoneInfo kZoneEtc_GMT_6 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-7 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_7[] ACE_TIME_PROGMEM = { @@ -6506,7 +6528,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_7[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_7[] ACE_TIME_PROGMEM = "Etc/GMT-7"; +static const char kZoneNameEtc_GMT_7[] ACE_TIME_PROGMEM = "\x08" "GMT-7"; const basic::ZoneInfo kZoneEtc_GMT_7 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_7 /*name*/, @@ -6519,9 +6541,9 @@ const basic::ZoneInfo kZoneEtc_GMT_7 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-8 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_8[] ACE_TIME_PROGMEM = { @@ -6540,7 +6562,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_8[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_8[] ACE_TIME_PROGMEM = "Etc/GMT-8"; +static const char kZoneNameEtc_GMT_8[] ACE_TIME_PROGMEM = "\x08" "GMT-8"; const basic::ZoneInfo kZoneEtc_GMT_8 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_8 /*name*/, @@ -6553,9 +6575,9 @@ const basic::ZoneInfo kZoneEtc_GMT_8 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-9 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_GMT_9[] ACE_TIME_PROGMEM = { @@ -6574,7 +6596,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_9[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_9[] ACE_TIME_PROGMEM = "Etc/GMT-9"; +static const char kZoneNameEtc_GMT_9[] ACE_TIME_PROGMEM = "\x08" "GMT-9"; const basic::ZoneInfo kZoneEtc_GMT_9 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_9 /*name*/, @@ -6587,9 +6609,9 @@ const basic::ZoneInfo kZoneEtc_GMT_9 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/UTC // Zone Eras: 1 -// Strings (bytes): 12 -// Memory (8-bit): 34 -// Memory (32-bit): 48 +// Strings (bytes): 9 (originally 12) +// Memory (8-bit): 31 +// Memory (32-bit): 45 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEtc_UTC[] ACE_TIME_PROGMEM = { @@ -6608,7 +6630,7 @@ static const basic::ZoneEra kZoneEraEtc_UTC[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_UTC[] ACE_TIME_PROGMEM = "Etc/UTC"; +static const char kZoneNameEtc_UTC[] ACE_TIME_PROGMEM = "\x08" "UTC"; const basic::ZoneInfo kZoneEtc_UTC ACE_TIME_PROGMEM = { kZoneNameEtc_UTC /*name*/, @@ -6621,9 +6643,9 @@ const basic::ZoneInfo kZoneEtc_UTC ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Amsterdam // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 16 (originally 22) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Amsterdam[] ACE_TIME_PROGMEM = { @@ -6642,7 +6664,7 @@ static const basic::ZoneEra kZoneEraEurope_Amsterdam[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Amsterdam[] ACE_TIME_PROGMEM = "Europe/Amsterdam"; +static const char kZoneNameEurope_Amsterdam[] ACE_TIME_PROGMEM = "\x09" "Amsterdam"; const basic::ZoneInfo kZoneEurope_Amsterdam ACE_TIME_PROGMEM = { kZoneNameEurope_Amsterdam /*name*/, @@ -6655,9 +6677,9 @@ const basic::ZoneInfo kZoneEurope_Amsterdam ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Andorra // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 14 (originally 20) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Andorra[] ACE_TIME_PROGMEM = { @@ -6676,7 +6698,7 @@ static const basic::ZoneEra kZoneEraEurope_Andorra[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Andorra[] ACE_TIME_PROGMEM = "Europe/Andorra"; +static const char kZoneNameEurope_Andorra[] ACE_TIME_PROGMEM = "\x09" "Andorra"; const basic::ZoneInfo kZoneEurope_Andorra ACE_TIME_PROGMEM = { kZoneNameEurope_Andorra /*name*/, @@ -6689,9 +6711,9 @@ const basic::ZoneInfo kZoneEurope_Andorra ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Athens // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Athens[] ACE_TIME_PROGMEM = { @@ -6710,7 +6732,7 @@ static const basic::ZoneEra kZoneEraEurope_Athens[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Athens[] ACE_TIME_PROGMEM = "Europe/Athens"; +static const char kZoneNameEurope_Athens[] ACE_TIME_PROGMEM = "\x09" "Athens"; const basic::ZoneInfo kZoneEurope_Athens ACE_TIME_PROGMEM = { kZoneNameEurope_Athens /*name*/, @@ -6723,9 +6745,9 @@ const basic::ZoneInfo kZoneEurope_Athens ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Belgrade // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Belgrade[] ACE_TIME_PROGMEM = { @@ -6744,7 +6766,7 @@ static const basic::ZoneEra kZoneEraEurope_Belgrade[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Belgrade[] ACE_TIME_PROGMEM = "Europe/Belgrade"; +static const char kZoneNameEurope_Belgrade[] ACE_TIME_PROGMEM = "\x09" "Belgrade"; const basic::ZoneInfo kZoneEurope_Belgrade ACE_TIME_PROGMEM = { kZoneNameEurope_Belgrade /*name*/, @@ -6757,9 +6779,9 @@ const basic::ZoneInfo kZoneEurope_Belgrade ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Berlin // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Berlin[] ACE_TIME_PROGMEM = { @@ -6778,7 +6800,7 @@ static const basic::ZoneEra kZoneEraEurope_Berlin[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Berlin[] ACE_TIME_PROGMEM = "Europe/Berlin"; +static const char kZoneNameEurope_Berlin[] ACE_TIME_PROGMEM = "\x09" "Berlin"; const basic::ZoneInfo kZoneEurope_Berlin ACE_TIME_PROGMEM = { kZoneNameEurope_Berlin /*name*/, @@ -6791,9 +6813,9 @@ const basic::ZoneInfo kZoneEurope_Berlin ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Brussels // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Brussels[] ACE_TIME_PROGMEM = { @@ -6812,7 +6834,7 @@ static const basic::ZoneEra kZoneEraEurope_Brussels[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Brussels[] ACE_TIME_PROGMEM = "Europe/Brussels"; +static const char kZoneNameEurope_Brussels[] ACE_TIME_PROGMEM = "\x09" "Brussels"; const basic::ZoneInfo kZoneEurope_Brussels ACE_TIME_PROGMEM = { kZoneNameEurope_Brussels /*name*/, @@ -6825,9 +6847,9 @@ const basic::ZoneInfo kZoneEurope_Brussels ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Bucharest // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 16 (originally 22) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Bucharest[] ACE_TIME_PROGMEM = { @@ -6846,7 +6868,7 @@ static const basic::ZoneEra kZoneEraEurope_Bucharest[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Bucharest[] ACE_TIME_PROGMEM = "Europe/Bucharest"; +static const char kZoneNameEurope_Bucharest[] ACE_TIME_PROGMEM = "\x09" "Bucharest"; const basic::ZoneInfo kZoneEurope_Bucharest ACE_TIME_PROGMEM = { kZoneNameEurope_Bucharest /*name*/, @@ -6859,9 +6881,9 @@ const basic::ZoneInfo kZoneEurope_Bucharest ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Budapest // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Budapest[] ACE_TIME_PROGMEM = { @@ -6880,7 +6902,7 @@ static const basic::ZoneEra kZoneEraEurope_Budapest[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Budapest[] ACE_TIME_PROGMEM = "Europe/Budapest"; +static const char kZoneNameEurope_Budapest[] ACE_TIME_PROGMEM = "\x09" "Budapest"; const basic::ZoneInfo kZoneEurope_Budapest ACE_TIME_PROGMEM = { kZoneNameEurope_Budapest /*name*/, @@ -6893,9 +6915,9 @@ const basic::ZoneInfo kZoneEurope_Budapest ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Chisinau // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Chisinau[] ACE_TIME_PROGMEM = { @@ -6914,7 +6936,7 @@ static const basic::ZoneEra kZoneEraEurope_Chisinau[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Chisinau[] ACE_TIME_PROGMEM = "Europe/Chisinau"; +static const char kZoneNameEurope_Chisinau[] ACE_TIME_PROGMEM = "\x09" "Chisinau"; const basic::ZoneInfo kZoneEurope_Chisinau ACE_TIME_PROGMEM = { kZoneNameEurope_Chisinau /*name*/, @@ -6927,9 +6949,9 @@ const basic::ZoneInfo kZoneEurope_Chisinau ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Copenhagen // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 17 (originally 23) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Copenhagen[] ACE_TIME_PROGMEM = { @@ -6948,7 +6970,7 @@ static const basic::ZoneEra kZoneEraEurope_Copenhagen[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Copenhagen[] ACE_TIME_PROGMEM = "Europe/Copenhagen"; +static const char kZoneNameEurope_Copenhagen[] ACE_TIME_PROGMEM = "\x09" "Copenhagen"; const basic::ZoneInfo kZoneEurope_Copenhagen ACE_TIME_PROGMEM = { kZoneNameEurope_Copenhagen /*name*/, @@ -6961,9 +6983,9 @@ const basic::ZoneInfo kZoneEurope_Copenhagen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Dublin // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 16 (originally 22) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Dublin[] ACE_TIME_PROGMEM = { @@ -6982,7 +7004,7 @@ static const basic::ZoneEra kZoneEraEurope_Dublin[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Dublin[] ACE_TIME_PROGMEM = "Europe/Dublin"; +static const char kZoneNameEurope_Dublin[] ACE_TIME_PROGMEM = "\x09" "Dublin"; const basic::ZoneInfo kZoneEurope_Dublin ACE_TIME_PROGMEM = { kZoneNameEurope_Dublin /*name*/, @@ -6995,9 +7017,9 @@ const basic::ZoneInfo kZoneEurope_Dublin ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Gibraltar // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 16 (originally 22) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Gibraltar[] ACE_TIME_PROGMEM = { @@ -7016,7 +7038,7 @@ static const basic::ZoneEra kZoneEraEurope_Gibraltar[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Gibraltar[] ACE_TIME_PROGMEM = "Europe/Gibraltar"; +static const char kZoneNameEurope_Gibraltar[] ACE_TIME_PROGMEM = "\x09" "Gibraltar"; const basic::ZoneInfo kZoneEurope_Gibraltar ACE_TIME_PROGMEM = { kZoneNameEurope_Gibraltar /*name*/, @@ -7029,9 +7051,9 @@ const basic::ZoneInfo kZoneEurope_Gibraltar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Helsinki // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Helsinki[] ACE_TIME_PROGMEM = { @@ -7050,7 +7072,7 @@ static const basic::ZoneEra kZoneEraEurope_Helsinki[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Helsinki[] ACE_TIME_PROGMEM = "Europe/Helsinki"; +static const char kZoneNameEurope_Helsinki[] ACE_TIME_PROGMEM = "\x09" "Helsinki"; const basic::ZoneInfo kZoneEurope_Helsinki ACE_TIME_PROGMEM = { kZoneNameEurope_Helsinki /*name*/, @@ -7063,9 +7085,9 @@ const basic::ZoneInfo kZoneEurope_Helsinki ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Kiev // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Kiev[] ACE_TIME_PROGMEM = { @@ -7084,7 +7106,7 @@ static const basic::ZoneEra kZoneEraEurope_Kiev[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Kiev[] ACE_TIME_PROGMEM = "Europe/Kiev"; +static const char kZoneNameEurope_Kiev[] ACE_TIME_PROGMEM = "\x09" "Kiev"; const basic::ZoneInfo kZoneEurope_Kiev ACE_TIME_PROGMEM = { kZoneNameEurope_Kiev /*name*/, @@ -7097,9 +7119,9 @@ const basic::ZoneInfo kZoneEurope_Kiev ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Lisbon // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Lisbon[] ACE_TIME_PROGMEM = { @@ -7118,7 +7140,7 @@ static const basic::ZoneEra kZoneEraEurope_Lisbon[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Lisbon[] ACE_TIME_PROGMEM = "Europe/Lisbon"; +static const char kZoneNameEurope_Lisbon[] ACE_TIME_PROGMEM = "\x09" "Lisbon"; const basic::ZoneInfo kZoneEurope_Lisbon ACE_TIME_PROGMEM = { kZoneNameEurope_Lisbon /*name*/, @@ -7131,9 +7153,9 @@ const basic::ZoneInfo kZoneEurope_Lisbon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/London // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 16 (originally 22) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_London[] ACE_TIME_PROGMEM = { @@ -7152,7 +7174,7 @@ static const basic::ZoneEra kZoneEraEurope_London[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_London[] ACE_TIME_PROGMEM = "Europe/London"; +static const char kZoneNameEurope_London[] ACE_TIME_PROGMEM = "\x09" "London"; const basic::ZoneInfo kZoneEurope_London ACE_TIME_PROGMEM = { kZoneNameEurope_London /*name*/, @@ -7165,9 +7187,9 @@ const basic::ZoneInfo kZoneEurope_London ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Luxembourg // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 17 (originally 23) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Luxembourg[] ACE_TIME_PROGMEM = { @@ -7186,7 +7208,7 @@ static const basic::ZoneEra kZoneEraEurope_Luxembourg[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Luxembourg[] ACE_TIME_PROGMEM = "Europe/Luxembourg"; +static const char kZoneNameEurope_Luxembourg[] ACE_TIME_PROGMEM = "\x09" "Luxembourg"; const basic::ZoneInfo kZoneEurope_Luxembourg ACE_TIME_PROGMEM = { kZoneNameEurope_Luxembourg /*name*/, @@ -7199,9 +7221,9 @@ const basic::ZoneInfo kZoneEurope_Luxembourg ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Madrid // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Madrid[] ACE_TIME_PROGMEM = { @@ -7220,7 +7242,7 @@ static const basic::ZoneEra kZoneEraEurope_Madrid[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Madrid[] ACE_TIME_PROGMEM = "Europe/Madrid"; +static const char kZoneNameEurope_Madrid[] ACE_TIME_PROGMEM = "\x09" "Madrid"; const basic::ZoneInfo kZoneEurope_Madrid ACE_TIME_PROGMEM = { kZoneNameEurope_Madrid /*name*/, @@ -7233,9 +7255,9 @@ const basic::ZoneInfo kZoneEurope_Madrid ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Malta // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Malta[] ACE_TIME_PROGMEM = { @@ -7254,7 +7276,7 @@ static const basic::ZoneEra kZoneEraEurope_Malta[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Malta[] ACE_TIME_PROGMEM = "Europe/Malta"; +static const char kZoneNameEurope_Malta[] ACE_TIME_PROGMEM = "\x09" "Malta"; const basic::ZoneInfo kZoneEurope_Malta ACE_TIME_PROGMEM = { kZoneNameEurope_Malta /*name*/, @@ -7267,9 +7289,9 @@ const basic::ZoneInfo kZoneEurope_Malta ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Monaco // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Monaco[] ACE_TIME_PROGMEM = { @@ -7288,7 +7310,7 @@ static const basic::ZoneEra kZoneEraEurope_Monaco[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Monaco[] ACE_TIME_PROGMEM = "Europe/Monaco"; +static const char kZoneNameEurope_Monaco[] ACE_TIME_PROGMEM = "\x09" "Monaco"; const basic::ZoneInfo kZoneEurope_Monaco ACE_TIME_PROGMEM = { kZoneNameEurope_Monaco /*name*/, @@ -7301,9 +7323,9 @@ const basic::ZoneInfo kZoneEurope_Monaco ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Oslo // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Oslo[] ACE_TIME_PROGMEM = { @@ -7322,7 +7344,7 @@ static const basic::ZoneEra kZoneEraEurope_Oslo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Oslo[] ACE_TIME_PROGMEM = "Europe/Oslo"; +static const char kZoneNameEurope_Oslo[] ACE_TIME_PROGMEM = "\x09" "Oslo"; const basic::ZoneInfo kZoneEurope_Oslo ACE_TIME_PROGMEM = { kZoneNameEurope_Oslo /*name*/, @@ -7335,9 +7357,9 @@ const basic::ZoneInfo kZoneEurope_Oslo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Paris // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Paris[] ACE_TIME_PROGMEM = { @@ -7356,7 +7378,7 @@ static const basic::ZoneEra kZoneEraEurope_Paris[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Paris[] ACE_TIME_PROGMEM = "Europe/Paris"; +static const char kZoneNameEurope_Paris[] ACE_TIME_PROGMEM = "\x09" "Paris"; const basic::ZoneInfo kZoneEurope_Paris ACE_TIME_PROGMEM = { kZoneNameEurope_Paris /*name*/, @@ -7369,9 +7391,9 @@ const basic::ZoneInfo kZoneEurope_Paris ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Prague // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Prague[] ACE_TIME_PROGMEM = { @@ -7390,7 +7412,7 @@ static const basic::ZoneEra kZoneEraEurope_Prague[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Prague[] ACE_TIME_PROGMEM = "Europe/Prague"; +static const char kZoneNameEurope_Prague[] ACE_TIME_PROGMEM = "\x09" "Prague"; const basic::ZoneInfo kZoneEurope_Prague ACE_TIME_PROGMEM = { kZoneNameEurope_Prague /*name*/, @@ -7403,9 +7425,9 @@ const basic::ZoneInfo kZoneEurope_Prague ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Rome // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Rome[] ACE_TIME_PROGMEM = { @@ -7424,7 +7446,7 @@ static const basic::ZoneEra kZoneEraEurope_Rome[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Rome[] ACE_TIME_PROGMEM = "Europe/Rome"; +static const char kZoneNameEurope_Rome[] ACE_TIME_PROGMEM = "\x09" "Rome"; const basic::ZoneInfo kZoneEurope_Rome ACE_TIME_PROGMEM = { kZoneNameEurope_Rome /*name*/, @@ -7437,9 +7459,9 @@ const basic::ZoneInfo kZoneEurope_Rome ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Sofia // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Sofia[] ACE_TIME_PROGMEM = { @@ -7458,7 +7480,7 @@ static const basic::ZoneEra kZoneEraEurope_Sofia[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Sofia[] ACE_TIME_PROGMEM = "Europe/Sofia"; +static const char kZoneNameEurope_Sofia[] ACE_TIME_PROGMEM = "\x09" "Sofia"; const basic::ZoneInfo kZoneEurope_Sofia ACE_TIME_PROGMEM = { kZoneNameEurope_Sofia /*name*/, @@ -7471,9 +7493,9 @@ const basic::ZoneInfo kZoneEurope_Sofia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Stockholm // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 16 (originally 22) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Stockholm[] ACE_TIME_PROGMEM = { @@ -7492,7 +7514,7 @@ static const basic::ZoneEra kZoneEraEurope_Stockholm[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Stockholm[] ACE_TIME_PROGMEM = "Europe/Stockholm"; +static const char kZoneNameEurope_Stockholm[] ACE_TIME_PROGMEM = "\x09" "Stockholm"; const basic::ZoneInfo kZoneEurope_Stockholm ACE_TIME_PROGMEM = { kZoneNameEurope_Stockholm /*name*/, @@ -7505,9 +7527,9 @@ const basic::ZoneInfo kZoneEurope_Stockholm ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Tirane // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Tirane[] ACE_TIME_PROGMEM = { @@ -7526,7 +7548,7 @@ static const basic::ZoneEra kZoneEraEurope_Tirane[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Tirane[] ACE_TIME_PROGMEM = "Europe/Tirane"; +static const char kZoneNameEurope_Tirane[] ACE_TIME_PROGMEM = "\x09" "Tirane"; const basic::ZoneInfo kZoneEurope_Tirane ACE_TIME_PROGMEM = { kZoneNameEurope_Tirane /*name*/, @@ -7539,9 +7561,9 @@ const basic::ZoneInfo kZoneEurope_Tirane ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Uzhgorod // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Uzhgorod[] ACE_TIME_PROGMEM = { @@ -7560,7 +7582,7 @@ static const basic::ZoneEra kZoneEraEurope_Uzhgorod[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Uzhgorod[] ACE_TIME_PROGMEM = "Europe/Uzhgorod"; +static const char kZoneNameEurope_Uzhgorod[] ACE_TIME_PROGMEM = "\x09" "Uzhgorod"; const basic::ZoneInfo kZoneEurope_Uzhgorod ACE_TIME_PROGMEM = { kZoneNameEurope_Uzhgorod /*name*/, @@ -7573,9 +7595,9 @@ const basic::ZoneInfo kZoneEurope_Uzhgorod ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Vienna // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Vienna[] ACE_TIME_PROGMEM = { @@ -7594,7 +7616,7 @@ static const basic::ZoneEra kZoneEraEurope_Vienna[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Vienna[] ACE_TIME_PROGMEM = "Europe/Vienna"; +static const char kZoneNameEurope_Vienna[] ACE_TIME_PROGMEM = "\x09" "Vienna"; const basic::ZoneInfo kZoneEurope_Vienna ACE_TIME_PROGMEM = { kZoneNameEurope_Vienna /*name*/, @@ -7607,9 +7629,9 @@ const basic::ZoneInfo kZoneEurope_Vienna ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Warsaw // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Warsaw[] ACE_TIME_PROGMEM = { @@ -7628,7 +7650,7 @@ static const basic::ZoneEra kZoneEraEurope_Warsaw[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Warsaw[] ACE_TIME_PROGMEM = "Europe/Warsaw"; +static const char kZoneNameEurope_Warsaw[] ACE_TIME_PROGMEM = "\x09" "Warsaw"; const basic::ZoneInfo kZoneEurope_Warsaw ACE_TIME_PROGMEM = { kZoneNameEurope_Warsaw /*name*/, @@ -7641,9 +7663,9 @@ const basic::ZoneInfo kZoneEurope_Warsaw ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Zaporozhye // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 17 (originally 23) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Zaporozhye[] ACE_TIME_PROGMEM = { @@ -7662,7 +7684,7 @@ static const basic::ZoneEra kZoneEraEurope_Zaporozhye[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Zaporozhye[] ACE_TIME_PROGMEM = "Europe/Zaporozhye"; +static const char kZoneNameEurope_Zaporozhye[] ACE_TIME_PROGMEM = "\x09" "Zaporozhye"; const basic::ZoneInfo kZoneEurope_Zaporozhye ACE_TIME_PROGMEM = { kZoneNameEurope_Zaporozhye /*name*/, @@ -7675,9 +7697,9 @@ const basic::ZoneInfo kZoneEurope_Zaporozhye ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Zurich // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraEurope_Zurich[] ACE_TIME_PROGMEM = { @@ -7696,7 +7718,7 @@ static const basic::ZoneEra kZoneEraEurope_Zurich[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Zurich[] ACE_TIME_PROGMEM = "Europe/Zurich"; +static const char kZoneNameEurope_Zurich[] ACE_TIME_PROGMEM = "\x09" "Zurich"; const basic::ZoneInfo kZoneEurope_Zurich ACE_TIME_PROGMEM = { kZoneNameEurope_Zurich /*name*/, @@ -7709,7 +7731,7 @@ const basic::ZoneInfo kZoneEurope_Zurich ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: HST // Zone Eras: 1 -// Strings (bytes): 8 +// Strings (bytes): 8 (originally 8) // Memory (8-bit): 30 // Memory (32-bit): 44 //--------------------------------------------------------------------------- @@ -7743,9 +7765,9 @@ const basic::ZoneInfo kZoneHST ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Chagos // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraIndian_Chagos[] ACE_TIME_PROGMEM = { @@ -7764,7 +7786,7 @@ static const basic::ZoneEra kZoneEraIndian_Chagos[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Chagos[] ACE_TIME_PROGMEM = "Indian/Chagos"; +static const char kZoneNameIndian_Chagos[] ACE_TIME_PROGMEM = "\x0a" "Chagos"; const basic::ZoneInfo kZoneIndian_Chagos ACE_TIME_PROGMEM = { kZoneNameIndian_Chagos /*name*/, @@ -7777,9 +7799,9 @@ const basic::ZoneInfo kZoneIndian_Chagos ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Christmas // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraIndian_Christmas[] ACE_TIME_PROGMEM = { @@ -7798,7 +7820,7 @@ static const basic::ZoneEra kZoneEraIndian_Christmas[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Christmas[] ACE_TIME_PROGMEM = "Indian/Christmas"; +static const char kZoneNameIndian_Christmas[] ACE_TIME_PROGMEM = "\x0a" "Christmas"; const basic::ZoneInfo kZoneIndian_Christmas ACE_TIME_PROGMEM = { kZoneNameIndian_Christmas /*name*/, @@ -7811,9 +7833,9 @@ const basic::ZoneInfo kZoneIndian_Christmas ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Cocos // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraIndian_Cocos[] ACE_TIME_PROGMEM = { @@ -7832,7 +7854,7 @@ static const basic::ZoneEra kZoneEraIndian_Cocos[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Cocos[] ACE_TIME_PROGMEM = "Indian/Cocos"; +static const char kZoneNameIndian_Cocos[] ACE_TIME_PROGMEM = "\x0a" "Cocos"; const basic::ZoneInfo kZoneIndian_Cocos ACE_TIME_PROGMEM = { kZoneNameIndian_Cocos /*name*/, @@ -7845,9 +7867,9 @@ const basic::ZoneInfo kZoneIndian_Cocos ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Kerguelen // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraIndian_Kerguelen[] ACE_TIME_PROGMEM = { @@ -7866,7 +7888,7 @@ static const basic::ZoneEra kZoneEraIndian_Kerguelen[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Kerguelen[] ACE_TIME_PROGMEM = "Indian/Kerguelen"; +static const char kZoneNameIndian_Kerguelen[] ACE_TIME_PROGMEM = "\x0a" "Kerguelen"; const basic::ZoneInfo kZoneIndian_Kerguelen ACE_TIME_PROGMEM = { kZoneNameIndian_Kerguelen /*name*/, @@ -7879,9 +7901,9 @@ const basic::ZoneInfo kZoneIndian_Kerguelen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Mahe // Zone Eras: 1 -// Strings (bytes): 16 -// Memory (8-bit): 38 -// Memory (32-bit): 52 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 32 +// Memory (32-bit): 46 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraIndian_Mahe[] ACE_TIME_PROGMEM = { @@ -7900,7 +7922,7 @@ static const basic::ZoneEra kZoneEraIndian_Mahe[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Mahe[] ACE_TIME_PROGMEM = "Indian/Mahe"; +static const char kZoneNameIndian_Mahe[] ACE_TIME_PROGMEM = "\x0a" "Mahe"; const basic::ZoneInfo kZoneIndian_Mahe ACE_TIME_PROGMEM = { kZoneNameIndian_Mahe /*name*/, @@ -7913,9 +7935,9 @@ const basic::ZoneInfo kZoneIndian_Mahe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Maldives // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 14 (originally 20) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraIndian_Maldives[] ACE_TIME_PROGMEM = { @@ -7934,7 +7956,7 @@ static const basic::ZoneEra kZoneEraIndian_Maldives[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Maldives[] ACE_TIME_PROGMEM = "Indian/Maldives"; +static const char kZoneNameIndian_Maldives[] ACE_TIME_PROGMEM = "\x0a" "Maldives"; const basic::ZoneInfo kZoneIndian_Maldives ACE_TIME_PROGMEM = { kZoneNameIndian_Maldives /*name*/, @@ -7947,9 +7969,9 @@ const basic::ZoneInfo kZoneIndian_Maldives ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Mauritius // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 19 (originally 25) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraIndian_Mauritius[] ACE_TIME_PROGMEM = { @@ -7968,7 +7990,7 @@ static const basic::ZoneEra kZoneEraIndian_Mauritius[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Mauritius[] ACE_TIME_PROGMEM = "Indian/Mauritius"; +static const char kZoneNameIndian_Mauritius[] ACE_TIME_PROGMEM = "\x0a" "Mauritius"; const basic::ZoneInfo kZoneIndian_Mauritius ACE_TIME_PROGMEM = { kZoneNameIndian_Mauritius /*name*/, @@ -7981,9 +8003,9 @@ const basic::ZoneInfo kZoneIndian_Mauritius ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Reunion // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraIndian_Reunion[] ACE_TIME_PROGMEM = { @@ -8002,7 +8024,7 @@ static const basic::ZoneEra kZoneEraIndian_Reunion[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Reunion[] ACE_TIME_PROGMEM = "Indian/Reunion"; +static const char kZoneNameIndian_Reunion[] ACE_TIME_PROGMEM = "\x0a" "Reunion"; const basic::ZoneInfo kZoneIndian_Reunion ACE_TIME_PROGMEM = { kZoneNameIndian_Reunion /*name*/, @@ -8015,7 +8037,7 @@ const basic::ZoneInfo kZoneIndian_Reunion ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: MET // Zone Eras: 1 -// Strings (bytes): 9 +// Strings (bytes): 9 (originally 9) // Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- @@ -8049,7 +8071,7 @@ const basic::ZoneInfo kZoneMET ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: MST // Zone Eras: 1 -// Strings (bytes): 8 +// Strings (bytes): 8 (originally 8) // Memory (8-bit): 30 // Memory (32-bit): 44 //--------------------------------------------------------------------------- @@ -8083,7 +8105,7 @@ const basic::ZoneInfo kZoneMST ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: MST7MDT // Zone Eras: 1 -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -8117,7 +8139,7 @@ const basic::ZoneInfo kZoneMST7MDT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: PST8PDT // Zone Eras: 1 -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -8151,9 +8173,9 @@ const basic::ZoneInfo kZonePST8PDT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Auckland // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Auckland[] ACE_TIME_PROGMEM = { @@ -8172,7 +8194,7 @@ static const basic::ZoneEra kZoneEraPacific_Auckland[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Auckland[] ACE_TIME_PROGMEM = "Pacific/Auckland"; +static const char kZoneNamePacific_Auckland[] ACE_TIME_PROGMEM = "\x0b" "Auckland"; const basic::ZoneInfo kZonePacific_Auckland ACE_TIME_PROGMEM = { kZoneNamePacific_Auckland /*name*/, @@ -8185,9 +8207,9 @@ const basic::ZoneInfo kZonePacific_Auckland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Chatham // Zone Eras: 1 -// Strings (bytes): 28 -// Memory (8-bit): 50 -// Memory (32-bit): 64 +// Strings (bytes): 21 (originally 28) +// Memory (8-bit): 43 +// Memory (32-bit): 57 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Chatham[] ACE_TIME_PROGMEM = { @@ -8206,7 +8228,7 @@ static const basic::ZoneEra kZoneEraPacific_Chatham[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Chatham[] ACE_TIME_PROGMEM = "Pacific/Chatham"; +static const char kZoneNamePacific_Chatham[] ACE_TIME_PROGMEM = "\x0b" "Chatham"; const basic::ZoneInfo kZonePacific_Chatham ACE_TIME_PROGMEM = { kZoneNamePacific_Chatham /*name*/, @@ -8219,9 +8241,9 @@ const basic::ZoneInfo kZonePacific_Chatham ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Chuuk // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Chuuk[] ACE_TIME_PROGMEM = { @@ -8240,7 +8262,7 @@ static const basic::ZoneEra kZoneEraPacific_Chuuk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Chuuk[] ACE_TIME_PROGMEM = "Pacific/Chuuk"; +static const char kZoneNamePacific_Chuuk[] ACE_TIME_PROGMEM = "\x0b" "Chuuk"; const basic::ZoneInfo kZonePacific_Chuuk ACE_TIME_PROGMEM = { kZoneNamePacific_Chuuk /*name*/, @@ -8253,9 +8275,9 @@ const basic::ZoneInfo kZonePacific_Chuuk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Easter // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Easter[] ACE_TIME_PROGMEM = { @@ -8274,7 +8296,7 @@ static const basic::ZoneEra kZoneEraPacific_Easter[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Easter[] ACE_TIME_PROGMEM = "Pacific/Easter"; +static const char kZoneNamePacific_Easter[] ACE_TIME_PROGMEM = "\x0b" "Easter"; const basic::ZoneInfo kZonePacific_Easter ACE_TIME_PROGMEM = { kZoneNamePacific_Easter /*name*/, @@ -8287,9 +8309,9 @@ const basic::ZoneInfo kZonePacific_Easter ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Efate // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Efate[] ACE_TIME_PROGMEM = { @@ -8308,7 +8330,7 @@ static const basic::ZoneEra kZoneEraPacific_Efate[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Efate[] ACE_TIME_PROGMEM = "Pacific/Efate"; +static const char kZoneNamePacific_Efate[] ACE_TIME_PROGMEM = "\x0b" "Efate"; const basic::ZoneInfo kZonePacific_Efate ACE_TIME_PROGMEM = { kZoneNamePacific_Efate /*name*/, @@ -8321,9 +8343,9 @@ const basic::ZoneInfo kZonePacific_Efate ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Enderbury // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Enderbury[] ACE_TIME_PROGMEM = { @@ -8342,7 +8364,7 @@ static const basic::ZoneEra kZoneEraPacific_Enderbury[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Enderbury[] ACE_TIME_PROGMEM = "Pacific/Enderbury"; +static const char kZoneNamePacific_Enderbury[] ACE_TIME_PROGMEM = "\x0b" "Enderbury"; const basic::ZoneInfo kZonePacific_Enderbury ACE_TIME_PROGMEM = { kZoneNamePacific_Enderbury /*name*/, @@ -8353,11 +8375,11 @@ const basic::ZoneInfo kZonePacific_Enderbury ACE_TIME_PROGMEM = { }; //--------------------------------------------------------------------------- -// Zone name: Pacific/Fiji -// Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Zone name: Pacific/Fiji +// Zone Eras: 1 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Fiji[] ACE_TIME_PROGMEM = { @@ -8376,7 +8398,7 @@ static const basic::ZoneEra kZoneEraPacific_Fiji[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Fiji[] ACE_TIME_PROGMEM = "Pacific/Fiji"; +static const char kZoneNamePacific_Fiji[] ACE_TIME_PROGMEM = "\x0b" "Fiji"; const basic::ZoneInfo kZonePacific_Fiji ACE_TIME_PROGMEM = { kZoneNamePacific_Fiji /*name*/, @@ -8389,9 +8411,9 @@ const basic::ZoneInfo kZonePacific_Fiji ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Funafuti // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Funafuti[] ACE_TIME_PROGMEM = { @@ -8410,7 +8432,7 @@ static const basic::ZoneEra kZoneEraPacific_Funafuti[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Funafuti[] ACE_TIME_PROGMEM = "Pacific/Funafuti"; +static const char kZoneNamePacific_Funafuti[] ACE_TIME_PROGMEM = "\x0b" "Funafuti"; const basic::ZoneInfo kZonePacific_Funafuti ACE_TIME_PROGMEM = { kZoneNamePacific_Funafuti /*name*/, @@ -8423,9 +8445,9 @@ const basic::ZoneInfo kZonePacific_Funafuti ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Galapagos // Zone Eras: 1 -// Strings (bytes): 26 -// Memory (8-bit): 48 -// Memory (32-bit): 62 +// Strings (bytes): 19 (originally 26) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Galapagos[] ACE_TIME_PROGMEM = { @@ -8444,7 +8466,7 @@ static const basic::ZoneEra kZoneEraPacific_Galapagos[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Galapagos[] ACE_TIME_PROGMEM = "Pacific/Galapagos"; +static const char kZoneNamePacific_Galapagos[] ACE_TIME_PROGMEM = "\x0b" "Galapagos"; const basic::ZoneInfo kZonePacific_Galapagos ACE_TIME_PROGMEM = { kZoneNamePacific_Galapagos /*name*/, @@ -8457,9 +8479,9 @@ const basic::ZoneInfo kZonePacific_Galapagos ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Gambier // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Gambier[] ACE_TIME_PROGMEM = { @@ -8478,7 +8500,7 @@ static const basic::ZoneEra kZoneEraPacific_Gambier[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Gambier[] ACE_TIME_PROGMEM = "Pacific/Gambier"; +static const char kZoneNamePacific_Gambier[] ACE_TIME_PROGMEM = "\x0b" "Gambier"; const basic::ZoneInfo kZonePacific_Gambier ACE_TIME_PROGMEM = { kZoneNamePacific_Gambier /*name*/, @@ -8491,9 +8513,9 @@ const basic::ZoneInfo kZonePacific_Gambier ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Guadalcanal // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Guadalcanal[] ACE_TIME_PROGMEM = { @@ -8512,7 +8534,7 @@ static const basic::ZoneEra kZoneEraPacific_Guadalcanal[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Guadalcanal[] ACE_TIME_PROGMEM = "Pacific/Guadalcanal"; +static const char kZoneNamePacific_Guadalcanal[] ACE_TIME_PROGMEM = "\x0b" "Guadalcanal"; const basic::ZoneInfo kZonePacific_Guadalcanal ACE_TIME_PROGMEM = { kZoneNamePacific_Guadalcanal /*name*/, @@ -8525,9 +8547,9 @@ const basic::ZoneInfo kZonePacific_Guadalcanal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Honolulu // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Honolulu[] ACE_TIME_PROGMEM = { @@ -8546,7 +8568,7 @@ static const basic::ZoneEra kZoneEraPacific_Honolulu[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Honolulu[] ACE_TIME_PROGMEM = "Pacific/Honolulu"; +static const char kZoneNamePacific_Honolulu[] ACE_TIME_PROGMEM = "\x0b" "Honolulu"; const basic::ZoneInfo kZonePacific_Honolulu ACE_TIME_PROGMEM = { kZoneNamePacific_Honolulu /*name*/, @@ -8559,9 +8581,9 @@ const basic::ZoneInfo kZonePacific_Honolulu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Kiritimati // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Kiritimati[] ACE_TIME_PROGMEM = { @@ -8580,7 +8602,7 @@ static const basic::ZoneEra kZoneEraPacific_Kiritimati[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Kiritimati[] ACE_TIME_PROGMEM = "Pacific/Kiritimati"; +static const char kZoneNamePacific_Kiritimati[] ACE_TIME_PROGMEM = "\x0b" "Kiritimati"; const basic::ZoneInfo kZonePacific_Kiritimati ACE_TIME_PROGMEM = { kZoneNamePacific_Kiritimati /*name*/, @@ -8593,9 +8615,9 @@ const basic::ZoneInfo kZonePacific_Kiritimati ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Kosrae // Zone Eras: 2 -// Strings (bytes): 23 -// Memory (8-bit): 56 -// Memory (32-bit): 75 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 49 +// Memory (32-bit): 68 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Kosrae[] ACE_TIME_PROGMEM = { @@ -8626,7 +8648,7 @@ static const basic::ZoneEra kZoneEraPacific_Kosrae[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Kosrae[] ACE_TIME_PROGMEM = "Pacific/Kosrae"; +static const char kZoneNamePacific_Kosrae[] ACE_TIME_PROGMEM = "\x0b" "Kosrae"; const basic::ZoneInfo kZonePacific_Kosrae ACE_TIME_PROGMEM = { kZoneNamePacific_Kosrae /*name*/, @@ -8639,9 +8661,9 @@ const basic::ZoneInfo kZonePacific_Kosrae ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Kwajalein // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Kwajalein[] ACE_TIME_PROGMEM = { @@ -8660,7 +8682,7 @@ static const basic::ZoneEra kZoneEraPacific_Kwajalein[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Kwajalein[] ACE_TIME_PROGMEM = "Pacific/Kwajalein"; +static const char kZoneNamePacific_Kwajalein[] ACE_TIME_PROGMEM = "\x0b" "Kwajalein"; const basic::ZoneInfo kZonePacific_Kwajalein ACE_TIME_PROGMEM = { kZoneNamePacific_Kwajalein /*name*/, @@ -8673,9 +8695,9 @@ const basic::ZoneInfo kZonePacific_Kwajalein ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Majuro // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Majuro[] ACE_TIME_PROGMEM = { @@ -8694,7 +8716,7 @@ static const basic::ZoneEra kZoneEraPacific_Majuro[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Majuro[] ACE_TIME_PROGMEM = "Pacific/Majuro"; +static const char kZoneNamePacific_Majuro[] ACE_TIME_PROGMEM = "\x0b" "Majuro"; const basic::ZoneInfo kZonePacific_Majuro ACE_TIME_PROGMEM = { kZoneNamePacific_Majuro /*name*/, @@ -8707,9 +8729,9 @@ const basic::ZoneInfo kZonePacific_Majuro ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Marquesas // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Marquesas[] ACE_TIME_PROGMEM = { @@ -8728,7 +8750,7 @@ static const basic::ZoneEra kZoneEraPacific_Marquesas[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Marquesas[] ACE_TIME_PROGMEM = "Pacific/Marquesas"; +static const char kZoneNamePacific_Marquesas[] ACE_TIME_PROGMEM = "\x0b" "Marquesas"; const basic::ZoneInfo kZonePacific_Marquesas ACE_TIME_PROGMEM = { kZoneNamePacific_Marquesas /*name*/, @@ -8741,9 +8763,9 @@ const basic::ZoneInfo kZonePacific_Marquesas ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Nauru // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Nauru[] ACE_TIME_PROGMEM = { @@ -8762,7 +8784,7 @@ static const basic::ZoneEra kZoneEraPacific_Nauru[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Nauru[] ACE_TIME_PROGMEM = "Pacific/Nauru"; +static const char kZoneNamePacific_Nauru[] ACE_TIME_PROGMEM = "\x0b" "Nauru"; const basic::ZoneInfo kZonePacific_Nauru ACE_TIME_PROGMEM = { kZoneNamePacific_Nauru /*name*/, @@ -8775,9 +8797,9 @@ const basic::ZoneInfo kZonePacific_Nauru ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Niue // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 32 +// Memory (32-bit): 46 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Niue[] ACE_TIME_PROGMEM = { @@ -8796,7 +8818,7 @@ static const basic::ZoneEra kZoneEraPacific_Niue[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Niue[] ACE_TIME_PROGMEM = "Pacific/Niue"; +static const char kZoneNamePacific_Niue[] ACE_TIME_PROGMEM = "\x0b" "Niue"; const basic::ZoneInfo kZonePacific_Niue ACE_TIME_PROGMEM = { kZoneNamePacific_Niue /*name*/, @@ -8809,9 +8831,9 @@ const basic::ZoneInfo kZonePacific_Niue ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Noumea // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Noumea[] ACE_TIME_PROGMEM = { @@ -8830,7 +8852,7 @@ static const basic::ZoneEra kZoneEraPacific_Noumea[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Noumea[] ACE_TIME_PROGMEM = "Pacific/Noumea"; +static const char kZoneNamePacific_Noumea[] ACE_TIME_PROGMEM = "\x0b" "Noumea"; const basic::ZoneInfo kZonePacific_Noumea ACE_TIME_PROGMEM = { kZoneNamePacific_Noumea /*name*/, @@ -8843,9 +8865,9 @@ const basic::ZoneInfo kZonePacific_Noumea ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Pago_Pago // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Pago_Pago[] ACE_TIME_PROGMEM = { @@ -8864,7 +8886,7 @@ static const basic::ZoneEra kZoneEraPacific_Pago_Pago[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Pago_Pago[] ACE_TIME_PROGMEM = "Pacific/Pago_Pago"; +static const char kZoneNamePacific_Pago_Pago[] ACE_TIME_PROGMEM = "\x0b" "Pago_Pago"; const basic::ZoneInfo kZonePacific_Pago_Pago ACE_TIME_PROGMEM = { kZoneNamePacific_Pago_Pago /*name*/, @@ -8877,9 +8899,9 @@ const basic::ZoneInfo kZonePacific_Pago_Pago ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Palau // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Palau[] ACE_TIME_PROGMEM = { @@ -8898,7 +8920,7 @@ static const basic::ZoneEra kZoneEraPacific_Palau[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Palau[] ACE_TIME_PROGMEM = "Pacific/Palau"; +static const char kZoneNamePacific_Palau[] ACE_TIME_PROGMEM = "\x0b" "Palau"; const basic::ZoneInfo kZonePacific_Palau ACE_TIME_PROGMEM = { kZoneNamePacific_Palau /*name*/, @@ -8911,9 +8933,9 @@ const basic::ZoneInfo kZonePacific_Palau ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Pitcairn // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Pitcairn[] ACE_TIME_PROGMEM = { @@ -8932,7 +8954,7 @@ static const basic::ZoneEra kZoneEraPacific_Pitcairn[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Pitcairn[] ACE_TIME_PROGMEM = "Pacific/Pitcairn"; +static const char kZoneNamePacific_Pitcairn[] ACE_TIME_PROGMEM = "\x0b" "Pitcairn"; const basic::ZoneInfo kZonePacific_Pitcairn ACE_TIME_PROGMEM = { kZoneNamePacific_Pitcairn /*name*/, @@ -8945,9 +8967,9 @@ const basic::ZoneInfo kZonePacific_Pitcairn ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Pohnpei // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Pohnpei[] ACE_TIME_PROGMEM = { @@ -8966,7 +8988,7 @@ static const basic::ZoneEra kZoneEraPacific_Pohnpei[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Pohnpei[] ACE_TIME_PROGMEM = "Pacific/Pohnpei"; +static const char kZoneNamePacific_Pohnpei[] ACE_TIME_PROGMEM = "\x0b" "Pohnpei"; const basic::ZoneInfo kZonePacific_Pohnpei ACE_TIME_PROGMEM = { kZoneNamePacific_Pohnpei /*name*/, @@ -8979,9 +9001,9 @@ const basic::ZoneInfo kZonePacific_Pohnpei ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Port_Moresby // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Port_Moresby[] ACE_TIME_PROGMEM = { @@ -9000,7 +9022,7 @@ static const basic::ZoneEra kZoneEraPacific_Port_Moresby[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Port_Moresby[] ACE_TIME_PROGMEM = "Pacific/Port_Moresby"; +static const char kZoneNamePacific_Port_Moresby[] ACE_TIME_PROGMEM = "\x0b" "Port_Moresby"; const basic::ZoneInfo kZonePacific_Port_Moresby ACE_TIME_PROGMEM = { kZoneNamePacific_Port_Moresby /*name*/, @@ -9013,9 +9035,9 @@ const basic::ZoneInfo kZonePacific_Port_Moresby ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Rarotonga // Zone Eras: 1 -// Strings (bytes): 28 -// Memory (8-bit): 50 -// Memory (32-bit): 64 +// Strings (bytes): 21 (originally 28) +// Memory (8-bit): 43 +// Memory (32-bit): 57 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Rarotonga[] ACE_TIME_PROGMEM = { @@ -9034,7 +9056,7 @@ static const basic::ZoneEra kZoneEraPacific_Rarotonga[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Rarotonga[] ACE_TIME_PROGMEM = "Pacific/Rarotonga"; +static const char kZoneNamePacific_Rarotonga[] ACE_TIME_PROGMEM = "\x0b" "Rarotonga"; const basic::ZoneInfo kZonePacific_Rarotonga ACE_TIME_PROGMEM = { kZoneNamePacific_Rarotonga /*name*/, @@ -9047,9 +9069,9 @@ const basic::ZoneInfo kZonePacific_Rarotonga ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Tahiti // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Tahiti[] ACE_TIME_PROGMEM = { @@ -9068,7 +9090,7 @@ static const basic::ZoneEra kZoneEraPacific_Tahiti[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Tahiti[] ACE_TIME_PROGMEM = "Pacific/Tahiti"; +static const char kZoneNamePacific_Tahiti[] ACE_TIME_PROGMEM = "\x0b" "Tahiti"; const basic::ZoneInfo kZonePacific_Tahiti ACE_TIME_PROGMEM = { kZoneNamePacific_Tahiti /*name*/, @@ -9081,9 +9103,9 @@ const basic::ZoneInfo kZonePacific_Tahiti ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Tarawa // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Tarawa[] ACE_TIME_PROGMEM = { @@ -9102,7 +9124,7 @@ static const basic::ZoneEra kZoneEraPacific_Tarawa[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Tarawa[] ACE_TIME_PROGMEM = "Pacific/Tarawa"; +static const char kZoneNamePacific_Tarawa[] ACE_TIME_PROGMEM = "\x0b" "Tarawa"; const basic::ZoneInfo kZonePacific_Tarawa ACE_TIME_PROGMEM = { kZoneNamePacific_Tarawa /*name*/, @@ -9115,9 +9137,9 @@ const basic::ZoneInfo kZonePacific_Tarawa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Tongatapu // Zone Eras: 2 -// Strings (bytes): 30 -// Memory (8-bit): 63 -// Memory (32-bit): 82 +// Strings (bytes): 23 (originally 30) +// Memory (8-bit): 56 +// Memory (32-bit): 75 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Tongatapu[] ACE_TIME_PROGMEM = { @@ -9148,7 +9170,7 @@ static const basic::ZoneEra kZoneEraPacific_Tongatapu[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Tongatapu[] ACE_TIME_PROGMEM = "Pacific/Tongatapu"; +static const char kZoneNamePacific_Tongatapu[] ACE_TIME_PROGMEM = "\x0b" "Tongatapu"; const basic::ZoneInfo kZonePacific_Tongatapu ACE_TIME_PROGMEM = { kZoneNamePacific_Tongatapu /*name*/, @@ -9161,9 +9183,9 @@ const basic::ZoneInfo kZonePacific_Tongatapu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Wake // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 32 +// Memory (32-bit): 46 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Wake[] ACE_TIME_PROGMEM = { @@ -9182,7 +9204,7 @@ static const basic::ZoneEra kZoneEraPacific_Wake[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Wake[] ACE_TIME_PROGMEM = "Pacific/Wake"; +static const char kZoneNamePacific_Wake[] ACE_TIME_PROGMEM = "\x0b" "Wake"; const basic::ZoneInfo kZonePacific_Wake ACE_TIME_PROGMEM = { kZoneNamePacific_Wake /*name*/, @@ -9195,9 +9217,9 @@ const basic::ZoneInfo kZonePacific_Wake ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Wallis // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const basic::ZoneEra kZoneEraPacific_Wallis[] ACE_TIME_PROGMEM = { @@ -9216,7 +9238,7 @@ static const basic::ZoneEra kZoneEraPacific_Wallis[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Wallis[] ACE_TIME_PROGMEM = "Pacific/Wallis"; +static const char kZoneNamePacific_Wallis[] ACE_TIME_PROGMEM = "\x0b" "Wallis"; const basic::ZoneInfo kZonePacific_Wallis ACE_TIME_PROGMEM = { kZoneNamePacific_Wallis /*name*/, @@ -9229,7 +9251,7 @@ const basic::ZoneInfo kZonePacific_Wallis ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: WET // Zone Eras: 1 -// Strings (bytes): 9 +// Strings (bytes): 9 (originally 9) // Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- @@ -9268,8 +9290,9 @@ const basic::ZoneInfo kZoneWET ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Addis_Ababa -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Addis_Ababa[] ACE_TIME_PROGMEM = "Africa/Addis_Ababa"; @@ -9284,8 +9307,9 @@ const basic::ZoneInfo kZoneAfrica_Addis_Ababa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Asmara -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Asmara[] ACE_TIME_PROGMEM = "Africa/Asmara"; @@ -9300,8 +9324,9 @@ const basic::ZoneInfo kZoneAfrica_Asmara ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Asmera -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Asmera[] ACE_TIME_PROGMEM = "Africa/Asmera"; @@ -9316,8 +9341,9 @@ const basic::ZoneInfo kZoneAfrica_Asmera ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Bamako -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Bamako[] ACE_TIME_PROGMEM = "Africa/Bamako"; @@ -9332,8 +9358,9 @@ const basic::ZoneInfo kZoneAfrica_Bamako ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Bangui -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Bangui[] ACE_TIME_PROGMEM = "Africa/Bangui"; @@ -9348,8 +9375,9 @@ const basic::ZoneInfo kZoneAfrica_Bangui ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Banjul -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Banjul[] ACE_TIME_PROGMEM = "Africa/Banjul"; @@ -9364,8 +9392,9 @@ const basic::ZoneInfo kZoneAfrica_Banjul ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Blantyre -> Africa/Maputo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Blantyre[] ACE_TIME_PROGMEM = "Africa/Blantyre"; @@ -9380,8 +9409,9 @@ const basic::ZoneInfo kZoneAfrica_Blantyre ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Brazzaville -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Brazzaville[] ACE_TIME_PROGMEM = "Africa/Brazzaville"; @@ -9396,8 +9426,9 @@ const basic::ZoneInfo kZoneAfrica_Brazzaville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Bujumbura -> Africa/Maputo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Bujumbura[] ACE_TIME_PROGMEM = "Africa/Bujumbura"; @@ -9412,8 +9443,9 @@ const basic::ZoneInfo kZoneAfrica_Bujumbura ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Conakry -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Conakry[] ACE_TIME_PROGMEM = "Africa/Conakry"; @@ -9428,8 +9460,9 @@ const basic::ZoneInfo kZoneAfrica_Conakry ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Dakar -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 13 +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Dakar[] ACE_TIME_PROGMEM = "Africa/Dakar"; @@ -9444,8 +9477,9 @@ const basic::ZoneInfo kZoneAfrica_Dakar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Dar_es_Salaam -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 21 +// Memory (8-bit): 32 +// Memory (32-bit): 41 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Dar_es_Salaam[] ACE_TIME_PROGMEM = "Africa/Dar_es_Salaam"; @@ -9460,8 +9494,9 @@ const basic::ZoneInfo kZoneAfrica_Dar_es_Salaam ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Djibouti -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Djibouti[] ACE_TIME_PROGMEM = "Africa/Djibouti"; @@ -9476,8 +9511,9 @@ const basic::ZoneInfo kZoneAfrica_Djibouti ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Douala -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Douala[] ACE_TIME_PROGMEM = "Africa/Douala"; @@ -9492,8 +9528,9 @@ const basic::ZoneInfo kZoneAfrica_Douala ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Freetown -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Freetown[] ACE_TIME_PROGMEM = "Africa/Freetown"; @@ -9508,8 +9545,9 @@ const basic::ZoneInfo kZoneAfrica_Freetown ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Gaborone -> Africa/Maputo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Gaborone[] ACE_TIME_PROGMEM = "Africa/Gaborone"; @@ -9524,8 +9562,9 @@ const basic::ZoneInfo kZoneAfrica_Gaborone ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Harare -> Africa/Maputo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Harare[] ACE_TIME_PROGMEM = "Africa/Harare"; @@ -9540,8 +9579,9 @@ const basic::ZoneInfo kZoneAfrica_Harare ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Kampala -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Kampala[] ACE_TIME_PROGMEM = "Africa/Kampala"; @@ -9556,8 +9596,9 @@ const basic::ZoneInfo kZoneAfrica_Kampala ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Kigali -> Africa/Maputo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Kigali[] ACE_TIME_PROGMEM = "Africa/Kigali"; @@ -9572,8 +9613,9 @@ const basic::ZoneInfo kZoneAfrica_Kigali ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Kinshasa -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Kinshasa[] ACE_TIME_PROGMEM = "Africa/Kinshasa"; @@ -9588,8 +9630,9 @@ const basic::ZoneInfo kZoneAfrica_Kinshasa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Libreville -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Libreville[] ACE_TIME_PROGMEM = "Africa/Libreville"; @@ -9604,8 +9647,9 @@ const basic::ZoneInfo kZoneAfrica_Libreville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Lome -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Lome[] ACE_TIME_PROGMEM = "Africa/Lome"; @@ -9620,8 +9664,9 @@ const basic::ZoneInfo kZoneAfrica_Lome ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Luanda -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Luanda[] ACE_TIME_PROGMEM = "Africa/Luanda"; @@ -9636,8 +9681,9 @@ const basic::ZoneInfo kZoneAfrica_Luanda ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Lubumbashi -> Africa/Maputo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Lubumbashi[] ACE_TIME_PROGMEM = "Africa/Lubumbashi"; @@ -9652,8 +9698,9 @@ const basic::ZoneInfo kZoneAfrica_Lubumbashi ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Lusaka -> Africa/Maputo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Lusaka[] ACE_TIME_PROGMEM = "Africa/Lusaka"; @@ -9668,8 +9715,9 @@ const basic::ZoneInfo kZoneAfrica_Lusaka ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Malabo -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Malabo[] ACE_TIME_PROGMEM = "Africa/Malabo"; @@ -9684,8 +9732,9 @@ const basic::ZoneInfo kZoneAfrica_Malabo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Maseru -> Africa/Johannesburg -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Maseru[] ACE_TIME_PROGMEM = "Africa/Maseru"; @@ -9700,8 +9749,9 @@ const basic::ZoneInfo kZoneAfrica_Maseru ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Mbabane -> Africa/Johannesburg -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Mbabane[] ACE_TIME_PROGMEM = "Africa/Mbabane"; @@ -9716,8 +9766,9 @@ const basic::ZoneInfo kZoneAfrica_Mbabane ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Mogadishu -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Mogadishu[] ACE_TIME_PROGMEM = "Africa/Mogadishu"; @@ -9732,8 +9783,9 @@ const basic::ZoneInfo kZoneAfrica_Mogadishu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Niamey -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Niamey[] ACE_TIME_PROGMEM = "Africa/Niamey"; @@ -9748,8 +9800,9 @@ const basic::ZoneInfo kZoneAfrica_Niamey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Nouakchott -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Nouakchott[] ACE_TIME_PROGMEM = "Africa/Nouakchott"; @@ -9764,8 +9817,9 @@ const basic::ZoneInfo kZoneAfrica_Nouakchott ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Ouagadougou -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Ouagadougou[] ACE_TIME_PROGMEM = "Africa/Ouagadougou"; @@ -9780,8 +9834,9 @@ const basic::ZoneInfo kZoneAfrica_Ouagadougou ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Porto-Novo -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Porto_Novo[] ACE_TIME_PROGMEM = "Africa/Porto-Novo"; @@ -9796,8 +9851,9 @@ const basic::ZoneInfo kZoneAfrica_Porto_Novo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Timbuktu -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Timbuktu[] ACE_TIME_PROGMEM = "Africa/Timbuktu"; @@ -9812,8 +9868,9 @@ const basic::ZoneInfo kZoneAfrica_Timbuktu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Anguilla -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Anguilla[] ACE_TIME_PROGMEM = "America/Anguilla"; @@ -9828,8 +9885,9 @@ const basic::ZoneInfo kZoneAmerica_Anguilla ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Antigua -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Antigua[] ACE_TIME_PROGMEM = "America/Antigua"; @@ -9844,8 +9902,9 @@ const basic::ZoneInfo kZoneAmerica_Antigua ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Aruba -> America/Curacao -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Aruba[] ACE_TIME_PROGMEM = "America/Aruba"; @@ -9860,8 +9919,9 @@ const basic::ZoneInfo kZoneAmerica_Aruba ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Atka -> America/Adak -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 13 +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Atka[] ACE_TIME_PROGMEM = "America/Atka"; @@ -9876,8 +9936,9 @@ const basic::ZoneInfo kZoneAmerica_Atka ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Cayman -> America/Panama -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Cayman[] ACE_TIME_PROGMEM = "America/Cayman"; @@ -9892,8 +9953,9 @@ const basic::ZoneInfo kZoneAmerica_Cayman ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Coral_Harbour -> America/Atikokan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 22 +// Memory (8-bit): 33 +// Memory (32-bit): 42 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Coral_Harbour[] ACE_TIME_PROGMEM = "America/Coral_Harbour"; @@ -9908,8 +9970,9 @@ const basic::ZoneInfo kZoneAmerica_Coral_Harbour ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Dominica -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Dominica[] ACE_TIME_PROGMEM = "America/Dominica"; @@ -9924,8 +9987,9 @@ const basic::ZoneInfo kZoneAmerica_Dominica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Fort_Wayne -> America/Indiana/Indianapolis -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Fort_Wayne[] ACE_TIME_PROGMEM = "America/Fort_Wayne"; @@ -9940,8 +10004,9 @@ const basic::ZoneInfo kZoneAmerica_Fort_Wayne ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Godthab -> America/Nuuk -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Godthab[] ACE_TIME_PROGMEM = "America/Godthab"; @@ -9956,8 +10021,9 @@ const basic::ZoneInfo kZoneAmerica_Godthab ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Grenada -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Grenada[] ACE_TIME_PROGMEM = "America/Grenada"; @@ -9972,8 +10038,9 @@ const basic::ZoneInfo kZoneAmerica_Grenada ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Guadeloupe -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Guadeloupe[] ACE_TIME_PROGMEM = "America/Guadeloupe"; @@ -9988,8 +10055,9 @@ const basic::ZoneInfo kZoneAmerica_Guadeloupe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Indianapolis -> America/Indiana/Indianapolis -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 21 +// Memory (8-bit): 32 +// Memory (32-bit): 41 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Indianapolis[] ACE_TIME_PROGMEM = "America/Indianapolis"; @@ -10004,8 +10072,9 @@ const basic::ZoneInfo kZoneAmerica_Indianapolis ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Kralendijk -> America/Curacao -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Kralendijk[] ACE_TIME_PROGMEM = "America/Kralendijk"; @@ -10020,8 +10089,9 @@ const basic::ZoneInfo kZoneAmerica_Kralendijk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Louisville -> America/Kentucky/Louisville -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Louisville[] ACE_TIME_PROGMEM = "America/Louisville"; @@ -10036,8 +10106,9 @@ const basic::ZoneInfo kZoneAmerica_Louisville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Lower_Princes -> America/Curacao -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 22 +// Memory (8-bit): 33 +// Memory (32-bit): 42 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Lower_Princes[] ACE_TIME_PROGMEM = "America/Lower_Princes"; @@ -10052,8 +10123,9 @@ const basic::ZoneInfo kZoneAmerica_Lower_Princes ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Marigot -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Marigot[] ACE_TIME_PROGMEM = "America/Marigot"; @@ -10068,8 +10140,9 @@ const basic::ZoneInfo kZoneAmerica_Marigot ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Montreal -> America/Toronto -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Montreal[] ACE_TIME_PROGMEM = "America/Montreal"; @@ -10084,8 +10157,9 @@ const basic::ZoneInfo kZoneAmerica_Montreal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Montserrat -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Montserrat[] ACE_TIME_PROGMEM = "America/Montserrat"; @@ -10100,8 +10174,9 @@ const basic::ZoneInfo kZoneAmerica_Montserrat ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Shiprock -> America/Denver -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Shiprock[] ACE_TIME_PROGMEM = "America/Shiprock"; @@ -10116,8 +10191,9 @@ const basic::ZoneInfo kZoneAmerica_Shiprock ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Barthelemy -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 22 +// Memory (8-bit): 33 +// Memory (32-bit): 42 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_St_Barthelemy[] ACE_TIME_PROGMEM = "America/St_Barthelemy"; @@ -10132,8 +10208,9 @@ const basic::ZoneInfo kZoneAmerica_St_Barthelemy ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Kitts -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_St_Kitts[] ACE_TIME_PROGMEM = "America/St_Kitts"; @@ -10148,8 +10225,9 @@ const basic::ZoneInfo kZoneAmerica_St_Kitts ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Lucia -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_St_Lucia[] ACE_TIME_PROGMEM = "America/St_Lucia"; @@ -10164,8 +10242,9 @@ const basic::ZoneInfo kZoneAmerica_St_Lucia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Thomas -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_St_Thomas[] ACE_TIME_PROGMEM = "America/St_Thomas"; @@ -10180,8 +10259,9 @@ const basic::ZoneInfo kZoneAmerica_St_Thomas ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Vincent -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_St_Vincent[] ACE_TIME_PROGMEM = "America/St_Vincent"; @@ -10196,8 +10276,9 @@ const basic::ZoneInfo kZoneAmerica_St_Vincent ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Tortola -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Tortola[] ACE_TIME_PROGMEM = "America/Tortola"; @@ -10212,8 +10293,9 @@ const basic::ZoneInfo kZoneAmerica_Tortola ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Virgin -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Virgin[] ACE_TIME_PROGMEM = "America/Virgin"; @@ -10228,8 +10310,9 @@ const basic::ZoneInfo kZoneAmerica_Virgin ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Antarctica/McMurdo -> Pacific/Auckland -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAntarctica_McMurdo[] ACE_TIME_PROGMEM = "Antarctica/McMurdo"; @@ -10244,8 +10327,9 @@ const basic::ZoneInfo kZoneAntarctica_McMurdo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Antarctica/South_Pole -> Pacific/Auckland -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 22 +// Memory (8-bit): 33 +// Memory (32-bit): 42 //--------------------------------------------------------------------------- static const char kZoneNameAntarctica_South_Pole[] ACE_TIME_PROGMEM = "Antarctica/South_Pole"; @@ -10260,8 +10344,9 @@ const basic::ZoneInfo kZoneAntarctica_South_Pole ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Arctic/Longyearbyen -> Europe/Oslo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 20 +// Memory (8-bit): 31 +// Memory (32-bit): 40 //--------------------------------------------------------------------------- static const char kZoneNameArctic_Longyearbyen[] ACE_TIME_PROGMEM = "Arctic/Longyearbyen"; @@ -10276,8 +10361,9 @@ const basic::ZoneInfo kZoneArctic_Longyearbyen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Aden -> Asia/Riyadh -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Aden[] ACE_TIME_PROGMEM = "Asia/Aden"; @@ -10292,8 +10378,9 @@ const basic::ZoneInfo kZoneAsia_Aden ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Ashkhabad -> Asia/Ashgabat -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Ashkhabad[] ACE_TIME_PROGMEM = "Asia/Ashkhabad"; @@ -10308,8 +10395,9 @@ const basic::ZoneInfo kZoneAsia_Ashkhabad ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Bahrain -> Asia/Qatar -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 13 +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Bahrain[] ACE_TIME_PROGMEM = "Asia/Bahrain"; @@ -10324,8 +10412,9 @@ const basic::ZoneInfo kZoneAsia_Bahrain ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Calcutta -> Asia/Kolkata -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Calcutta[] ACE_TIME_PROGMEM = "Asia/Calcutta"; @@ -10340,8 +10429,9 @@ const basic::ZoneInfo kZoneAsia_Calcutta ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Chongqing -> Asia/Shanghai -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Chongqing[] ACE_TIME_PROGMEM = "Asia/Chongqing"; @@ -10356,8 +10446,9 @@ const basic::ZoneInfo kZoneAsia_Chongqing ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Chungking -> Asia/Shanghai -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Chungking[] ACE_TIME_PROGMEM = "Asia/Chungking"; @@ -10372,8 +10463,9 @@ const basic::ZoneInfo kZoneAsia_Chungking ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Dacca -> Asia/Dhaka -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 11 +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Dacca[] ACE_TIME_PROGMEM = "Asia/Dacca"; @@ -10388,8 +10480,9 @@ const basic::ZoneInfo kZoneAsia_Dacca ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Harbin -> Asia/Shanghai -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Harbin[] ACE_TIME_PROGMEM = "Asia/Harbin"; @@ -10404,8 +10497,9 @@ const basic::ZoneInfo kZoneAsia_Harbin ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Kashgar -> Asia/Urumqi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 13 +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Kashgar[] ACE_TIME_PROGMEM = "Asia/Kashgar"; @@ -10420,8 +10514,9 @@ const basic::ZoneInfo kZoneAsia_Kashgar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Katmandu -> Asia/Kathmandu -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Katmandu[] ACE_TIME_PROGMEM = "Asia/Katmandu"; @@ -10436,8 +10531,9 @@ const basic::ZoneInfo kZoneAsia_Katmandu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Kuwait -> Asia/Riyadh -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Kuwait[] ACE_TIME_PROGMEM = "Asia/Kuwait"; @@ -10452,8 +10548,9 @@ const basic::ZoneInfo kZoneAsia_Kuwait ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Macao -> Asia/Macau -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 11 +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Macao[] ACE_TIME_PROGMEM = "Asia/Macao"; @@ -10468,8 +10565,9 @@ const basic::ZoneInfo kZoneAsia_Macao ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Muscat -> Asia/Dubai -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Muscat[] ACE_TIME_PROGMEM = "Asia/Muscat"; @@ -10484,8 +10582,9 @@ const basic::ZoneInfo kZoneAsia_Muscat ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Phnom_Penh -> Asia/Bangkok -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Phnom_Penh[] ACE_TIME_PROGMEM = "Asia/Phnom_Penh"; @@ -10500,8 +10599,9 @@ const basic::ZoneInfo kZoneAsia_Phnom_Penh ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Rangoon -> Asia/Yangon -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 13 +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Rangoon[] ACE_TIME_PROGMEM = "Asia/Rangoon"; @@ -10516,8 +10616,9 @@ const basic::ZoneInfo kZoneAsia_Rangoon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Saigon -> Asia/Ho_Chi_Minh -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Saigon[] ACE_TIME_PROGMEM = "Asia/Saigon"; @@ -10532,8 +10633,9 @@ const basic::ZoneInfo kZoneAsia_Saigon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Tel_Aviv -> Asia/Jerusalem -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Tel_Aviv[] ACE_TIME_PROGMEM = "Asia/Tel_Aviv"; @@ -10548,8 +10650,9 @@ const basic::ZoneInfo kZoneAsia_Tel_Aviv ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Thimbu -> Asia/Thimphu -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Thimbu[] ACE_TIME_PROGMEM = "Asia/Thimbu"; @@ -10564,8 +10667,9 @@ const basic::ZoneInfo kZoneAsia_Thimbu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Ujung_Pandang -> Asia/Makassar -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Ujung_Pandang[] ACE_TIME_PROGMEM = "Asia/Ujung_Pandang"; @@ -10580,8 +10684,9 @@ const basic::ZoneInfo kZoneAsia_Ujung_Pandang ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Ulan_Bator -> Asia/Ulaanbaatar -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Ulan_Bator[] ACE_TIME_PROGMEM = "Asia/Ulan_Bator"; @@ -10596,8 +10701,9 @@ const basic::ZoneInfo kZoneAsia_Ulan_Bator ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Vientiane -> Asia/Bangkok -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Vientiane[] ACE_TIME_PROGMEM = "Asia/Vientiane"; @@ -10612,8 +10718,9 @@ const basic::ZoneInfo kZoneAsia_Vientiane ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Atlantic/Faeroe -> Atlantic/Faroe -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAtlantic_Faeroe[] ACE_TIME_PROGMEM = "Atlantic/Faeroe"; @@ -10628,8 +10735,9 @@ const basic::ZoneInfo kZoneAtlantic_Faeroe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Atlantic/Jan_Mayen -> Europe/Oslo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAtlantic_Jan_Mayen[] ACE_TIME_PROGMEM = "Atlantic/Jan_Mayen"; @@ -10644,8 +10752,9 @@ const basic::ZoneInfo kZoneAtlantic_Jan_Mayen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Atlantic/St_Helena -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAtlantic_St_Helena[] ACE_TIME_PROGMEM = "Atlantic/St_Helena"; @@ -10660,8 +10769,9 @@ const basic::ZoneInfo kZoneAtlantic_St_Helena ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/ACT -> Australia/Sydney -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_ACT[] ACE_TIME_PROGMEM = "Australia/ACT"; @@ -10676,8 +10786,9 @@ const basic::ZoneInfo kZoneAustralia_ACT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Canberra -> Australia/Sydney -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_Canberra[] ACE_TIME_PROGMEM = "Australia/Canberra"; @@ -10692,8 +10803,9 @@ const basic::ZoneInfo kZoneAustralia_Canberra ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Currie -> Australia/Hobart -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_Currie[] ACE_TIME_PROGMEM = "Australia/Currie"; @@ -10708,8 +10820,9 @@ const basic::ZoneInfo kZoneAustralia_Currie ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/LHI -> Australia/Lord_Howe -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_LHI[] ACE_TIME_PROGMEM = "Australia/LHI"; @@ -10724,8 +10837,9 @@ const basic::ZoneInfo kZoneAustralia_LHI ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/NSW -> Australia/Sydney -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_NSW[] ACE_TIME_PROGMEM = "Australia/NSW"; @@ -10740,8 +10854,9 @@ const basic::ZoneInfo kZoneAustralia_NSW ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/North -> Australia/Darwin -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_North[] ACE_TIME_PROGMEM = "Australia/North"; @@ -10756,8 +10871,9 @@ const basic::ZoneInfo kZoneAustralia_North ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Queensland -> Australia/Brisbane -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 21 +// Memory (8-bit): 32 +// Memory (32-bit): 41 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_Queensland[] ACE_TIME_PROGMEM = "Australia/Queensland"; @@ -10772,8 +10888,9 @@ const basic::ZoneInfo kZoneAustralia_Queensland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/South -> Australia/Adelaide -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_South[] ACE_TIME_PROGMEM = "Australia/South"; @@ -10788,8 +10905,9 @@ const basic::ZoneInfo kZoneAustralia_South ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Tasmania -> Australia/Hobart -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_Tasmania[] ACE_TIME_PROGMEM = "Australia/Tasmania"; @@ -10804,8 +10922,9 @@ const basic::ZoneInfo kZoneAustralia_Tasmania ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Victoria -> Australia/Melbourne -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_Victoria[] ACE_TIME_PROGMEM = "Australia/Victoria"; @@ -10820,8 +10939,9 @@ const basic::ZoneInfo kZoneAustralia_Victoria ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/West -> Australia/Perth -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_West[] ACE_TIME_PROGMEM = "Australia/West"; @@ -10836,8 +10956,9 @@ const basic::ZoneInfo kZoneAustralia_West ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Yancowinna -> Australia/Broken_Hill -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 21 +// Memory (8-bit): 32 +// Memory (32-bit): 41 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_Yancowinna[] ACE_TIME_PROGMEM = "Australia/Yancowinna"; @@ -10852,8 +10973,9 @@ const basic::ZoneInfo kZoneAustralia_Yancowinna ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Brazil/East -> America/Sao_Paulo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameBrazil_East[] ACE_TIME_PROGMEM = "Brazil/East"; @@ -10868,8 +10990,9 @@ const basic::ZoneInfo kZoneBrazil_East ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Brazil/West -> America/Manaus -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameBrazil_West[] ACE_TIME_PROGMEM = "Brazil/West"; @@ -10884,8 +11007,9 @@ const basic::ZoneInfo kZoneBrazil_West ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Atlantic -> America/Halifax -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameCanada_Atlantic[] ACE_TIME_PROGMEM = "Canada/Atlantic"; @@ -10900,8 +11024,9 @@ const basic::ZoneInfo kZoneCanada_Atlantic ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Central -> America/Winnipeg -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameCanada_Central[] ACE_TIME_PROGMEM = "Canada/Central"; @@ -10916,8 +11041,9 @@ const basic::ZoneInfo kZoneCanada_Central ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Eastern -> America/Toronto -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameCanada_Eastern[] ACE_TIME_PROGMEM = "Canada/Eastern"; @@ -10932,8 +11058,9 @@ const basic::ZoneInfo kZoneCanada_Eastern ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Mountain -> America/Edmonton -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameCanada_Mountain[] ACE_TIME_PROGMEM = "Canada/Mountain"; @@ -10948,8 +11075,9 @@ const basic::ZoneInfo kZoneCanada_Mountain ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Pacific -> America/Vancouver -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameCanada_Pacific[] ACE_TIME_PROGMEM = "Canada/Pacific"; @@ -10964,8 +11092,9 @@ const basic::ZoneInfo kZoneCanada_Pacific ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Saskatchewan -> America/Regina -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 20 +// Memory (8-bit): 31 +// Memory (32-bit): 40 //--------------------------------------------------------------------------- static const char kZoneNameCanada_Saskatchewan[] ACE_TIME_PROGMEM = "Canada/Saskatchewan"; @@ -10980,8 +11109,9 @@ const basic::ZoneInfo kZoneCanada_Saskatchewan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Chile/Continental -> America/Santiago -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameChile_Continental[] ACE_TIME_PROGMEM = "Chile/Continental"; @@ -10996,8 +11126,9 @@ const basic::ZoneInfo kZoneChile_Continental ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Chile/EasterIsland -> Pacific/Easter -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameChile_EasterIsland[] ACE_TIME_PROGMEM = "Chile/EasterIsland"; @@ -11012,8 +11143,9 @@ const basic::ZoneInfo kZoneChile_EasterIsland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Cuba -> America/Havana -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 5 +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- static const char kZoneNameCuba[] ACE_TIME_PROGMEM = "Cuba"; @@ -11028,8 +11160,9 @@ const basic::ZoneInfo kZoneCuba ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Eire -> Europe/Dublin -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 5 +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- static const char kZoneNameEire[] ACE_TIME_PROGMEM = "Eire"; @@ -11044,8 +11177,9 @@ const basic::ZoneInfo kZoneEire ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/GMT+0 -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameEtc_GMT_PLUS_0[] ACE_TIME_PROGMEM = "Etc/GMT+0"; @@ -11060,8 +11194,9 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/GMT-0 -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameEtc_GMT_0[] ACE_TIME_PROGMEM = "Etc/GMT-0"; @@ -11076,8 +11211,9 @@ const basic::ZoneInfo kZoneEtc_GMT_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/GMT0 -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 9 +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- static const char kZoneNameEtc_GMT0[] ACE_TIME_PROGMEM = "Etc/GMT0"; @@ -11092,8 +11228,9 @@ const basic::ZoneInfo kZoneEtc_GMT0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/Greenwich -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameEtc_Greenwich[] ACE_TIME_PROGMEM = "Etc/Greenwich"; @@ -11108,8 +11245,9 @@ const basic::ZoneInfo kZoneEtc_Greenwich ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/UCT -> Etc/UTC -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 8 +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- static const char kZoneNameEtc_UCT[] ACE_TIME_PROGMEM = "Etc/UCT"; @@ -11124,8 +11262,9 @@ const basic::ZoneInfo kZoneEtc_UCT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/Universal -> Etc/UTC -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameEtc_Universal[] ACE_TIME_PROGMEM = "Etc/Universal"; @@ -11140,8 +11279,9 @@ const basic::ZoneInfo kZoneEtc_Universal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/Zulu -> Etc/UTC -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 9 +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- static const char kZoneNameEtc_Zulu[] ACE_TIME_PROGMEM = "Etc/Zulu"; @@ -11156,8 +11296,9 @@ const basic::ZoneInfo kZoneEtc_Zulu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Belfast -> Europe/London -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Belfast[] ACE_TIME_PROGMEM = "Europe/Belfast"; @@ -11172,8 +11313,9 @@ const basic::ZoneInfo kZoneEurope_Belfast ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Bratislava -> Europe/Prague -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Bratislava[] ACE_TIME_PROGMEM = "Europe/Bratislava"; @@ -11188,8 +11330,9 @@ const basic::ZoneInfo kZoneEurope_Bratislava ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Busingen -> Europe/Zurich -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Busingen[] ACE_TIME_PROGMEM = "Europe/Busingen"; @@ -11204,8 +11347,9 @@ const basic::ZoneInfo kZoneEurope_Busingen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Guernsey -> Europe/London -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Guernsey[] ACE_TIME_PROGMEM = "Europe/Guernsey"; @@ -11220,8 +11364,9 @@ const basic::ZoneInfo kZoneEurope_Guernsey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Isle_of_Man -> Europe/London -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Isle_of_Man[] ACE_TIME_PROGMEM = "Europe/Isle_of_Man"; @@ -11236,8 +11381,9 @@ const basic::ZoneInfo kZoneEurope_Isle_of_Man ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Jersey -> Europe/London -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Jersey[] ACE_TIME_PROGMEM = "Europe/Jersey"; @@ -11252,8 +11398,9 @@ const basic::ZoneInfo kZoneEurope_Jersey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Ljubljana -> Europe/Belgrade -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Ljubljana[] ACE_TIME_PROGMEM = "Europe/Ljubljana"; @@ -11268,8 +11415,9 @@ const basic::ZoneInfo kZoneEurope_Ljubljana ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Mariehamn -> Europe/Helsinki -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Mariehamn[] ACE_TIME_PROGMEM = "Europe/Mariehamn"; @@ -11284,8 +11432,9 @@ const basic::ZoneInfo kZoneEurope_Mariehamn ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Nicosia -> Asia/Nicosia -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Nicosia[] ACE_TIME_PROGMEM = "Europe/Nicosia"; @@ -11300,8 +11449,9 @@ const basic::ZoneInfo kZoneEurope_Nicosia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Podgorica -> Europe/Belgrade -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Podgorica[] ACE_TIME_PROGMEM = "Europe/Podgorica"; @@ -11316,8 +11466,9 @@ const basic::ZoneInfo kZoneEurope_Podgorica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/San_Marino -> Europe/Rome -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameEurope_San_Marino[] ACE_TIME_PROGMEM = "Europe/San_Marino"; @@ -11332,8 +11483,9 @@ const basic::ZoneInfo kZoneEurope_San_Marino ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Sarajevo -> Europe/Belgrade -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Sarajevo[] ACE_TIME_PROGMEM = "Europe/Sarajevo"; @@ -11348,8 +11500,9 @@ const basic::ZoneInfo kZoneEurope_Sarajevo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Skopje -> Europe/Belgrade -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Skopje[] ACE_TIME_PROGMEM = "Europe/Skopje"; @@ -11364,8 +11517,9 @@ const basic::ZoneInfo kZoneEurope_Skopje ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Tiraspol -> Europe/Chisinau -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Tiraspol[] ACE_TIME_PROGMEM = "Europe/Tiraspol"; @@ -11380,8 +11534,9 @@ const basic::ZoneInfo kZoneEurope_Tiraspol ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Vaduz -> Europe/Zurich -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 13 +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Vaduz[] ACE_TIME_PROGMEM = "Europe/Vaduz"; @@ -11396,8 +11551,9 @@ const basic::ZoneInfo kZoneEurope_Vaduz ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Vatican -> Europe/Rome -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Vatican[] ACE_TIME_PROGMEM = "Europe/Vatican"; @@ -11412,8 +11568,9 @@ const basic::ZoneInfo kZoneEurope_Vatican ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Zagreb -> Europe/Belgrade -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Zagreb[] ACE_TIME_PROGMEM = "Europe/Zagreb"; @@ -11428,8 +11585,9 @@ const basic::ZoneInfo kZoneEurope_Zagreb ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GB -> Europe/London -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 3 +// Memory (8-bit): 14 +// Memory (32-bit): 23 //--------------------------------------------------------------------------- static const char kZoneNameGB[] ACE_TIME_PROGMEM = "GB"; @@ -11444,8 +11602,9 @@ const basic::ZoneInfo kZoneGB ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GB-Eire -> Europe/London -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 8 +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- static const char kZoneNameGB_Eire[] ACE_TIME_PROGMEM = "GB-Eire"; @@ -11460,8 +11619,9 @@ const basic::ZoneInfo kZoneGB_Eire ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 4 +// Memory (8-bit): 15 +// Memory (32-bit): 24 //--------------------------------------------------------------------------- static const char kZoneNameGMT[] ACE_TIME_PROGMEM = "GMT"; @@ -11476,8 +11636,9 @@ const basic::ZoneInfo kZoneGMT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT+0 -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 6 +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- static const char kZoneNameGMT_PLUS_0[] ACE_TIME_PROGMEM = "GMT+0"; @@ -11492,8 +11653,9 @@ const basic::ZoneInfo kZoneGMT_PLUS_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT-0 -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 6 +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- static const char kZoneNameGMT_0[] ACE_TIME_PROGMEM = "GMT-0"; @@ -11508,8 +11670,9 @@ const basic::ZoneInfo kZoneGMT_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT0 -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 5 +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- static const char kZoneNameGMT0[] ACE_TIME_PROGMEM = "GMT0"; @@ -11524,8 +11687,9 @@ const basic::ZoneInfo kZoneGMT0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Greenwich -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameGreenwich[] ACE_TIME_PROGMEM = "Greenwich"; @@ -11540,8 +11704,9 @@ const basic::ZoneInfo kZoneGreenwich ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Hongkong -> Asia/Hong_Kong -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 9 +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- static const char kZoneNameHongkong[] ACE_TIME_PROGMEM = "Hongkong"; @@ -11556,8 +11721,9 @@ const basic::ZoneInfo kZoneHongkong ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Iceland -> Atlantic/Reykjavik -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 8 +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- static const char kZoneNameIceland[] ACE_TIME_PROGMEM = "Iceland"; @@ -11572,8 +11738,9 @@ const basic::ZoneInfo kZoneIceland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Indian/Antananarivo -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 20 +// Memory (8-bit): 31 +// Memory (32-bit): 40 //--------------------------------------------------------------------------- static const char kZoneNameIndian_Antananarivo[] ACE_TIME_PROGMEM = "Indian/Antananarivo"; @@ -11588,8 +11755,9 @@ const basic::ZoneInfo kZoneIndian_Antananarivo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Indian/Comoro -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameIndian_Comoro[] ACE_TIME_PROGMEM = "Indian/Comoro"; @@ -11604,8 +11772,9 @@ const basic::ZoneInfo kZoneIndian_Comoro ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Indian/Mayotte -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameIndian_Mayotte[] ACE_TIME_PROGMEM = "Indian/Mayotte"; @@ -11620,8 +11789,9 @@ const basic::ZoneInfo kZoneIndian_Mayotte ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Iran -> Asia/Tehran -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 5 +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- static const char kZoneNameIran[] ACE_TIME_PROGMEM = "Iran"; @@ -11636,8 +11806,9 @@ const basic::ZoneInfo kZoneIran ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Israel -> Asia/Jerusalem -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 7 +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- static const char kZoneNameIsrael[] ACE_TIME_PROGMEM = "Israel"; @@ -11652,8 +11823,9 @@ const basic::ZoneInfo kZoneIsrael ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Jamaica -> America/Jamaica -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 8 +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- static const char kZoneNameJamaica[] ACE_TIME_PROGMEM = "Jamaica"; @@ -11668,8 +11840,9 @@ const basic::ZoneInfo kZoneJamaica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Japan -> Asia/Tokyo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 6 +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- static const char kZoneNameJapan[] ACE_TIME_PROGMEM = "Japan"; @@ -11684,8 +11857,9 @@ const basic::ZoneInfo kZoneJapan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Kwajalein -> Pacific/Kwajalein -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameKwajalein[] ACE_TIME_PROGMEM = "Kwajalein"; @@ -11700,8 +11874,9 @@ const basic::ZoneInfo kZoneKwajalein ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Mexico/BajaSur -> America/Mazatlan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameMexico_BajaSur[] ACE_TIME_PROGMEM = "Mexico/BajaSur"; @@ -11716,8 +11891,9 @@ const basic::ZoneInfo kZoneMexico_BajaSur ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: NZ -> Pacific/Auckland -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 3 +// Memory (8-bit): 14 +// Memory (32-bit): 23 //--------------------------------------------------------------------------- static const char kZoneNameNZ[] ACE_TIME_PROGMEM = "NZ"; @@ -11732,8 +11908,9 @@ const basic::ZoneInfo kZoneNZ ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: NZ-CHAT -> Pacific/Chatham -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 8 +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- static const char kZoneNameNZ_CHAT[] ACE_TIME_PROGMEM = "NZ-CHAT"; @@ -11748,8 +11925,9 @@ const basic::ZoneInfo kZoneNZ_CHAT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Navajo -> America/Denver -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 7 +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- static const char kZoneNameNavajo[] ACE_TIME_PROGMEM = "Navajo"; @@ -11764,8 +11942,9 @@ const basic::ZoneInfo kZoneNavajo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: PRC -> Asia/Shanghai -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 4 +// Memory (8-bit): 15 +// Memory (32-bit): 24 //--------------------------------------------------------------------------- static const char kZoneNamePRC[] ACE_TIME_PROGMEM = "PRC"; @@ -11780,8 +11959,9 @@ const basic::ZoneInfo kZonePRC ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Johnston -> Pacific/Honolulu -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNamePacific_Johnston[] ACE_TIME_PROGMEM = "Pacific/Johnston"; @@ -11796,8 +11976,9 @@ const basic::ZoneInfo kZonePacific_Johnston ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Midway -> Pacific/Pago_Pago -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNamePacific_Midway[] ACE_TIME_PROGMEM = "Pacific/Midway"; @@ -11812,8 +11993,9 @@ const basic::ZoneInfo kZonePacific_Midway ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Ponape -> Pacific/Pohnpei -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNamePacific_Ponape[] ACE_TIME_PROGMEM = "Pacific/Ponape"; @@ -11828,8 +12010,9 @@ const basic::ZoneInfo kZonePacific_Ponape ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Samoa -> Pacific/Pago_Pago -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNamePacific_Samoa[] ACE_TIME_PROGMEM = "Pacific/Samoa"; @@ -11844,8 +12027,9 @@ const basic::ZoneInfo kZonePacific_Samoa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Truk -> Pacific/Chuuk -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 13 +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- static const char kZoneNamePacific_Truk[] ACE_TIME_PROGMEM = "Pacific/Truk"; @@ -11860,8 +12044,9 @@ const basic::ZoneInfo kZonePacific_Truk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Yap -> Pacific/Chuuk -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNamePacific_Yap[] ACE_TIME_PROGMEM = "Pacific/Yap"; @@ -11876,8 +12061,9 @@ const basic::ZoneInfo kZonePacific_Yap ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Poland -> Europe/Warsaw -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 7 +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- static const char kZoneNamePoland[] ACE_TIME_PROGMEM = "Poland"; @@ -11892,8 +12078,9 @@ const basic::ZoneInfo kZonePoland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Portugal -> Europe/Lisbon -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 9 +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- static const char kZoneNamePortugal[] ACE_TIME_PROGMEM = "Portugal"; @@ -11908,8 +12095,9 @@ const basic::ZoneInfo kZonePortugal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: ROC -> Asia/Taipei -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 4 +// Memory (8-bit): 15 +// Memory (32-bit): 24 //--------------------------------------------------------------------------- static const char kZoneNameROC[] ACE_TIME_PROGMEM = "ROC"; @@ -11924,8 +12112,9 @@ const basic::ZoneInfo kZoneROC ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: ROK -> Asia/Seoul -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 4 +// Memory (8-bit): 15 +// Memory (32-bit): 24 //--------------------------------------------------------------------------- static const char kZoneNameROK[] ACE_TIME_PROGMEM = "ROK"; @@ -11940,8 +12129,9 @@ const basic::ZoneInfo kZoneROK ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Singapore -> Asia/Singapore -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameSingapore[] ACE_TIME_PROGMEM = "Singapore"; @@ -11956,8 +12146,9 @@ const basic::ZoneInfo kZoneSingapore ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: UCT -> Etc/UTC -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 4 +// Memory (8-bit): 15 +// Memory (32-bit): 24 //--------------------------------------------------------------------------- static const char kZoneNameUCT[] ACE_TIME_PROGMEM = "UCT"; @@ -11972,8 +12163,9 @@ const basic::ZoneInfo kZoneUCT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Alaska -> America/Anchorage -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameUS_Alaska[] ACE_TIME_PROGMEM = "US/Alaska"; @@ -11988,8 +12180,9 @@ const basic::ZoneInfo kZoneUS_Alaska ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Aleutian -> America/Adak -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameUS_Aleutian[] ACE_TIME_PROGMEM = "US/Aleutian"; @@ -12004,8 +12197,9 @@ const basic::ZoneInfo kZoneUS_Aleutian ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Arizona -> America/Phoenix -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 11 +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- static const char kZoneNameUS_Arizona[] ACE_TIME_PROGMEM = "US/Arizona"; @@ -12020,8 +12214,9 @@ const basic::ZoneInfo kZoneUS_Arizona ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Central -> America/Chicago -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 11 +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- static const char kZoneNameUS_Central[] ACE_TIME_PROGMEM = "US/Central"; @@ -12036,8 +12231,9 @@ const basic::ZoneInfo kZoneUS_Central ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/East-Indiana -> America/Indiana/Indianapolis -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameUS_East_Indiana[] ACE_TIME_PROGMEM = "US/East-Indiana"; @@ -12052,8 +12248,9 @@ const basic::ZoneInfo kZoneUS_East_Indiana ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Eastern -> America/New_York -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 11 +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- static const char kZoneNameUS_Eastern[] ACE_TIME_PROGMEM = "US/Eastern"; @@ -12068,8 +12265,9 @@ const basic::ZoneInfo kZoneUS_Eastern ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Hawaii -> Pacific/Honolulu -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameUS_Hawaii[] ACE_TIME_PROGMEM = "US/Hawaii"; @@ -12084,8 +12282,9 @@ const basic::ZoneInfo kZoneUS_Hawaii ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Michigan -> America/Detroit -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameUS_Michigan[] ACE_TIME_PROGMEM = "US/Michigan"; @@ -12100,8 +12299,9 @@ const basic::ZoneInfo kZoneUS_Michigan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Mountain -> America/Denver -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameUS_Mountain[] ACE_TIME_PROGMEM = "US/Mountain"; @@ -12116,8 +12316,9 @@ const basic::ZoneInfo kZoneUS_Mountain ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Pacific -> America/Los_Angeles -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 11 +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- static const char kZoneNameUS_Pacific[] ACE_TIME_PROGMEM = "US/Pacific"; @@ -12132,8 +12333,9 @@ const basic::ZoneInfo kZoneUS_Pacific ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Samoa -> Pacific/Pago_Pago -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 9 +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- static const char kZoneNameUS_Samoa[] ACE_TIME_PROGMEM = "US/Samoa"; @@ -12148,8 +12350,9 @@ const basic::ZoneInfo kZoneUS_Samoa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: UTC -> Etc/UTC -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 4 +// Memory (8-bit): 15 +// Memory (32-bit): 24 //--------------------------------------------------------------------------- static const char kZoneNameUTC[] ACE_TIME_PROGMEM = "UTC"; @@ -12164,8 +12367,9 @@ const basic::ZoneInfo kZoneUTC ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Universal -> Etc/UTC -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameUniversal[] ACE_TIME_PROGMEM = "Universal"; @@ -12180,8 +12384,9 @@ const basic::ZoneInfo kZoneUniversal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Zulu -> Etc/UTC -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 5 +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- static const char kZoneNameZulu[] ACE_TIME_PROGMEM = "Zulu"; diff --git a/src/ace_time/zonedb/zone_policies.cpp b/src/ace_time/zonedb/zone_policies.cpp index 1564551e8..1683a6823 100644 --- a/src/ace_time/zonedb/zone_policies.cpp +++ b/src/ace_time/zonedb/zone_policies.cpp @@ -26,8 +26,9 @@ // // Policies: 64 // Rules: 361 -// Memory (8-bit): 3633 -// Memory (32-bit): 5132 +// Letter Size (bytes): 0 +// Total Memory 8-bit (bytes): 3633 +// Total Memory 32-bit (bytes): 5132 // // DO NOT EDIT diff --git a/src/ace_time/zonedbx/zone_infos.cpp b/src/ace_time/zonedbx/zone_infos.cpp index 1a3e34493..36643af29 100644 --- a/src/ace_time/zonedbx/zone_infos.cpp +++ b/src/ace_time/zonedbx/zone_infos.cpp @@ -27,13 +27,17 @@ // Zones: 386 // Links: 207 // kZoneRegistry sizes (bytes): -// Strings: 9465 -// Memory (8-bit): 21897 -// Memory (32-bit): 29513 +// Names: 3667 (originally 6100) +// Formats: 597 +// Fragments: 122 +// Memory (8-bit): 16848 +// Memory (32-bit): 24464 // kZoneAndLinkRegistry sizes (bytes): -// Strings: 12392 -// Memory (8-bit): 27515 -// Memory (32-bit): 37408 +// Names: 5620 (originally 9027) +// Formats: 597 +// Fragments: 122 +// Memory (8-bit): 21492 +// Memory (32-bit): 31385 // // DO NOT EDIT @@ -50,10 +54,31 @@ namespace zonedbx { const char kTzDatabaseVersion[] = "2020f"; +const char* const kFragments[] = { +/*\x00*/ nullptr, +/*\x01*/ "Africa/", +/*\x02*/ "America/", +/*\x03*/ "Antarctica/", +/*\x04*/ "Argentina/", +/*\x05*/ "Asia/", +/*\x06*/ "Atlantic/", +/*\x07*/ "Australia/", +/*\x08*/ "Brazil/", +/*\x09*/ "Canada/", +/*\x0a*/ "Etc/", +/*\x0b*/ "Europe/", +/*\x0c*/ "Indian/", +/*\x0d*/ "Indiana/", +/*\x0e*/ "Pacific/", + +}; + const extended::ZoneContext kZoneContext = { 2000 /*startYear*/, 2050 /*untilYear*/, kTzDatabaseVersion /*tzVersion*/, + 15 /*numFragments*/, + kFragments /*fragments*/, }; //--------------------------------------------------------------------------- @@ -63,9 +88,9 @@ const extended::ZoneContext kZoneContext = { //--------------------------------------------------------------------------- // Zone name: Africa/Abidjan // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Abidjan[] ACE_TIME_PROGMEM = { @@ -84,7 +109,7 @@ static const extended::ZoneEra kZoneEraAfrica_Abidjan[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Abidjan[] ACE_TIME_PROGMEM = "Africa/Abidjan"; +static const char kZoneNameAfrica_Abidjan[] ACE_TIME_PROGMEM = "\x01" "Abidjan"; const extended::ZoneInfo kZoneAfrica_Abidjan ACE_TIME_PROGMEM = { kZoneNameAfrica_Abidjan /*name*/, @@ -97,9 +122,9 @@ const extended::ZoneInfo kZoneAfrica_Abidjan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Accra // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 31 +// Memory (32-bit): 45 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Accra[] ACE_TIME_PROGMEM = { @@ -118,7 +143,7 @@ static const extended::ZoneEra kZoneEraAfrica_Accra[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Accra[] ACE_TIME_PROGMEM = "Africa/Accra"; +static const char kZoneNameAfrica_Accra[] ACE_TIME_PROGMEM = "\x01" "Accra"; const extended::ZoneInfo kZoneAfrica_Accra ACE_TIME_PROGMEM = { kZoneNameAfrica_Accra /*name*/, @@ -131,9 +156,9 @@ const extended::ZoneInfo kZoneAfrica_Accra ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Algiers // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Algiers[] ACE_TIME_PROGMEM = { @@ -152,7 +177,7 @@ static const extended::ZoneEra kZoneEraAfrica_Algiers[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Algiers[] ACE_TIME_PROGMEM = "Africa/Algiers"; +static const char kZoneNameAfrica_Algiers[] ACE_TIME_PROGMEM = "\x01" "Algiers"; const extended::ZoneInfo kZoneAfrica_Algiers ACE_TIME_PROGMEM = { kZoneNameAfrica_Algiers /*name*/, @@ -165,9 +190,9 @@ const extended::ZoneInfo kZoneAfrica_Algiers ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Bissau // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Bissau[] ACE_TIME_PROGMEM = { @@ -186,7 +211,7 @@ static const extended::ZoneEra kZoneEraAfrica_Bissau[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Bissau[] ACE_TIME_PROGMEM = "Africa/Bissau"; +static const char kZoneNameAfrica_Bissau[] ACE_TIME_PROGMEM = "\x01" "Bissau"; const extended::ZoneInfo kZoneAfrica_Bissau ACE_TIME_PROGMEM = { kZoneNameAfrica_Bissau /*name*/, @@ -199,9 +224,9 @@ const extended::ZoneInfo kZoneAfrica_Bissau ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Cairo // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Cairo[] ACE_TIME_PROGMEM = { @@ -220,7 +245,7 @@ static const extended::ZoneEra kZoneEraAfrica_Cairo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Cairo[] ACE_TIME_PROGMEM = "Africa/Cairo"; +static const char kZoneNameAfrica_Cairo[] ACE_TIME_PROGMEM = "\x01" "Cairo"; const extended::ZoneInfo kZoneAfrica_Cairo ACE_TIME_PROGMEM = { kZoneNameAfrica_Cairo /*name*/, @@ -233,9 +258,9 @@ const extended::ZoneInfo kZoneAfrica_Cairo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Casablanca // Zone Eras: 2 -// Strings (bytes): 34 -// Memory (8-bit): 67 -// Memory (32-bit): 86 +// Strings (bytes): 28 (originally 34) +// Memory (8-bit): 61 +// Memory (32-bit): 80 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Casablanca[] ACE_TIME_PROGMEM = { @@ -266,7 +291,7 @@ static const extended::ZoneEra kZoneEraAfrica_Casablanca[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Casablanca[] ACE_TIME_PROGMEM = "Africa/Casablanca"; +static const char kZoneNameAfrica_Casablanca[] ACE_TIME_PROGMEM = "\x01" "Casablanca"; const extended::ZoneInfo kZoneAfrica_Casablanca ACE_TIME_PROGMEM = { kZoneNameAfrica_Casablanca /*name*/, @@ -279,9 +304,9 @@ const extended::ZoneInfo kZoneAfrica_Casablanca ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Ceuta // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Ceuta[] ACE_TIME_PROGMEM = { @@ -300,7 +325,7 @@ static const extended::ZoneEra kZoneEraAfrica_Ceuta[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Ceuta[] ACE_TIME_PROGMEM = "Africa/Ceuta"; +static const char kZoneNameAfrica_Ceuta[] ACE_TIME_PROGMEM = "\x01" "Ceuta"; const extended::ZoneInfo kZoneAfrica_Ceuta ACE_TIME_PROGMEM = { kZoneNameAfrica_Ceuta /*name*/, @@ -313,9 +338,9 @@ const extended::ZoneInfo kZoneAfrica_Ceuta ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/El_Aaiun // Zone Eras: 2 -// Strings (bytes): 32 -// Memory (8-bit): 65 -// Memory (32-bit): 84 +// Strings (bytes): 26 (originally 32) +// Memory (8-bit): 59 +// Memory (32-bit): 78 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_El_Aaiun[] ACE_TIME_PROGMEM = { @@ -346,7 +371,7 @@ static const extended::ZoneEra kZoneEraAfrica_El_Aaiun[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_El_Aaiun[] ACE_TIME_PROGMEM = "Africa/El_Aaiun"; +static const char kZoneNameAfrica_El_Aaiun[] ACE_TIME_PROGMEM = "\x01" "El_Aaiun"; const extended::ZoneInfo kZoneAfrica_El_Aaiun ACE_TIME_PROGMEM = { kZoneNameAfrica_El_Aaiun /*name*/, @@ -359,9 +384,9 @@ const extended::ZoneInfo kZoneAfrica_El_Aaiun ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Johannesburg // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 19 (originally 25) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Johannesburg[] ACE_TIME_PROGMEM = { @@ -380,7 +405,7 @@ static const extended::ZoneEra kZoneEraAfrica_Johannesburg[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAfrica_Johannesburg[] ACE_TIME_PROGMEM = "Africa/Johannesburg"; +static const char kZoneNameAfrica_Johannesburg[] ACE_TIME_PROGMEM = "\x01" "Johannesburg"; const extended::ZoneInfo kZoneAfrica_Johannesburg ACE_TIME_PROGMEM = { kZoneNameAfrica_Johannesburg /*name*/, @@ -393,9 +418,9 @@ const extended::ZoneInfo kZoneAfrica_Johannesburg ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Juba // Zone Eras: 2 -// Strings (bytes): 21 -// Memory (8-bit): 54 -// Memory (32-bit): 73 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 48 +// Memory (32-bit): 67 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Juba[] ACE_TIME_PROGMEM = { @@ -426,7 +451,7 @@ static const extended::ZoneEra kZoneEraAfrica_Juba[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Juba[] ACE_TIME_PROGMEM = "Africa/Juba"; +static const char kZoneNameAfrica_Juba[] ACE_TIME_PROGMEM = "\x01" "Juba"; const extended::ZoneInfo kZoneAfrica_Juba ACE_TIME_PROGMEM = { kZoneNameAfrica_Juba /*name*/, @@ -439,9 +464,9 @@ const extended::ZoneInfo kZoneAfrica_Juba ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Khartoum // Zone Eras: 3 -// Strings (bytes): 29 -// Memory (8-bit): 73 -// Memory (32-bit): 97 +// Strings (bytes): 23 (originally 29) +// Memory (8-bit): 67 +// Memory (32-bit): 91 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Khartoum[] ACE_TIME_PROGMEM = { @@ -484,7 +509,7 @@ static const extended::ZoneEra kZoneEraAfrica_Khartoum[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Khartoum[] ACE_TIME_PROGMEM = "Africa/Khartoum"; +static const char kZoneNameAfrica_Khartoum[] ACE_TIME_PROGMEM = "\x01" "Khartoum"; const extended::ZoneInfo kZoneAfrica_Khartoum ACE_TIME_PROGMEM = { kZoneNameAfrica_Khartoum /*name*/, @@ -497,9 +522,9 @@ const extended::ZoneInfo kZoneAfrica_Khartoum ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Lagos // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Lagos[] ACE_TIME_PROGMEM = { @@ -518,7 +543,7 @@ static const extended::ZoneEra kZoneEraAfrica_Lagos[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Lagos[] ACE_TIME_PROGMEM = "Africa/Lagos"; +static const char kZoneNameAfrica_Lagos[] ACE_TIME_PROGMEM = "\x01" "Lagos"; const extended::ZoneInfo kZoneAfrica_Lagos ACE_TIME_PROGMEM = { kZoneNameAfrica_Lagos /*name*/, @@ -531,9 +556,9 @@ const extended::ZoneInfo kZoneAfrica_Lagos ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Maputo // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Maputo[] ACE_TIME_PROGMEM = { @@ -552,7 +577,7 @@ static const extended::ZoneEra kZoneEraAfrica_Maputo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Maputo[] ACE_TIME_PROGMEM = "Africa/Maputo"; +static const char kZoneNameAfrica_Maputo[] ACE_TIME_PROGMEM = "\x01" "Maputo"; const extended::ZoneInfo kZoneAfrica_Maputo ACE_TIME_PROGMEM = { kZoneNameAfrica_Maputo /*name*/, @@ -565,9 +590,9 @@ const extended::ZoneInfo kZoneAfrica_Maputo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Monrovia // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 14 (originally 20) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Monrovia[] ACE_TIME_PROGMEM = { @@ -586,7 +611,7 @@ static const extended::ZoneEra kZoneEraAfrica_Monrovia[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Monrovia[] ACE_TIME_PROGMEM = "Africa/Monrovia"; +static const char kZoneNameAfrica_Monrovia[] ACE_TIME_PROGMEM = "\x01" "Monrovia"; const extended::ZoneInfo kZoneAfrica_Monrovia ACE_TIME_PROGMEM = { kZoneNameAfrica_Monrovia /*name*/, @@ -599,9 +624,9 @@ const extended::ZoneInfo kZoneAfrica_Monrovia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Nairobi // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Nairobi[] ACE_TIME_PROGMEM = { @@ -620,7 +645,7 @@ static const extended::ZoneEra kZoneEraAfrica_Nairobi[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Nairobi[] ACE_TIME_PROGMEM = "Africa/Nairobi"; +static const char kZoneNameAfrica_Nairobi[] ACE_TIME_PROGMEM = "\x01" "Nairobi"; const extended::ZoneInfo kZoneAfrica_Nairobi ACE_TIME_PROGMEM = { kZoneNameAfrica_Nairobi /*name*/, @@ -633,9 +658,9 @@ const extended::ZoneInfo kZoneAfrica_Nairobi ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Ndjamena // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 14 (originally 20) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Ndjamena[] ACE_TIME_PROGMEM = { @@ -654,7 +679,7 @@ static const extended::ZoneEra kZoneEraAfrica_Ndjamena[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Ndjamena[] ACE_TIME_PROGMEM = "Africa/Ndjamena"; +static const char kZoneNameAfrica_Ndjamena[] ACE_TIME_PROGMEM = "\x01" "Ndjamena"; const extended::ZoneInfo kZoneAfrica_Ndjamena ACE_TIME_PROGMEM = { kZoneNameAfrica_Ndjamena /*name*/, @@ -667,9 +692,9 @@ const extended::ZoneInfo kZoneAfrica_Ndjamena ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Sao_Tome // Zone Eras: 3 -// Strings (bytes): 28 -// Memory (8-bit): 72 -// Memory (32-bit): 96 +// Strings (bytes): 22 (originally 28) +// Memory (8-bit): 66 +// Memory (32-bit): 90 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Sao_Tome[] ACE_TIME_PROGMEM = { @@ -712,7 +737,7 @@ static const extended::ZoneEra kZoneEraAfrica_Sao_Tome[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Sao_Tome[] ACE_TIME_PROGMEM = "Africa/Sao_Tome"; +static const char kZoneNameAfrica_Sao_Tome[] ACE_TIME_PROGMEM = "\x01" "Sao_Tome"; const extended::ZoneInfo kZoneAfrica_Sao_Tome ACE_TIME_PROGMEM = { kZoneNameAfrica_Sao_Tome /*name*/, @@ -725,9 +750,9 @@ const extended::ZoneInfo kZoneAfrica_Sao_Tome ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Tripoli // Zone Eras: 3 -// Strings (bytes): 28 -// Memory (8-bit): 72 -// Memory (32-bit): 96 +// Strings (bytes): 22 (originally 28) +// Memory (8-bit): 66 +// Memory (32-bit): 90 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Tripoli[] ACE_TIME_PROGMEM = { @@ -770,7 +795,7 @@ static const extended::ZoneEra kZoneEraAfrica_Tripoli[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Tripoli[] ACE_TIME_PROGMEM = "Africa/Tripoli"; +static const char kZoneNameAfrica_Tripoli[] ACE_TIME_PROGMEM = "\x01" "Tripoli"; const extended::ZoneInfo kZoneAfrica_Tripoli ACE_TIME_PROGMEM = { kZoneNameAfrica_Tripoli /*name*/, @@ -783,9 +808,9 @@ const extended::ZoneInfo kZoneAfrica_Tripoli ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Tunis // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Tunis[] ACE_TIME_PROGMEM = { @@ -804,7 +829,7 @@ static const extended::ZoneEra kZoneEraAfrica_Tunis[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Tunis[] ACE_TIME_PROGMEM = "Africa/Tunis"; +static const char kZoneNameAfrica_Tunis[] ACE_TIME_PROGMEM = "\x01" "Tunis"; const extended::ZoneInfo kZoneAfrica_Tunis ACE_TIME_PROGMEM = { kZoneNameAfrica_Tunis /*name*/, @@ -817,9 +842,9 @@ const extended::ZoneInfo kZoneAfrica_Tunis ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Windhoek // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Windhoek[] ACE_TIME_PROGMEM = { @@ -838,7 +863,7 @@ static const extended::ZoneEra kZoneEraAfrica_Windhoek[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAfrica_Windhoek[] ACE_TIME_PROGMEM = "Africa/Windhoek"; +static const char kZoneNameAfrica_Windhoek[] ACE_TIME_PROGMEM = "\x01" "Windhoek"; const extended::ZoneInfo kZoneAfrica_Windhoek ACE_TIME_PROGMEM = { kZoneNameAfrica_Windhoek /*name*/, @@ -851,9 +876,9 @@ const extended::ZoneInfo kZoneAfrica_Windhoek ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Adak // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 32 +// Memory (32-bit): 46 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Adak[] ACE_TIME_PROGMEM = { @@ -872,7 +897,7 @@ static const extended::ZoneEra kZoneEraAmerica_Adak[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Adak[] ACE_TIME_PROGMEM = "America/Adak"; +static const char kZoneNameAmerica_Adak[] ACE_TIME_PROGMEM = "\x02" "Adak"; const extended::ZoneInfo kZoneAmerica_Adak ACE_TIME_PROGMEM = { kZoneNameAmerica_Adak /*name*/, @@ -885,9 +910,9 @@ const extended::ZoneInfo kZoneAmerica_Adak ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Anchorage // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Anchorage[] ACE_TIME_PROGMEM = { @@ -906,7 +931,7 @@ static const extended::ZoneEra kZoneEraAmerica_Anchorage[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Anchorage[] ACE_TIME_PROGMEM = "America/Anchorage"; +static const char kZoneNameAmerica_Anchorage[] ACE_TIME_PROGMEM = "\x02" "Anchorage"; const extended::ZoneInfo kZoneAmerica_Anchorage ACE_TIME_PROGMEM = { kZoneNameAmerica_Anchorage /*name*/, @@ -919,9 +944,9 @@ const extended::ZoneInfo kZoneAmerica_Anchorage ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Araguaina // Zone Eras: 4 -// Strings (bytes): 42 -// Memory (8-bit): 97 -// Memory (32-bit): 126 +// Strings (bytes): 35 (originally 42) +// Memory (8-bit): 90 +// Memory (32-bit): 119 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Araguaina[] ACE_TIME_PROGMEM = { @@ -976,7 +1001,7 @@ static const extended::ZoneEra kZoneEraAmerica_Araguaina[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Araguaina[] ACE_TIME_PROGMEM = "America/Araguaina"; +static const char kZoneNameAmerica_Araguaina[] ACE_TIME_PROGMEM = "\x02" "Araguaina"; const extended::ZoneInfo kZoneAmerica_Araguaina ACE_TIME_PROGMEM = { kZoneNameAmerica_Araguaina /*name*/, @@ -989,9 +1014,9 @@ const extended::ZoneInfo kZoneAmerica_Araguaina ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Argentina/Buenos_Aires // Zone Eras: 3 -// Strings (bytes): 55 -// Memory (8-bit): 99 -// Memory (32-bit): 123 +// Strings (bytes): 39 (originally 55) +// Memory (8-bit): 83 +// Memory (32-bit): 107 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Argentina_Buenos_Aires[] ACE_TIME_PROGMEM = { @@ -1034,7 +1059,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Buenos_Aires[] ACE_TIME }; -static const char kZoneNameAmerica_Argentina_Buenos_Aires[] ACE_TIME_PROGMEM = "America/Argentina/Buenos_Aires"; +static const char kZoneNameAmerica_Argentina_Buenos_Aires[] ACE_TIME_PROGMEM = "\x02" "\x04" "Buenos_Aires"; const extended::ZoneInfo kZoneAmerica_Argentina_Buenos_Aires ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Buenos_Aires /*name*/, @@ -1047,9 +1072,9 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Buenos_Aires ACE_TIME_PROGMEM = //--------------------------------------------------------------------------- // Zone name: America/Argentina/Catamarca // Zone Eras: 6 -// Strings (bytes): 64 -// Memory (8-bit): 141 -// Memory (32-bit): 180 +// Strings (bytes): 48 (originally 64) +// Memory (8-bit): 125 +// Memory (32-bit): 164 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Argentina_Catamarca[] ACE_TIME_PROGMEM = { @@ -1128,7 +1153,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Catamarca[] ACE_TIME_PR }; -static const char kZoneNameAmerica_Argentina_Catamarca[] ACE_TIME_PROGMEM = "America/Argentina/Catamarca"; +static const char kZoneNameAmerica_Argentina_Catamarca[] ACE_TIME_PROGMEM = "\x02" "\x04" "Catamarca"; const extended::ZoneInfo kZoneAmerica_Argentina_Catamarca ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Catamarca /*name*/, @@ -1141,9 +1166,9 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Catamarca ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Argentina/Cordoba // Zone Eras: 3 -// Strings (bytes): 50 -// Memory (8-bit): 94 -// Memory (32-bit): 118 +// Strings (bytes): 34 (originally 50) +// Memory (8-bit): 78 +// Memory (32-bit): 102 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Argentina_Cordoba[] ACE_TIME_PROGMEM = { @@ -1186,7 +1211,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Cordoba[] ACE_TIME_PROG }; -static const char kZoneNameAmerica_Argentina_Cordoba[] ACE_TIME_PROGMEM = "America/Argentina/Cordoba"; +static const char kZoneNameAmerica_Argentina_Cordoba[] ACE_TIME_PROGMEM = "\x02" "\x04" "Cordoba"; const extended::ZoneInfo kZoneAmerica_Argentina_Cordoba ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Cordoba /*name*/, @@ -1199,9 +1224,9 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Cordoba ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Argentina/Jujuy // Zone Eras: 4 -// Strings (bytes): 52 -// Memory (8-bit): 107 -// Memory (32-bit): 136 +// Strings (bytes): 36 (originally 52) +// Memory (8-bit): 91 +// Memory (32-bit): 120 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Argentina_Jujuy[] ACE_TIME_PROGMEM = { @@ -1256,7 +1281,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Jujuy[] ACE_TIME_PROGME }; -static const char kZoneNameAmerica_Argentina_Jujuy[] ACE_TIME_PROGMEM = "America/Argentina/Jujuy"; +static const char kZoneNameAmerica_Argentina_Jujuy[] ACE_TIME_PROGMEM = "\x02" "\x04" "Jujuy"; const extended::ZoneInfo kZoneAmerica_Argentina_Jujuy ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Jujuy /*name*/, @@ -1269,9 +1294,9 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Jujuy ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Argentina/La_Rioja // Zone Eras: 6 -// Strings (bytes): 63 -// Memory (8-bit): 140 -// Memory (32-bit): 179 +// Strings (bytes): 47 (originally 63) +// Memory (8-bit): 124 +// Memory (32-bit): 163 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Argentina_La_Rioja[] ACE_TIME_PROGMEM = { @@ -1350,7 +1375,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_La_Rioja[] ACE_TIME_PRO }; -static const char kZoneNameAmerica_Argentina_La_Rioja[] ACE_TIME_PROGMEM = "America/Argentina/La_Rioja"; +static const char kZoneNameAmerica_Argentina_La_Rioja[] ACE_TIME_PROGMEM = "\x02" "\x04" "La_Rioja"; const extended::ZoneInfo kZoneAmerica_Argentina_La_Rioja ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_La_Rioja /*name*/, @@ -1363,9 +1388,9 @@ const extended::ZoneInfo kZoneAmerica_Argentina_La_Rioja ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Argentina/Mendoza // Zone Eras: 6 -// Strings (bytes): 62 -// Memory (8-bit): 139 -// Memory (32-bit): 178 +// Strings (bytes): 46 (originally 62) +// Memory (8-bit): 123 +// Memory (32-bit): 162 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Argentina_Mendoza[] ACE_TIME_PROGMEM = { @@ -1444,7 +1469,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Mendoza[] ACE_TIME_PROG }; -static const char kZoneNameAmerica_Argentina_Mendoza[] ACE_TIME_PROGMEM = "America/Argentina/Mendoza"; +static const char kZoneNameAmerica_Argentina_Mendoza[] ACE_TIME_PROGMEM = "\x02" "\x04" "Mendoza"; const extended::ZoneInfo kZoneAmerica_Argentina_Mendoza ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Mendoza /*name*/, @@ -1457,9 +1482,9 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Mendoza ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Argentina/Rio_Gallegos // Zone Eras: 6 -// Strings (bytes): 67 -// Memory (8-bit): 144 -// Memory (32-bit): 183 +// Strings (bytes): 51 (originally 67) +// Memory (8-bit): 128 +// Memory (32-bit): 167 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Argentina_Rio_Gallegos[] ACE_TIME_PROGMEM = { @@ -1538,7 +1563,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Rio_Gallegos[] ACE_TIME }; -static const char kZoneNameAmerica_Argentina_Rio_Gallegos[] ACE_TIME_PROGMEM = "America/Argentina/Rio_Gallegos"; +static const char kZoneNameAmerica_Argentina_Rio_Gallegos[] ACE_TIME_PROGMEM = "\x02" "\x04" "Rio_Gallegos"; const extended::ZoneInfo kZoneAmerica_Argentina_Rio_Gallegos ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Rio_Gallegos /*name*/, @@ -1551,9 +1576,9 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Rio_Gallegos ACE_TIME_PROGMEM = //--------------------------------------------------------------------------- // Zone name: America/Argentina/Salta // Zone Eras: 4 -// Strings (bytes): 52 -// Memory (8-bit): 107 -// Memory (32-bit): 136 +// Strings (bytes): 36 (originally 52) +// Memory (8-bit): 91 +// Memory (32-bit): 120 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Argentina_Salta[] ACE_TIME_PROGMEM = { @@ -1608,7 +1633,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Salta[] ACE_TIME_PROGME }; -static const char kZoneNameAmerica_Argentina_Salta[] ACE_TIME_PROGMEM = "America/Argentina/Salta"; +static const char kZoneNameAmerica_Argentina_Salta[] ACE_TIME_PROGMEM = "\x02" "\x04" "Salta"; const extended::ZoneInfo kZoneAmerica_Argentina_Salta ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Salta /*name*/, @@ -1621,9 +1646,9 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Salta ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Argentina/San_Juan // Zone Eras: 6 -// Strings (bytes): 63 -// Memory (8-bit): 140 -// Memory (32-bit): 179 +// Strings (bytes): 47 (originally 63) +// Memory (8-bit): 124 +// Memory (32-bit): 163 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Juan[] ACE_TIME_PROGMEM = { @@ -1702,7 +1727,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Juan[] ACE_TIME_PRO }; -static const char kZoneNameAmerica_Argentina_San_Juan[] ACE_TIME_PROGMEM = "America/Argentina/San_Juan"; +static const char kZoneNameAmerica_Argentina_San_Juan[] ACE_TIME_PROGMEM = "\x02" "\x04" "San_Juan"; const extended::ZoneInfo kZoneAmerica_Argentina_San_Juan ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_San_Juan /*name*/, @@ -1715,9 +1740,9 @@ const extended::ZoneInfo kZoneAmerica_Argentina_San_Juan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Argentina/San_Luis // Zone Eras: 7 -// Strings (bytes): 63 -// Memory (8-bit): 151 -// Memory (32-bit): 195 +// Strings (bytes): 47 (originally 63) +// Memory (8-bit): 135 +// Memory (32-bit): 179 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Luis[] ACE_TIME_PROGMEM = { @@ -1808,7 +1833,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Luis[] ACE_TIME_PRO }; -static const char kZoneNameAmerica_Argentina_San_Luis[] ACE_TIME_PROGMEM = "America/Argentina/San_Luis"; +static const char kZoneNameAmerica_Argentina_San_Luis[] ACE_TIME_PROGMEM = "\x02" "\x04" "San_Luis"; const extended::ZoneInfo kZoneAmerica_Argentina_San_Luis ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_San_Luis /*name*/, @@ -1821,9 +1846,9 @@ const extended::ZoneInfo kZoneAmerica_Argentina_San_Luis ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Argentina/Tucuman // Zone Eras: 5 -// Strings (bytes): 58 -// Memory (8-bit): 124 -// Memory (32-bit): 158 +// Strings (bytes): 42 (originally 58) +// Memory (8-bit): 108 +// Memory (32-bit): 142 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Argentina_Tucuman[] ACE_TIME_PROGMEM = { @@ -1890,7 +1915,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Tucuman[] ACE_TIME_PROG }; -static const char kZoneNameAmerica_Argentina_Tucuman[] ACE_TIME_PROGMEM = "America/Argentina/Tucuman"; +static const char kZoneNameAmerica_Argentina_Tucuman[] ACE_TIME_PROGMEM = "\x02" "\x04" "Tucuman"; const extended::ZoneInfo kZoneAmerica_Argentina_Tucuman ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Tucuman /*name*/, @@ -1903,9 +1928,9 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Tucuman ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Argentina/Ushuaia // Zone Eras: 6 -// Strings (bytes): 62 -// Memory (8-bit): 139 -// Memory (32-bit): 178 +// Strings (bytes): 46 (originally 62) +// Memory (8-bit): 123 +// Memory (32-bit): 162 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Argentina_Ushuaia[] ACE_TIME_PROGMEM = { @@ -1984,7 +2009,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Ushuaia[] ACE_TIME_PROG }; -static const char kZoneNameAmerica_Argentina_Ushuaia[] ACE_TIME_PROGMEM = "America/Argentina/Ushuaia"; +static const char kZoneNameAmerica_Argentina_Ushuaia[] ACE_TIME_PROGMEM = "\x02" "\x04" "Ushuaia"; const extended::ZoneInfo kZoneAmerica_Argentina_Ushuaia ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_Ushuaia /*name*/, @@ -1997,9 +2022,9 @@ const extended::ZoneInfo kZoneAmerica_Argentina_Ushuaia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Asuncion // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Asuncion[] ACE_TIME_PROGMEM = { @@ -2018,7 +2043,7 @@ static const extended::ZoneEra kZoneEraAmerica_Asuncion[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Asuncion[] ACE_TIME_PROGMEM = "America/Asuncion"; +static const char kZoneNameAmerica_Asuncion[] ACE_TIME_PROGMEM = "\x02" "Asuncion"; const extended::ZoneInfo kZoneAmerica_Asuncion ACE_TIME_PROGMEM = { kZoneNameAmerica_Asuncion /*name*/, @@ -2031,9 +2056,9 @@ const extended::ZoneInfo kZoneAmerica_Asuncion ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Atikokan // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Atikokan[] ACE_TIME_PROGMEM = { @@ -2052,7 +2077,7 @@ static const extended::ZoneEra kZoneEraAmerica_Atikokan[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Atikokan[] ACE_TIME_PROGMEM = "America/Atikokan"; +static const char kZoneNameAmerica_Atikokan[] ACE_TIME_PROGMEM = "\x02" "Atikokan"; const extended::ZoneInfo kZoneAmerica_Atikokan ACE_TIME_PROGMEM = { kZoneNameAmerica_Atikokan /*name*/, @@ -2065,9 +2090,9 @@ const extended::ZoneInfo kZoneAmerica_Atikokan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Bahia // Zone Eras: 4 -// Strings (bytes): 38 -// Memory (8-bit): 93 -// Memory (32-bit): 122 +// Strings (bytes): 31 (originally 38) +// Memory (8-bit): 86 +// Memory (32-bit): 115 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Bahia[] ACE_TIME_PROGMEM = { @@ -2122,7 +2147,7 @@ static const extended::ZoneEra kZoneEraAmerica_Bahia[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Bahia[] ACE_TIME_PROGMEM = "America/Bahia"; +static const char kZoneNameAmerica_Bahia[] ACE_TIME_PROGMEM = "\x02" "Bahia"; const extended::ZoneInfo kZoneAmerica_Bahia ACE_TIME_PROGMEM = { kZoneNameAmerica_Bahia /*name*/, @@ -2135,9 +2160,9 @@ const extended::ZoneInfo kZoneAmerica_Bahia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Bahia_Banderas // Zone Eras: 2 -// Strings (bytes): 31 -// Memory (8-bit): 64 -// Memory (32-bit): 83 +// Strings (bytes): 24 (originally 31) +// Memory (8-bit): 57 +// Memory (32-bit): 76 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Bahia_Banderas[] ACE_TIME_PROGMEM = { @@ -2168,7 +2193,7 @@ static const extended::ZoneEra kZoneEraAmerica_Bahia_Banderas[] ACE_TIME_PROGMEM }; -static const char kZoneNameAmerica_Bahia_Banderas[] ACE_TIME_PROGMEM = "America/Bahia_Banderas"; +static const char kZoneNameAmerica_Bahia_Banderas[] ACE_TIME_PROGMEM = "\x02" "Bahia_Banderas"; const extended::ZoneInfo kZoneAmerica_Bahia_Banderas ACE_TIME_PROGMEM = { kZoneNameAmerica_Bahia_Banderas /*name*/, @@ -2181,9 +2206,9 @@ const extended::ZoneInfo kZoneAmerica_Bahia_Banderas ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Barbados // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Barbados[] ACE_TIME_PROGMEM = { @@ -2202,7 +2227,7 @@ static const extended::ZoneEra kZoneEraAmerica_Barbados[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Barbados[] ACE_TIME_PROGMEM = "America/Barbados"; +static const char kZoneNameAmerica_Barbados[] ACE_TIME_PROGMEM = "\x02" "Barbados"; const extended::ZoneInfo kZoneAmerica_Barbados ACE_TIME_PROGMEM = { kZoneNameAmerica_Barbados /*name*/, @@ -2215,9 +2240,9 @@ const extended::ZoneInfo kZoneAmerica_Barbados ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Belem // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Belem[] ACE_TIME_PROGMEM = { @@ -2236,7 +2261,7 @@ static const extended::ZoneEra kZoneEraAmerica_Belem[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Belem[] ACE_TIME_PROGMEM = "America/Belem"; +static const char kZoneNameAmerica_Belem[] ACE_TIME_PROGMEM = "\x02" "Belem"; const extended::ZoneInfo kZoneAmerica_Belem ACE_TIME_PROGMEM = { kZoneNameAmerica_Belem /*name*/, @@ -2249,9 +2274,9 @@ const extended::ZoneInfo kZoneAmerica_Belem ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Belize // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 32 +// Memory (32-bit): 46 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Belize[] ACE_TIME_PROGMEM = { @@ -2270,7 +2295,7 @@ static const extended::ZoneEra kZoneEraAmerica_Belize[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Belize[] ACE_TIME_PROGMEM = "America/Belize"; +static const char kZoneNameAmerica_Belize[] ACE_TIME_PROGMEM = "\x02" "Belize"; const extended::ZoneInfo kZoneAmerica_Belize ACE_TIME_PROGMEM = { kZoneNameAmerica_Belize /*name*/, @@ -2283,9 +2308,9 @@ const extended::ZoneInfo kZoneAmerica_Belize ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Blanc-Sablon // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Blanc_Sablon[] ACE_TIME_PROGMEM = { @@ -2304,7 +2329,7 @@ static const extended::ZoneEra kZoneEraAmerica_Blanc_Sablon[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Blanc_Sablon[] ACE_TIME_PROGMEM = "America/Blanc-Sablon"; +static const char kZoneNameAmerica_Blanc_Sablon[] ACE_TIME_PROGMEM = "\x02" "Blanc-Sablon"; const extended::ZoneInfo kZoneAmerica_Blanc_Sablon ACE_TIME_PROGMEM = { kZoneNameAmerica_Blanc_Sablon /*name*/, @@ -2317,9 +2342,9 @@ const extended::ZoneInfo kZoneAmerica_Blanc_Sablon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Boa_Vista // Zone Eras: 3 -// Strings (bytes): 34 -// Memory (8-bit): 78 -// Memory (32-bit): 102 +// Strings (bytes): 27 (originally 34) +// Memory (8-bit): 71 +// Memory (32-bit): 95 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Boa_Vista[] ACE_TIME_PROGMEM = { @@ -2362,7 +2387,7 @@ static const extended::ZoneEra kZoneEraAmerica_Boa_Vista[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Boa_Vista[] ACE_TIME_PROGMEM = "America/Boa_Vista"; +static const char kZoneNameAmerica_Boa_Vista[] ACE_TIME_PROGMEM = "\x02" "Boa_Vista"; const extended::ZoneInfo kZoneAmerica_Boa_Vista ACE_TIME_PROGMEM = { kZoneNameAmerica_Boa_Vista /*name*/, @@ -2375,9 +2400,9 @@ const extended::ZoneInfo kZoneAmerica_Boa_Vista ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Bogota // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Bogota[] ACE_TIME_PROGMEM = { @@ -2396,7 +2421,7 @@ static const extended::ZoneEra kZoneEraAmerica_Bogota[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Bogota[] ACE_TIME_PROGMEM = "America/Bogota"; +static const char kZoneNameAmerica_Bogota[] ACE_TIME_PROGMEM = "\x02" "Bogota"; const extended::ZoneInfo kZoneAmerica_Bogota ACE_TIME_PROGMEM = { kZoneNameAmerica_Bogota /*name*/, @@ -2409,9 +2434,9 @@ const extended::ZoneInfo kZoneAmerica_Bogota ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Boise // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Boise[] ACE_TIME_PROGMEM = { @@ -2430,7 +2455,7 @@ static const extended::ZoneEra kZoneEraAmerica_Boise[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Boise[] ACE_TIME_PROGMEM = "America/Boise"; +static const char kZoneNameAmerica_Boise[] ACE_TIME_PROGMEM = "\x02" "Boise"; const extended::ZoneInfo kZoneAmerica_Boise ACE_TIME_PROGMEM = { kZoneNameAmerica_Boise /*name*/, @@ -2443,9 +2468,9 @@ const extended::ZoneInfo kZoneAmerica_Boise ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Cambridge_Bay // Zone Eras: 5 -// Strings (bytes): 42 -// Memory (8-bit): 108 -// Memory (32-bit): 142 +// Strings (bytes): 35 (originally 42) +// Memory (8-bit): 101 +// Memory (32-bit): 135 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Cambridge_Bay[] ACE_TIME_PROGMEM = { @@ -2512,7 +2537,7 @@ static const extended::ZoneEra kZoneEraAmerica_Cambridge_Bay[] ACE_TIME_PROGMEM }; -static const char kZoneNameAmerica_Cambridge_Bay[] ACE_TIME_PROGMEM = "America/Cambridge_Bay"; +static const char kZoneNameAmerica_Cambridge_Bay[] ACE_TIME_PROGMEM = "\x02" "Cambridge_Bay"; const extended::ZoneInfo kZoneAmerica_Cambridge_Bay ACE_TIME_PROGMEM = { kZoneNameAmerica_Cambridge_Bay /*name*/, @@ -2525,9 +2550,9 @@ const extended::ZoneInfo kZoneAmerica_Cambridge_Bay ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Campo_Grande // Zone Eras: 1 -// Strings (bytes): 29 -// Memory (8-bit): 51 -// Memory (32-bit): 65 +// Strings (bytes): 22 (originally 29) +// Memory (8-bit): 44 +// Memory (32-bit): 58 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Campo_Grande[] ACE_TIME_PROGMEM = { @@ -2546,7 +2571,7 @@ static const extended::ZoneEra kZoneEraAmerica_Campo_Grande[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Campo_Grande[] ACE_TIME_PROGMEM = "America/Campo_Grande"; +static const char kZoneNameAmerica_Campo_Grande[] ACE_TIME_PROGMEM = "\x02" "Campo_Grande"; const extended::ZoneInfo kZoneAmerica_Campo_Grande ACE_TIME_PROGMEM = { kZoneNameAmerica_Campo_Grande /*name*/, @@ -2559,9 +2584,9 @@ const extended::ZoneInfo kZoneAmerica_Campo_Grande ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Cancun // Zone Eras: 2 -// Strings (bytes): 23 -// Memory (8-bit): 56 -// Memory (32-bit): 75 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 49 +// Memory (32-bit): 68 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Cancun[] ACE_TIME_PROGMEM = { @@ -2592,7 +2617,7 @@ static const extended::ZoneEra kZoneEraAmerica_Cancun[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Cancun[] ACE_TIME_PROGMEM = "America/Cancun"; +static const char kZoneNameAmerica_Cancun[] ACE_TIME_PROGMEM = "\x02" "Cancun"; const extended::ZoneInfo kZoneAmerica_Cancun ACE_TIME_PROGMEM = { kZoneNameAmerica_Cancun /*name*/, @@ -2605,9 +2630,9 @@ const extended::ZoneInfo kZoneAmerica_Cancun ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Caracas // Zone Eras: 3 -// Strings (bytes): 30 -// Memory (8-bit): 74 -// Memory (32-bit): 98 +// Strings (bytes): 23 (originally 30) +// Memory (8-bit): 67 +// Memory (32-bit): 91 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Caracas[] ACE_TIME_PROGMEM = { @@ -2650,7 +2675,7 @@ static const extended::ZoneEra kZoneEraAmerica_Caracas[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Caracas[] ACE_TIME_PROGMEM = "America/Caracas"; +static const char kZoneNameAmerica_Caracas[] ACE_TIME_PROGMEM = "\x02" "Caracas"; const extended::ZoneInfo kZoneAmerica_Caracas ACE_TIME_PROGMEM = { kZoneNameAmerica_Caracas /*name*/, @@ -2663,9 +2688,9 @@ const extended::ZoneInfo kZoneAmerica_Caracas ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Cayenne // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Cayenne[] ACE_TIME_PROGMEM = { @@ -2684,7 +2709,7 @@ static const extended::ZoneEra kZoneEraAmerica_Cayenne[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Cayenne[] ACE_TIME_PROGMEM = "America/Cayenne"; +static const char kZoneNameAmerica_Cayenne[] ACE_TIME_PROGMEM = "\x02" "Cayenne"; const extended::ZoneInfo kZoneAmerica_Cayenne ACE_TIME_PROGMEM = { kZoneNameAmerica_Cayenne /*name*/, @@ -2697,9 +2722,9 @@ const extended::ZoneInfo kZoneAmerica_Cayenne ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Chicago // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Chicago[] ACE_TIME_PROGMEM = { @@ -2718,7 +2743,7 @@ static const extended::ZoneEra kZoneEraAmerica_Chicago[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Chicago[] ACE_TIME_PROGMEM = "America/Chicago"; +static const char kZoneNameAmerica_Chicago[] ACE_TIME_PROGMEM = "\x02" "Chicago"; const extended::ZoneInfo kZoneAmerica_Chicago ACE_TIME_PROGMEM = { kZoneNameAmerica_Chicago /*name*/, @@ -2731,9 +2756,9 @@ const extended::ZoneInfo kZoneAmerica_Chicago ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Chihuahua // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Chihuahua[] ACE_TIME_PROGMEM = { @@ -2752,7 +2777,7 @@ static const extended::ZoneEra kZoneEraAmerica_Chihuahua[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Chihuahua[] ACE_TIME_PROGMEM = "America/Chihuahua"; +static const char kZoneNameAmerica_Chihuahua[] ACE_TIME_PROGMEM = "\x02" "Chihuahua"; const extended::ZoneInfo kZoneAmerica_Chihuahua ACE_TIME_PROGMEM = { kZoneNameAmerica_Chihuahua /*name*/, @@ -2765,9 +2790,9 @@ const extended::ZoneInfo kZoneAmerica_Chihuahua ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Costa_Rica // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Costa_Rica[] ACE_TIME_PROGMEM = { @@ -2786,7 +2811,7 @@ static const extended::ZoneEra kZoneEraAmerica_Costa_Rica[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Costa_Rica[] ACE_TIME_PROGMEM = "America/Costa_Rica"; +static const char kZoneNameAmerica_Costa_Rica[] ACE_TIME_PROGMEM = "\x02" "Costa_Rica"; const extended::ZoneInfo kZoneAmerica_Costa_Rica ACE_TIME_PROGMEM = { kZoneNameAmerica_Costa_Rica /*name*/, @@ -2799,9 +2824,9 @@ const extended::ZoneInfo kZoneAmerica_Costa_Rica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Creston // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Creston[] ACE_TIME_PROGMEM = { @@ -2820,7 +2845,7 @@ static const extended::ZoneEra kZoneEraAmerica_Creston[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Creston[] ACE_TIME_PROGMEM = "America/Creston"; +static const char kZoneNameAmerica_Creston[] ACE_TIME_PROGMEM = "\x02" "Creston"; const extended::ZoneInfo kZoneAmerica_Creston ACE_TIME_PROGMEM = { kZoneNameAmerica_Creston /*name*/, @@ -2833,9 +2858,9 @@ const extended::ZoneInfo kZoneAmerica_Creston ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Cuiaba // Zone Eras: 3 -// Strings (bytes): 35 -// Memory (8-bit): 79 -// Memory (32-bit): 103 +// Strings (bytes): 28 (originally 35) +// Memory (8-bit): 72 +// Memory (32-bit): 96 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Cuiaba[] ACE_TIME_PROGMEM = { @@ -2878,7 +2903,7 @@ static const extended::ZoneEra kZoneEraAmerica_Cuiaba[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Cuiaba[] ACE_TIME_PROGMEM = "America/Cuiaba"; +static const char kZoneNameAmerica_Cuiaba[] ACE_TIME_PROGMEM = "\x02" "Cuiaba"; const extended::ZoneInfo kZoneAmerica_Cuiaba ACE_TIME_PROGMEM = { kZoneNameAmerica_Cuiaba /*name*/, @@ -2891,9 +2916,9 @@ const extended::ZoneInfo kZoneAmerica_Cuiaba ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Curacao // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Curacao[] ACE_TIME_PROGMEM = { @@ -2912,7 +2937,7 @@ static const extended::ZoneEra kZoneEraAmerica_Curacao[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Curacao[] ACE_TIME_PROGMEM = "America/Curacao"; +static const char kZoneNameAmerica_Curacao[] ACE_TIME_PROGMEM = "\x02" "Curacao"; const extended::ZoneInfo kZoneAmerica_Curacao ACE_TIME_PROGMEM = { kZoneNameAmerica_Curacao /*name*/, @@ -2925,9 +2950,9 @@ const extended::ZoneInfo kZoneAmerica_Curacao ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Danmarkshavn // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Danmarkshavn[] ACE_TIME_PROGMEM = { @@ -2946,7 +2971,7 @@ static const extended::ZoneEra kZoneEraAmerica_Danmarkshavn[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Danmarkshavn[] ACE_TIME_PROGMEM = "America/Danmarkshavn"; +static const char kZoneNameAmerica_Danmarkshavn[] ACE_TIME_PROGMEM = "\x02" "Danmarkshavn"; const extended::ZoneInfo kZoneAmerica_Danmarkshavn ACE_TIME_PROGMEM = { kZoneNameAmerica_Danmarkshavn /*name*/, @@ -2959,9 +2984,9 @@ const extended::ZoneInfo kZoneAmerica_Danmarkshavn ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Dawson // Zone Eras: 2 -// Strings (bytes): 23 -// Memory (8-bit): 56 -// Memory (32-bit): 75 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 49 +// Memory (32-bit): 68 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Dawson[] ACE_TIME_PROGMEM = { @@ -2992,7 +3017,7 @@ static const extended::ZoneEra kZoneEraAmerica_Dawson[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Dawson[] ACE_TIME_PROGMEM = "America/Dawson"; +static const char kZoneNameAmerica_Dawson[] ACE_TIME_PROGMEM = "\x02" "Dawson"; const extended::ZoneInfo kZoneAmerica_Dawson ACE_TIME_PROGMEM = { kZoneNameAmerica_Dawson /*name*/, @@ -3005,9 +3030,9 @@ const extended::ZoneInfo kZoneAmerica_Dawson ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Dawson_Creek // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Dawson_Creek[] ACE_TIME_PROGMEM = { @@ -3026,7 +3051,7 @@ static const extended::ZoneEra kZoneEraAmerica_Dawson_Creek[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Dawson_Creek[] ACE_TIME_PROGMEM = "America/Dawson_Creek"; +static const char kZoneNameAmerica_Dawson_Creek[] ACE_TIME_PROGMEM = "\x02" "Dawson_Creek"; const extended::ZoneInfo kZoneAmerica_Dawson_Creek ACE_TIME_PROGMEM = { kZoneNameAmerica_Dawson_Creek /*name*/, @@ -3039,9 +3064,9 @@ const extended::ZoneInfo kZoneAmerica_Dawson_Creek ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Denver // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Denver[] ACE_TIME_PROGMEM = { @@ -3060,7 +3085,7 @@ static const extended::ZoneEra kZoneEraAmerica_Denver[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Denver[] ACE_TIME_PROGMEM = "America/Denver"; +static const char kZoneNameAmerica_Denver[] ACE_TIME_PROGMEM = "\x02" "Denver"; const extended::ZoneInfo kZoneAmerica_Denver ACE_TIME_PROGMEM = { kZoneNameAmerica_Denver /*name*/, @@ -3073,9 +3098,9 @@ const extended::ZoneInfo kZoneAmerica_Denver ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Detroit // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Detroit[] ACE_TIME_PROGMEM = { @@ -3094,7 +3119,7 @@ static const extended::ZoneEra kZoneEraAmerica_Detroit[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Detroit[] ACE_TIME_PROGMEM = "America/Detroit"; +static const char kZoneNameAmerica_Detroit[] ACE_TIME_PROGMEM = "\x02" "Detroit"; const extended::ZoneInfo kZoneAmerica_Detroit ACE_TIME_PROGMEM = { kZoneNameAmerica_Detroit /*name*/, @@ -3107,9 +3132,9 @@ const extended::ZoneInfo kZoneAmerica_Detroit ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Edmonton // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Edmonton[] ACE_TIME_PROGMEM = { @@ -3128,7 +3153,7 @@ static const extended::ZoneEra kZoneEraAmerica_Edmonton[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Edmonton[] ACE_TIME_PROGMEM = "America/Edmonton"; +static const char kZoneNameAmerica_Edmonton[] ACE_TIME_PROGMEM = "\x02" "Edmonton"; const extended::ZoneInfo kZoneAmerica_Edmonton ACE_TIME_PROGMEM = { kZoneNameAmerica_Edmonton /*name*/, @@ -3141,9 +3166,9 @@ const extended::ZoneInfo kZoneAmerica_Edmonton ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Eirunepe // Zone Eras: 3 -// Strings (bytes): 29 -// Memory (8-bit): 73 -// Memory (32-bit): 97 +// Strings (bytes): 22 (originally 29) +// Memory (8-bit): 66 +// Memory (32-bit): 90 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Eirunepe[] ACE_TIME_PROGMEM = { @@ -3186,7 +3211,7 @@ static const extended::ZoneEra kZoneEraAmerica_Eirunepe[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Eirunepe[] ACE_TIME_PROGMEM = "America/Eirunepe"; +static const char kZoneNameAmerica_Eirunepe[] ACE_TIME_PROGMEM = "\x02" "Eirunepe"; const extended::ZoneInfo kZoneAmerica_Eirunepe ACE_TIME_PROGMEM = { kZoneNameAmerica_Eirunepe /*name*/, @@ -3199,9 +3224,9 @@ const extended::ZoneInfo kZoneAmerica_Eirunepe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/El_Salvador // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_El_Salvador[] ACE_TIME_PROGMEM = { @@ -3220,7 +3245,7 @@ static const extended::ZoneEra kZoneEraAmerica_El_Salvador[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_El_Salvador[] ACE_TIME_PROGMEM = "America/El_Salvador"; +static const char kZoneNameAmerica_El_Salvador[] ACE_TIME_PROGMEM = "\x02" "El_Salvador"; const extended::ZoneInfo kZoneAmerica_El_Salvador ACE_TIME_PROGMEM = { kZoneNameAmerica_El_Salvador /*name*/, @@ -3233,9 +3258,9 @@ const extended::ZoneInfo kZoneAmerica_El_Salvador ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Fort_Nelson // Zone Eras: 2 -// Strings (bytes): 28 -// Memory (8-bit): 61 -// Memory (32-bit): 80 +// Strings (bytes): 21 (originally 28) +// Memory (8-bit): 54 +// Memory (32-bit): 73 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Fort_Nelson[] ACE_TIME_PROGMEM = { @@ -3266,7 +3291,7 @@ static const extended::ZoneEra kZoneEraAmerica_Fort_Nelson[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Fort_Nelson[] ACE_TIME_PROGMEM = "America/Fort_Nelson"; +static const char kZoneNameAmerica_Fort_Nelson[] ACE_TIME_PROGMEM = "\x02" "Fort_Nelson"; const extended::ZoneInfo kZoneAmerica_Fort_Nelson ACE_TIME_PROGMEM = { kZoneNameAmerica_Fort_Nelson /*name*/, @@ -3279,9 +3304,9 @@ const extended::ZoneInfo kZoneAmerica_Fort_Nelson ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Fortaleza // Zone Eras: 5 -// Strings (bytes): 46 -// Memory (8-bit): 112 -// Memory (32-bit): 146 +// Strings (bytes): 39 (originally 46) +// Memory (8-bit): 105 +// Memory (32-bit): 139 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Fortaleza[] ACE_TIME_PROGMEM = { @@ -3348,7 +3373,7 @@ static const extended::ZoneEra kZoneEraAmerica_Fortaleza[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Fortaleza[] ACE_TIME_PROGMEM = "America/Fortaleza"; +static const char kZoneNameAmerica_Fortaleza[] ACE_TIME_PROGMEM = "\x02" "Fortaleza"; const extended::ZoneInfo kZoneAmerica_Fortaleza ACE_TIME_PROGMEM = { kZoneNameAmerica_Fortaleza /*name*/, @@ -3361,9 +3386,9 @@ const extended::ZoneInfo kZoneAmerica_Fortaleza ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Glace_Bay // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Glace_Bay[] ACE_TIME_PROGMEM = { @@ -3382,7 +3407,7 @@ static const extended::ZoneEra kZoneEraAmerica_Glace_Bay[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Glace_Bay[] ACE_TIME_PROGMEM = "America/Glace_Bay"; +static const char kZoneNameAmerica_Glace_Bay[] ACE_TIME_PROGMEM = "\x02" "Glace_Bay"; const extended::ZoneInfo kZoneAmerica_Glace_Bay ACE_TIME_PROGMEM = { kZoneNameAmerica_Glace_Bay /*name*/, @@ -3395,9 +3420,9 @@ const extended::ZoneInfo kZoneAmerica_Glace_Bay ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Goose_Bay // Zone Eras: 2 -// Strings (bytes): 26 -// Memory (8-bit): 59 -// Memory (32-bit): 78 +// Strings (bytes): 19 (originally 26) +// Memory (8-bit): 52 +// Memory (32-bit): 71 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Goose_Bay[] ACE_TIME_PROGMEM = { @@ -3428,7 +3453,7 @@ static const extended::ZoneEra kZoneEraAmerica_Goose_Bay[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Goose_Bay[] ACE_TIME_PROGMEM = "America/Goose_Bay"; +static const char kZoneNameAmerica_Goose_Bay[] ACE_TIME_PROGMEM = "\x02" "Goose_Bay"; const extended::ZoneInfo kZoneAmerica_Goose_Bay ACE_TIME_PROGMEM = { kZoneNameAmerica_Goose_Bay /*name*/, @@ -3441,9 +3466,9 @@ const extended::ZoneInfo kZoneAmerica_Goose_Bay ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Grand_Turk // Zone Eras: 3 -// Strings (bytes): 31 -// Memory (8-bit): 75 -// Memory (32-bit): 99 +// Strings (bytes): 24 (originally 31) +// Memory (8-bit): 68 +// Memory (32-bit): 92 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Grand_Turk[] ACE_TIME_PROGMEM = { @@ -3486,7 +3511,7 @@ static const extended::ZoneEra kZoneEraAmerica_Grand_Turk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Grand_Turk[] ACE_TIME_PROGMEM = "America/Grand_Turk"; +static const char kZoneNameAmerica_Grand_Turk[] ACE_TIME_PROGMEM = "\x02" "Grand_Turk"; const extended::ZoneInfo kZoneAmerica_Grand_Turk ACE_TIME_PROGMEM = { kZoneNameAmerica_Grand_Turk /*name*/, @@ -3499,9 +3524,9 @@ const extended::ZoneInfo kZoneAmerica_Grand_Turk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Guatemala // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Guatemala[] ACE_TIME_PROGMEM = { @@ -3520,7 +3545,7 @@ static const extended::ZoneEra kZoneEraAmerica_Guatemala[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Guatemala[] ACE_TIME_PROGMEM = "America/Guatemala"; +static const char kZoneNameAmerica_Guatemala[] ACE_TIME_PROGMEM = "\x02" "Guatemala"; const extended::ZoneInfo kZoneAmerica_Guatemala ACE_TIME_PROGMEM = { kZoneNameAmerica_Guatemala /*name*/, @@ -3533,9 +3558,9 @@ const extended::ZoneInfo kZoneAmerica_Guatemala ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Guayaquil // Zone Eras: 1 -// Strings (bytes): 26 -// Memory (8-bit): 48 -// Memory (32-bit): 62 +// Strings (bytes): 19 (originally 26) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Guayaquil[] ACE_TIME_PROGMEM = { @@ -3554,7 +3579,7 @@ static const extended::ZoneEra kZoneEraAmerica_Guayaquil[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Guayaquil[] ACE_TIME_PROGMEM = "America/Guayaquil"; +static const char kZoneNameAmerica_Guayaquil[] ACE_TIME_PROGMEM = "\x02" "Guayaquil"; const extended::ZoneInfo kZoneAmerica_Guayaquil ACE_TIME_PROGMEM = { kZoneNameAmerica_Guayaquil /*name*/, @@ -3567,9 +3592,9 @@ const extended::ZoneInfo kZoneAmerica_Guayaquil ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Guyana // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Guyana[] ACE_TIME_PROGMEM = { @@ -3588,7 +3613,7 @@ static const extended::ZoneEra kZoneEraAmerica_Guyana[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Guyana[] ACE_TIME_PROGMEM = "America/Guyana"; +static const char kZoneNameAmerica_Guyana[] ACE_TIME_PROGMEM = "\x02" "Guyana"; const extended::ZoneInfo kZoneAmerica_Guyana ACE_TIME_PROGMEM = { kZoneNameAmerica_Guyana /*name*/, @@ -3601,9 +3626,9 @@ const extended::ZoneInfo kZoneAmerica_Guyana ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Halifax // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Halifax[] ACE_TIME_PROGMEM = { @@ -3622,7 +3647,7 @@ static const extended::ZoneEra kZoneEraAmerica_Halifax[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Halifax[] ACE_TIME_PROGMEM = "America/Halifax"; +static const char kZoneNameAmerica_Halifax[] ACE_TIME_PROGMEM = "\x02" "Halifax"; const extended::ZoneInfo kZoneAmerica_Halifax ACE_TIME_PROGMEM = { kZoneNameAmerica_Halifax /*name*/, @@ -3635,9 +3660,9 @@ const extended::ZoneInfo kZoneAmerica_Halifax ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Havana // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Havana[] ACE_TIME_PROGMEM = { @@ -3656,7 +3681,7 @@ static const extended::ZoneEra kZoneEraAmerica_Havana[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Havana[] ACE_TIME_PROGMEM = "America/Havana"; +static const char kZoneNameAmerica_Havana[] ACE_TIME_PROGMEM = "\x02" "Havana"; const extended::ZoneInfo kZoneAmerica_Havana ACE_TIME_PROGMEM = { kZoneNameAmerica_Havana /*name*/, @@ -3669,9 +3694,9 @@ const extended::ZoneInfo kZoneAmerica_Havana ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Hermosillo // Zone Eras: 2 -// Strings (bytes): 27 -// Memory (8-bit): 60 -// Memory (32-bit): 79 +// Strings (bytes): 20 (originally 27) +// Memory (8-bit): 53 +// Memory (32-bit): 72 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Hermosillo[] ACE_TIME_PROGMEM = { @@ -3702,7 +3727,7 @@ static const extended::ZoneEra kZoneEraAmerica_Hermosillo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Hermosillo[] ACE_TIME_PROGMEM = "America/Hermosillo"; +static const char kZoneNameAmerica_Hermosillo[] ACE_TIME_PROGMEM = "\x02" "Hermosillo"; const extended::ZoneInfo kZoneAmerica_Hermosillo ACE_TIME_PROGMEM = { kZoneNameAmerica_Hermosillo /*name*/, @@ -3715,9 +3740,9 @@ const extended::ZoneInfo kZoneAmerica_Hermosillo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Indiana/Indianapolis // Zone Eras: 2 -// Strings (bytes): 37 -// Memory (8-bit): 70 -// Memory (32-bit): 89 +// Strings (bytes): 23 (originally 37) +// Memory (8-bit): 56 +// Memory (32-bit): 75 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Indiana_Indianapolis[] ACE_TIME_PROGMEM = { @@ -3748,7 +3773,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Indianapolis[] ACE_TIME_P }; -static const char kZoneNameAmerica_Indiana_Indianapolis[] ACE_TIME_PROGMEM = "America/Indiana/Indianapolis"; +static const char kZoneNameAmerica_Indiana_Indianapolis[] ACE_TIME_PROGMEM = "\x02" "\x0d" "Indianapolis"; const extended::ZoneInfo kZoneAmerica_Indiana_Indianapolis ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Indianapolis /*name*/, @@ -3761,9 +3786,9 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Indianapolis ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Indiana/Knox // Zone Eras: 2 -// Strings (bytes): 29 -// Memory (8-bit): 62 -// Memory (32-bit): 81 +// Strings (bytes): 15 (originally 29) +// Memory (8-bit): 48 +// Memory (32-bit): 67 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Indiana_Knox[] ACE_TIME_PROGMEM = { @@ -3794,7 +3819,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Knox[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Indiana_Knox[] ACE_TIME_PROGMEM = "America/Indiana/Knox"; +static const char kZoneNameAmerica_Indiana_Knox[] ACE_TIME_PROGMEM = "\x02" "\x0d" "Knox"; const extended::ZoneInfo kZoneAmerica_Indiana_Knox ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Knox /*name*/, @@ -3807,10 +3832,10 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Knox ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Indiana/Marengo // Zone Eras: 2 -// Strings (bytes): 32 -// Memory (8-bit): 65 -// Memory (32-bit): 84 -//--------------------------------------------------------------------------- +// Strings (bytes): 18 (originally 32) +// Memory (8-bit): 51 +// Memory (32-bit): 70 +//--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Indiana_Marengo[] ACE_TIME_PROGMEM = { // -5:00 - EST 2006 @@ -3840,7 +3865,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Marengo[] ACE_TIME_PROGME }; -static const char kZoneNameAmerica_Indiana_Marengo[] ACE_TIME_PROGMEM = "America/Indiana/Marengo"; +static const char kZoneNameAmerica_Indiana_Marengo[] ACE_TIME_PROGMEM = "\x02" "\x0d" "Marengo"; const extended::ZoneInfo kZoneAmerica_Indiana_Marengo ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Marengo /*name*/, @@ -3853,9 +3878,9 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Marengo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Indiana/Petersburg // Zone Eras: 3 -// Strings (bytes): 39 -// Memory (8-bit): 83 -// Memory (32-bit): 107 +// Strings (bytes): 25 (originally 39) +// Memory (8-bit): 69 +// Memory (32-bit): 93 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Indiana_Petersburg[] ACE_TIME_PROGMEM = { @@ -3898,7 +3923,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Petersburg[] ACE_TIME_PRO }; -static const char kZoneNameAmerica_Indiana_Petersburg[] ACE_TIME_PROGMEM = "America/Indiana/Petersburg"; +static const char kZoneNameAmerica_Indiana_Petersburg[] ACE_TIME_PROGMEM = "\x02" "\x0d" "Petersburg"; const extended::ZoneInfo kZoneAmerica_Indiana_Petersburg ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Petersburg /*name*/, @@ -3911,9 +3936,9 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Petersburg ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Indiana/Tell_City // Zone Eras: 2 -// Strings (bytes): 34 -// Memory (8-bit): 67 -// Memory (32-bit): 86 +// Strings (bytes): 20 (originally 34) +// Memory (8-bit): 53 +// Memory (32-bit): 72 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Indiana_Tell_City[] ACE_TIME_PROGMEM = { @@ -3944,7 +3969,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Tell_City[] ACE_TIME_PROG }; -static const char kZoneNameAmerica_Indiana_Tell_City[] ACE_TIME_PROGMEM = "America/Indiana/Tell_City"; +static const char kZoneNameAmerica_Indiana_Tell_City[] ACE_TIME_PROGMEM = "\x02" "\x0d" "Tell_City"; const extended::ZoneInfo kZoneAmerica_Indiana_Tell_City ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Tell_City /*name*/, @@ -3957,9 +3982,9 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Tell_City ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Indiana/Vevay // Zone Eras: 2 -// Strings (bytes): 30 -// Memory (8-bit): 63 -// Memory (32-bit): 82 +// Strings (bytes): 16 (originally 30) +// Memory (8-bit): 49 +// Memory (32-bit): 68 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Indiana_Vevay[] ACE_TIME_PROGMEM = { @@ -3990,7 +4015,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Vevay[] ACE_TIME_PROGMEM }; -static const char kZoneNameAmerica_Indiana_Vevay[] ACE_TIME_PROGMEM = "America/Indiana/Vevay"; +static const char kZoneNameAmerica_Indiana_Vevay[] ACE_TIME_PROGMEM = "\x02" "\x0d" "Vevay"; const extended::ZoneInfo kZoneAmerica_Indiana_Vevay ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Vevay /*name*/, @@ -4003,9 +4028,9 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Vevay ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Indiana/Vincennes // Zone Eras: 3 -// Strings (bytes): 38 -// Memory (8-bit): 82 -// Memory (32-bit): 106 +// Strings (bytes): 24 (originally 38) +// Memory (8-bit): 68 +// Memory (32-bit): 92 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Indiana_Vincennes[] ACE_TIME_PROGMEM = { @@ -4048,7 +4073,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Vincennes[] ACE_TIME_PROG }; -static const char kZoneNameAmerica_Indiana_Vincennes[] ACE_TIME_PROGMEM = "America/Indiana/Vincennes"; +static const char kZoneNameAmerica_Indiana_Vincennes[] ACE_TIME_PROGMEM = "\x02" "\x0d" "Vincennes"; const extended::ZoneInfo kZoneAmerica_Indiana_Vincennes ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Vincennes /*name*/, @@ -4061,9 +4086,9 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Vincennes ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Indiana/Winamac // Zone Eras: 3 -// Strings (bytes): 36 -// Memory (8-bit): 80 -// Memory (32-bit): 104 +// Strings (bytes): 22 (originally 36) +// Memory (8-bit): 66 +// Memory (32-bit): 90 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Indiana_Winamac[] ACE_TIME_PROGMEM = { @@ -4106,7 +4131,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Winamac[] ACE_TIME_PROGME }; -static const char kZoneNameAmerica_Indiana_Winamac[] ACE_TIME_PROGMEM = "America/Indiana/Winamac"; +static const char kZoneNameAmerica_Indiana_Winamac[] ACE_TIME_PROGMEM = "\x02" "\x0d" "Winamac"; const extended::ZoneInfo kZoneAmerica_Indiana_Winamac ACE_TIME_PROGMEM = { kZoneNameAmerica_Indiana_Winamac /*name*/, @@ -4119,9 +4144,9 @@ const extended::ZoneInfo kZoneAmerica_Indiana_Winamac ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Inuvik // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Inuvik[] ACE_TIME_PROGMEM = { @@ -4140,7 +4165,7 @@ static const extended::ZoneEra kZoneEraAmerica_Inuvik[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Inuvik[] ACE_TIME_PROGMEM = "America/Inuvik"; +static const char kZoneNameAmerica_Inuvik[] ACE_TIME_PROGMEM = "\x02" "Inuvik"; const extended::ZoneInfo kZoneAmerica_Inuvik ACE_TIME_PROGMEM = { kZoneNameAmerica_Inuvik /*name*/, @@ -4153,9 +4178,9 @@ const extended::ZoneInfo kZoneAmerica_Inuvik ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Iqaluit // Zone Eras: 3 -// Strings (bytes): 28 -// Memory (8-bit): 72 -// Memory (32-bit): 96 +// Strings (bytes): 21 (originally 28) +// Memory (8-bit): 65 +// Memory (32-bit): 89 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Iqaluit[] ACE_TIME_PROGMEM = { @@ -4198,7 +4223,7 @@ static const extended::ZoneEra kZoneEraAmerica_Iqaluit[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Iqaluit[] ACE_TIME_PROGMEM = "America/Iqaluit"; +static const char kZoneNameAmerica_Iqaluit[] ACE_TIME_PROGMEM = "\x02" "Iqaluit"; const extended::ZoneInfo kZoneAmerica_Iqaluit ACE_TIME_PROGMEM = { kZoneNameAmerica_Iqaluit /*name*/, @@ -4211,9 +4236,9 @@ const extended::ZoneInfo kZoneAmerica_Iqaluit ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Jamaica // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Jamaica[] ACE_TIME_PROGMEM = { @@ -4232,7 +4257,7 @@ static const extended::ZoneEra kZoneEraAmerica_Jamaica[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Jamaica[] ACE_TIME_PROGMEM = "America/Jamaica"; +static const char kZoneNameAmerica_Jamaica[] ACE_TIME_PROGMEM = "\x02" "Jamaica"; const extended::ZoneInfo kZoneAmerica_Jamaica ACE_TIME_PROGMEM = { kZoneNameAmerica_Jamaica /*name*/, @@ -4245,9 +4270,9 @@ const extended::ZoneInfo kZoneAmerica_Jamaica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Juneau // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Juneau[] ACE_TIME_PROGMEM = { @@ -4266,7 +4291,7 @@ static const extended::ZoneEra kZoneEraAmerica_Juneau[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Juneau[] ACE_TIME_PROGMEM = "America/Juneau"; +static const char kZoneNameAmerica_Juneau[] ACE_TIME_PROGMEM = "\x02" "Juneau"; const extended::ZoneInfo kZoneAmerica_Juneau ACE_TIME_PROGMEM = { kZoneNameAmerica_Juneau /*name*/, @@ -4279,9 +4304,9 @@ const extended::ZoneInfo kZoneAmerica_Juneau ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Kentucky/Louisville // Zone Eras: 1 -// Strings (bytes): 32 -// Memory (8-bit): 54 -// Memory (32-bit): 68 +// Strings (bytes): 25 (originally 32) +// Memory (8-bit): 47 +// Memory (32-bit): 61 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Kentucky_Louisville[] ACE_TIME_PROGMEM = { @@ -4300,7 +4325,7 @@ static const extended::ZoneEra kZoneEraAmerica_Kentucky_Louisville[] ACE_TIME_PR }; -static const char kZoneNameAmerica_Kentucky_Louisville[] ACE_TIME_PROGMEM = "America/Kentucky/Louisville"; +static const char kZoneNameAmerica_Kentucky_Louisville[] ACE_TIME_PROGMEM = "\x02" "Kentucky/Louisville"; const extended::ZoneInfo kZoneAmerica_Kentucky_Louisville ACE_TIME_PROGMEM = { kZoneNameAmerica_Kentucky_Louisville /*name*/, @@ -4313,9 +4338,9 @@ const extended::ZoneInfo kZoneAmerica_Kentucky_Louisville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Kentucky/Monticello // Zone Eras: 2 -// Strings (bytes): 36 -// Memory (8-bit): 69 -// Memory (32-bit): 88 +// Strings (bytes): 29 (originally 36) +// Memory (8-bit): 62 +// Memory (32-bit): 81 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Kentucky_Monticello[] ACE_TIME_PROGMEM = { @@ -4346,7 +4371,7 @@ static const extended::ZoneEra kZoneEraAmerica_Kentucky_Monticello[] ACE_TIME_PR }; -static const char kZoneNameAmerica_Kentucky_Monticello[] ACE_TIME_PROGMEM = "America/Kentucky/Monticello"; +static const char kZoneNameAmerica_Kentucky_Monticello[] ACE_TIME_PROGMEM = "\x02" "Kentucky/Monticello"; const extended::ZoneInfo kZoneAmerica_Kentucky_Monticello ACE_TIME_PROGMEM = { kZoneNameAmerica_Kentucky_Monticello /*name*/, @@ -4359,9 +4384,9 @@ const extended::ZoneInfo kZoneAmerica_Kentucky_Monticello ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/La_Paz // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_La_Paz[] ACE_TIME_PROGMEM = { @@ -4380,7 +4405,7 @@ static const extended::ZoneEra kZoneEraAmerica_La_Paz[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_La_Paz[] ACE_TIME_PROGMEM = "America/La_Paz"; +static const char kZoneNameAmerica_La_Paz[] ACE_TIME_PROGMEM = "\x02" "La_Paz"; const extended::ZoneInfo kZoneAmerica_La_Paz ACE_TIME_PROGMEM = { kZoneNameAmerica_La_Paz /*name*/, @@ -4393,9 +4418,9 @@ const extended::ZoneInfo kZoneAmerica_La_Paz ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Lima // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Lima[] ACE_TIME_PROGMEM = { @@ -4414,7 +4439,7 @@ static const extended::ZoneEra kZoneEraAmerica_Lima[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Lima[] ACE_TIME_PROGMEM = "America/Lima"; +static const char kZoneNameAmerica_Lima[] ACE_TIME_PROGMEM = "\x02" "Lima"; const extended::ZoneInfo kZoneAmerica_Lima ACE_TIME_PROGMEM = { kZoneNameAmerica_Lima /*name*/, @@ -4427,9 +4452,9 @@ const extended::ZoneInfo kZoneAmerica_Lima ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Los_Angeles // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Los_Angeles[] ACE_TIME_PROGMEM = { @@ -4448,7 +4473,7 @@ static const extended::ZoneEra kZoneEraAmerica_Los_Angeles[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Los_Angeles[] ACE_TIME_PROGMEM = "America/Los_Angeles"; +static const char kZoneNameAmerica_Los_Angeles[] ACE_TIME_PROGMEM = "\x02" "Los_Angeles"; const extended::ZoneInfo kZoneAmerica_Los_Angeles ACE_TIME_PROGMEM = { kZoneNameAmerica_Los_Angeles /*name*/, @@ -4461,9 +4486,9 @@ const extended::ZoneInfo kZoneAmerica_Los_Angeles ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Maceio // Zone Eras: 5 -// Strings (bytes): 43 -// Memory (8-bit): 109 -// Memory (32-bit): 143 +// Strings (bytes): 36 (originally 43) +// Memory (8-bit): 102 +// Memory (32-bit): 136 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Maceio[] ACE_TIME_PROGMEM = { @@ -4530,7 +4555,7 @@ static const extended::ZoneEra kZoneEraAmerica_Maceio[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Maceio[] ACE_TIME_PROGMEM = "America/Maceio"; +static const char kZoneNameAmerica_Maceio[] ACE_TIME_PROGMEM = "\x02" "Maceio"; const extended::ZoneInfo kZoneAmerica_Maceio ACE_TIME_PROGMEM = { kZoneNameAmerica_Maceio /*name*/, @@ -4543,9 +4568,9 @@ const extended::ZoneInfo kZoneAmerica_Maceio ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Managua // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Managua[] ACE_TIME_PROGMEM = { @@ -4564,7 +4589,7 @@ static const extended::ZoneEra kZoneEraAmerica_Managua[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Managua[] ACE_TIME_PROGMEM = "America/Managua"; +static const char kZoneNameAmerica_Managua[] ACE_TIME_PROGMEM = "\x02" "Managua"; const extended::ZoneInfo kZoneAmerica_Managua ACE_TIME_PROGMEM = { kZoneNameAmerica_Managua /*name*/, @@ -4577,9 +4602,9 @@ const extended::ZoneInfo kZoneAmerica_Managua ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Manaus // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Manaus[] ACE_TIME_PROGMEM = { @@ -4598,7 +4623,7 @@ static const extended::ZoneEra kZoneEraAmerica_Manaus[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Manaus[] ACE_TIME_PROGMEM = "America/Manaus"; +static const char kZoneNameAmerica_Manaus[] ACE_TIME_PROGMEM = "\x02" "Manaus"; const extended::ZoneInfo kZoneAmerica_Manaus ACE_TIME_PROGMEM = { kZoneNameAmerica_Manaus /*name*/, @@ -4611,9 +4636,9 @@ const extended::ZoneInfo kZoneAmerica_Manaus ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Martinique // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Martinique[] ACE_TIME_PROGMEM = { @@ -4632,7 +4657,7 @@ static const extended::ZoneEra kZoneEraAmerica_Martinique[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Martinique[] ACE_TIME_PROGMEM = "America/Martinique"; +static const char kZoneNameAmerica_Martinique[] ACE_TIME_PROGMEM = "\x02" "Martinique"; const extended::ZoneInfo kZoneAmerica_Martinique ACE_TIME_PROGMEM = { kZoneNameAmerica_Martinique /*name*/, @@ -4645,9 +4670,9 @@ const extended::ZoneInfo kZoneAmerica_Martinique ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Matamoros // Zone Eras: 2 -// Strings (bytes): 26 -// Memory (8-bit): 59 -// Memory (32-bit): 78 +// Strings (bytes): 19 (originally 26) +// Memory (8-bit): 52 +// Memory (32-bit): 71 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Matamoros[] ACE_TIME_PROGMEM = { @@ -4678,7 +4703,7 @@ static const extended::ZoneEra kZoneEraAmerica_Matamoros[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Matamoros[] ACE_TIME_PROGMEM = "America/Matamoros"; +static const char kZoneNameAmerica_Matamoros[] ACE_TIME_PROGMEM = "\x02" "Matamoros"; const extended::ZoneInfo kZoneAmerica_Matamoros ACE_TIME_PROGMEM = { kZoneNameAmerica_Matamoros /*name*/, @@ -4691,9 +4716,9 @@ const extended::ZoneInfo kZoneAmerica_Matamoros ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Mazatlan // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Mazatlan[] ACE_TIME_PROGMEM = { @@ -4712,7 +4737,7 @@ static const extended::ZoneEra kZoneEraAmerica_Mazatlan[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Mazatlan[] ACE_TIME_PROGMEM = "America/Mazatlan"; +static const char kZoneNameAmerica_Mazatlan[] ACE_TIME_PROGMEM = "\x02" "Mazatlan"; const extended::ZoneInfo kZoneAmerica_Mazatlan ACE_TIME_PROGMEM = { kZoneNameAmerica_Mazatlan /*name*/, @@ -4725,9 +4750,9 @@ const extended::ZoneInfo kZoneAmerica_Mazatlan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Menominee // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Menominee[] ACE_TIME_PROGMEM = { @@ -4746,7 +4771,7 @@ static const extended::ZoneEra kZoneEraAmerica_Menominee[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Menominee[] ACE_TIME_PROGMEM = "America/Menominee"; +static const char kZoneNameAmerica_Menominee[] ACE_TIME_PROGMEM = "\x02" "Menominee"; const extended::ZoneInfo kZoneAmerica_Menominee ACE_TIME_PROGMEM = { kZoneNameAmerica_Menominee /*name*/, @@ -4759,9 +4784,9 @@ const extended::ZoneInfo kZoneAmerica_Menominee ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Merida // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Merida[] ACE_TIME_PROGMEM = { @@ -4780,7 +4805,7 @@ static const extended::ZoneEra kZoneEraAmerica_Merida[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Merida[] ACE_TIME_PROGMEM = "America/Merida"; +static const char kZoneNameAmerica_Merida[] ACE_TIME_PROGMEM = "\x02" "Merida"; const extended::ZoneInfo kZoneAmerica_Merida ACE_TIME_PROGMEM = { kZoneNameAmerica_Merida /*name*/, @@ -4793,9 +4818,9 @@ const extended::ZoneInfo kZoneAmerica_Merida ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Metlakatla // Zone Eras: 4 -// Strings (bytes): 37 -// Memory (8-bit): 92 -// Memory (32-bit): 121 +// Strings (bytes): 30 (originally 37) +// Memory (8-bit): 85 +// Memory (32-bit): 114 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Metlakatla[] ACE_TIME_PROGMEM = { @@ -4850,7 +4875,7 @@ static const extended::ZoneEra kZoneEraAmerica_Metlakatla[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Metlakatla[] ACE_TIME_PROGMEM = "America/Metlakatla"; +static const char kZoneNameAmerica_Metlakatla[] ACE_TIME_PROGMEM = "\x02" "Metlakatla"; const extended::ZoneInfo kZoneAmerica_Metlakatla ACE_TIME_PROGMEM = { kZoneNameAmerica_Metlakatla /*name*/, @@ -4863,9 +4888,9 @@ const extended::ZoneInfo kZoneAmerica_Metlakatla ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Mexico_City // Zone Eras: 3 -// Strings (bytes): 32 -// Memory (8-bit): 76 -// Memory (32-bit): 100 +// Strings (bytes): 25 (originally 32) +// Memory (8-bit): 69 +// Memory (32-bit): 93 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Mexico_City[] ACE_TIME_PROGMEM = { @@ -4908,7 +4933,7 @@ static const extended::ZoneEra kZoneEraAmerica_Mexico_City[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Mexico_City[] ACE_TIME_PROGMEM = "America/Mexico_City"; +static const char kZoneNameAmerica_Mexico_City[] ACE_TIME_PROGMEM = "\x02" "Mexico_City"; const extended::ZoneInfo kZoneAmerica_Mexico_City ACE_TIME_PROGMEM = { kZoneNameAmerica_Mexico_City /*name*/, @@ -4921,9 +4946,9 @@ const extended::ZoneInfo kZoneAmerica_Mexico_City ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Miquelon // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Miquelon[] ACE_TIME_PROGMEM = { @@ -4942,7 +4967,7 @@ static const extended::ZoneEra kZoneEraAmerica_Miquelon[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Miquelon[] ACE_TIME_PROGMEM = "America/Miquelon"; +static const char kZoneNameAmerica_Miquelon[] ACE_TIME_PROGMEM = "\x02" "Miquelon"; const extended::ZoneInfo kZoneAmerica_Miquelon ACE_TIME_PROGMEM = { kZoneNameAmerica_Miquelon /*name*/, @@ -4955,9 +4980,9 @@ const extended::ZoneInfo kZoneAmerica_Miquelon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Moncton // Zone Eras: 2 -// Strings (bytes): 24 -// Memory (8-bit): 57 -// Memory (32-bit): 76 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 50 +// Memory (32-bit): 69 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Moncton[] ACE_TIME_PROGMEM = { @@ -4988,7 +5013,7 @@ static const extended::ZoneEra kZoneEraAmerica_Moncton[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Moncton[] ACE_TIME_PROGMEM = "America/Moncton"; +static const char kZoneNameAmerica_Moncton[] ACE_TIME_PROGMEM = "\x02" "Moncton"; const extended::ZoneInfo kZoneAmerica_Moncton ACE_TIME_PROGMEM = { kZoneNameAmerica_Moncton /*name*/, @@ -5001,9 +5026,9 @@ const extended::ZoneInfo kZoneAmerica_Moncton ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Monterrey // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Monterrey[] ACE_TIME_PROGMEM = { @@ -5022,7 +5047,7 @@ static const extended::ZoneEra kZoneEraAmerica_Monterrey[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Monterrey[] ACE_TIME_PROGMEM = "America/Monterrey"; +static const char kZoneNameAmerica_Monterrey[] ACE_TIME_PROGMEM = "\x02" "Monterrey"; const extended::ZoneInfo kZoneAmerica_Monterrey ACE_TIME_PROGMEM = { kZoneNameAmerica_Monterrey /*name*/, @@ -5035,9 +5060,9 @@ const extended::ZoneInfo kZoneAmerica_Monterrey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Montevideo // Zone Eras: 1 -// Strings (bytes): 27 -// Memory (8-bit): 49 -// Memory (32-bit): 63 +// Strings (bytes): 20 (originally 27) +// Memory (8-bit): 42 +// Memory (32-bit): 56 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Montevideo[] ACE_TIME_PROGMEM = { @@ -5056,7 +5081,7 @@ static const extended::ZoneEra kZoneEraAmerica_Montevideo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Montevideo[] ACE_TIME_PROGMEM = "America/Montevideo"; +static const char kZoneNameAmerica_Montevideo[] ACE_TIME_PROGMEM = "\x02" "Montevideo"; const extended::ZoneInfo kZoneAmerica_Montevideo ACE_TIME_PROGMEM = { kZoneNameAmerica_Montevideo /*name*/, @@ -5069,9 +5094,9 @@ const extended::ZoneInfo kZoneAmerica_Montevideo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Nassau // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Nassau[] ACE_TIME_PROGMEM = { @@ -5090,7 +5115,7 @@ static const extended::ZoneEra kZoneEraAmerica_Nassau[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Nassau[] ACE_TIME_PROGMEM = "America/Nassau"; +static const char kZoneNameAmerica_Nassau[] ACE_TIME_PROGMEM = "\x02" "Nassau"; const extended::ZoneInfo kZoneAmerica_Nassau ACE_TIME_PROGMEM = { kZoneNameAmerica_Nassau /*name*/, @@ -5103,9 +5128,9 @@ const extended::ZoneInfo kZoneAmerica_Nassau ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/New_York // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_New_York[] ACE_TIME_PROGMEM = { @@ -5124,7 +5149,7 @@ static const extended::ZoneEra kZoneEraAmerica_New_York[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_New_York[] ACE_TIME_PROGMEM = "America/New_York"; +static const char kZoneNameAmerica_New_York[] ACE_TIME_PROGMEM = "\x02" "New_York"; const extended::ZoneInfo kZoneAmerica_New_York ACE_TIME_PROGMEM = { kZoneNameAmerica_New_York /*name*/, @@ -5137,9 +5162,9 @@ const extended::ZoneInfo kZoneAmerica_New_York ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Nipigon // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Nipigon[] ACE_TIME_PROGMEM = { @@ -5158,7 +5183,7 @@ static const extended::ZoneEra kZoneEraAmerica_Nipigon[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Nipigon[] ACE_TIME_PROGMEM = "America/Nipigon"; +static const char kZoneNameAmerica_Nipigon[] ACE_TIME_PROGMEM = "\x02" "Nipigon"; const extended::ZoneInfo kZoneAmerica_Nipigon ACE_TIME_PROGMEM = { kZoneNameAmerica_Nipigon /*name*/, @@ -5171,9 +5196,9 @@ const extended::ZoneInfo kZoneAmerica_Nipigon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Nome // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Nome[] ACE_TIME_PROGMEM = { @@ -5192,7 +5217,7 @@ static const extended::ZoneEra kZoneEraAmerica_Nome[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Nome[] ACE_TIME_PROGMEM = "America/Nome"; +static const char kZoneNameAmerica_Nome[] ACE_TIME_PROGMEM = "\x02" "Nome"; const extended::ZoneInfo kZoneAmerica_Nome ACE_TIME_PROGMEM = { kZoneNameAmerica_Nome /*name*/, @@ -5205,9 +5230,9 @@ const extended::ZoneInfo kZoneAmerica_Nome ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Noronha // Zone Eras: 5 -// Strings (bytes): 44 -// Memory (8-bit): 110 -// Memory (32-bit): 144 +// Strings (bytes): 37 (originally 44) +// Memory (8-bit): 103 +// Memory (32-bit): 137 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Noronha[] ACE_TIME_PROGMEM = { @@ -5274,7 +5299,7 @@ static const extended::ZoneEra kZoneEraAmerica_Noronha[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Noronha[] ACE_TIME_PROGMEM = "America/Noronha"; +static const char kZoneNameAmerica_Noronha[] ACE_TIME_PROGMEM = "\x02" "Noronha"; const extended::ZoneInfo kZoneAmerica_Noronha ACE_TIME_PROGMEM = { kZoneNameAmerica_Noronha /*name*/, @@ -5287,9 +5312,9 @@ const extended::ZoneInfo kZoneAmerica_Noronha ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/North_Dakota/Beulah // Zone Eras: 2 -// Strings (bytes): 36 -// Memory (8-bit): 69 -// Memory (32-bit): 88 +// Strings (bytes): 29 (originally 36) +// Memory (8-bit): 62 +// Memory (32-bit): 81 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_North_Dakota_Beulah[] ACE_TIME_PROGMEM = { @@ -5320,7 +5345,7 @@ static const extended::ZoneEra kZoneEraAmerica_North_Dakota_Beulah[] ACE_TIME_PR }; -static const char kZoneNameAmerica_North_Dakota_Beulah[] ACE_TIME_PROGMEM = "America/North_Dakota/Beulah"; +static const char kZoneNameAmerica_North_Dakota_Beulah[] ACE_TIME_PROGMEM = "\x02" "North_Dakota/Beulah"; const extended::ZoneInfo kZoneAmerica_North_Dakota_Beulah ACE_TIME_PROGMEM = { kZoneNameAmerica_North_Dakota_Beulah /*name*/, @@ -5333,9 +5358,9 @@ const extended::ZoneInfo kZoneAmerica_North_Dakota_Beulah ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/North_Dakota/Center // Zone Eras: 1 -// Strings (bytes): 32 -// Memory (8-bit): 54 -// Memory (32-bit): 68 +// Strings (bytes): 25 (originally 32) +// Memory (8-bit): 47 +// Memory (32-bit): 61 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_North_Dakota_Center[] ACE_TIME_PROGMEM = { @@ -5354,7 +5379,7 @@ static const extended::ZoneEra kZoneEraAmerica_North_Dakota_Center[] ACE_TIME_PR }; -static const char kZoneNameAmerica_North_Dakota_Center[] ACE_TIME_PROGMEM = "America/North_Dakota/Center"; +static const char kZoneNameAmerica_North_Dakota_Center[] ACE_TIME_PROGMEM = "\x02" "North_Dakota/Center"; const extended::ZoneInfo kZoneAmerica_North_Dakota_Center ACE_TIME_PROGMEM = { kZoneNameAmerica_North_Dakota_Center /*name*/, @@ -5367,9 +5392,9 @@ const extended::ZoneInfo kZoneAmerica_North_Dakota_Center ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/North_Dakota/New_Salem // Zone Eras: 2 -// Strings (bytes): 39 -// Memory (8-bit): 72 -// Memory (32-bit): 91 +// Strings (bytes): 32 (originally 39) +// Memory (8-bit): 65 +// Memory (32-bit): 84 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_North_Dakota_New_Salem[] ACE_TIME_PROGMEM = { @@ -5400,7 +5425,7 @@ static const extended::ZoneEra kZoneEraAmerica_North_Dakota_New_Salem[] ACE_TIME }; -static const char kZoneNameAmerica_North_Dakota_New_Salem[] ACE_TIME_PROGMEM = "America/North_Dakota/New_Salem"; +static const char kZoneNameAmerica_North_Dakota_New_Salem[] ACE_TIME_PROGMEM = "\x02" "North_Dakota/New_Salem"; const extended::ZoneInfo kZoneAmerica_North_Dakota_New_Salem ACE_TIME_PROGMEM = { kZoneNameAmerica_North_Dakota_New_Salem /*name*/, @@ -5413,9 +5438,9 @@ const extended::ZoneInfo kZoneAmerica_North_Dakota_New_Salem ACE_TIME_PROGMEM = //--------------------------------------------------------------------------- // Zone name: America/Nuuk // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Nuuk[] ACE_TIME_PROGMEM = { @@ -5434,7 +5459,7 @@ static const extended::ZoneEra kZoneEraAmerica_Nuuk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Nuuk[] ACE_TIME_PROGMEM = "America/Nuuk"; +static const char kZoneNameAmerica_Nuuk[] ACE_TIME_PROGMEM = "\x02" "Nuuk"; const extended::ZoneInfo kZoneAmerica_Nuuk ACE_TIME_PROGMEM = { kZoneNameAmerica_Nuuk /*name*/, @@ -5447,9 +5472,9 @@ const extended::ZoneInfo kZoneAmerica_Nuuk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Ojinaga // Zone Eras: 2 -// Strings (bytes): 24 -// Memory (8-bit): 57 -// Memory (32-bit): 76 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 50 +// Memory (32-bit): 69 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Ojinaga[] ACE_TIME_PROGMEM = { @@ -5480,7 +5505,7 @@ static const extended::ZoneEra kZoneEraAmerica_Ojinaga[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Ojinaga[] ACE_TIME_PROGMEM = "America/Ojinaga"; +static const char kZoneNameAmerica_Ojinaga[] ACE_TIME_PROGMEM = "\x02" "Ojinaga"; const extended::ZoneInfo kZoneAmerica_Ojinaga ACE_TIME_PROGMEM = { kZoneNameAmerica_Ojinaga /*name*/, @@ -5493,9 +5518,9 @@ const extended::ZoneInfo kZoneAmerica_Ojinaga ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Panama // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Panama[] ACE_TIME_PROGMEM = { @@ -5514,7 +5539,7 @@ static const extended::ZoneEra kZoneEraAmerica_Panama[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Panama[] ACE_TIME_PROGMEM = "America/Panama"; +static const char kZoneNameAmerica_Panama[] ACE_TIME_PROGMEM = "\x02" "Panama"; const extended::ZoneInfo kZoneAmerica_Panama ACE_TIME_PROGMEM = { kZoneNameAmerica_Panama /*name*/, @@ -5527,9 +5552,9 @@ const extended::ZoneInfo kZoneAmerica_Panama ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Pangnirtung // Zone Eras: 3 -// Strings (bytes): 32 -// Memory (8-bit): 76 -// Memory (32-bit): 100 +// Strings (bytes): 25 (originally 32) +// Memory (8-bit): 69 +// Memory (32-bit): 93 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Pangnirtung[] ACE_TIME_PROGMEM = { @@ -5572,7 +5597,7 @@ static const extended::ZoneEra kZoneEraAmerica_Pangnirtung[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Pangnirtung[] ACE_TIME_PROGMEM = "America/Pangnirtung"; +static const char kZoneNameAmerica_Pangnirtung[] ACE_TIME_PROGMEM = "\x02" "Pangnirtung"; const extended::ZoneInfo kZoneAmerica_Pangnirtung ACE_TIME_PROGMEM = { kZoneNameAmerica_Pangnirtung /*name*/, @@ -5585,9 +5610,9 @@ const extended::ZoneInfo kZoneAmerica_Pangnirtung ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Paramaribo // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Paramaribo[] ACE_TIME_PROGMEM = { @@ -5606,7 +5631,7 @@ static const extended::ZoneEra kZoneEraAmerica_Paramaribo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Paramaribo[] ACE_TIME_PROGMEM = "America/Paramaribo"; +static const char kZoneNameAmerica_Paramaribo[] ACE_TIME_PROGMEM = "\x02" "Paramaribo"; const extended::ZoneInfo kZoneAmerica_Paramaribo ACE_TIME_PROGMEM = { kZoneNameAmerica_Paramaribo /*name*/, @@ -5619,9 +5644,9 @@ const extended::ZoneInfo kZoneAmerica_Paramaribo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Phoenix // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Phoenix[] ACE_TIME_PROGMEM = { @@ -5640,7 +5665,7 @@ static const extended::ZoneEra kZoneEraAmerica_Phoenix[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Phoenix[] ACE_TIME_PROGMEM = "America/Phoenix"; +static const char kZoneNameAmerica_Phoenix[] ACE_TIME_PROGMEM = "\x02" "Phoenix"; const extended::ZoneInfo kZoneAmerica_Phoenix ACE_TIME_PROGMEM = { kZoneNameAmerica_Phoenix /*name*/, @@ -5653,9 +5678,9 @@ const extended::ZoneInfo kZoneAmerica_Phoenix ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Port-au-Prince // Zone Eras: 1 -// Strings (bytes): 27 -// Memory (8-bit): 49 -// Memory (32-bit): 63 +// Strings (bytes): 20 (originally 27) +// Memory (8-bit): 42 +// Memory (32-bit): 56 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Port_au_Prince[] ACE_TIME_PROGMEM = { @@ -5674,7 +5699,7 @@ static const extended::ZoneEra kZoneEraAmerica_Port_au_Prince[] ACE_TIME_PROGMEM }; -static const char kZoneNameAmerica_Port_au_Prince[] ACE_TIME_PROGMEM = "America/Port-au-Prince"; +static const char kZoneNameAmerica_Port_au_Prince[] ACE_TIME_PROGMEM = "\x02" "Port-au-Prince"; const extended::ZoneInfo kZoneAmerica_Port_au_Prince ACE_TIME_PROGMEM = { kZoneNameAmerica_Port_au_Prince /*name*/, @@ -5687,9 +5712,9 @@ const extended::ZoneInfo kZoneAmerica_Port_au_Prince ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Port_of_Spain // Zone Eras: 1 -// Strings (bytes): 26 -// Memory (8-bit): 48 -// Memory (32-bit): 62 +// Strings (bytes): 19 (originally 26) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Port_of_Spain[] ACE_TIME_PROGMEM = { @@ -5708,7 +5733,7 @@ static const extended::ZoneEra kZoneEraAmerica_Port_of_Spain[] ACE_TIME_PROGMEM }; -static const char kZoneNameAmerica_Port_of_Spain[] ACE_TIME_PROGMEM = "America/Port_of_Spain"; +static const char kZoneNameAmerica_Port_of_Spain[] ACE_TIME_PROGMEM = "\x02" "Port_of_Spain"; const extended::ZoneInfo kZoneAmerica_Port_of_Spain ACE_TIME_PROGMEM = { kZoneNameAmerica_Port_of_Spain /*name*/, @@ -5721,9 +5746,9 @@ const extended::ZoneInfo kZoneAmerica_Port_of_Spain ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Porto_Velho // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Porto_Velho[] ACE_TIME_PROGMEM = { @@ -5742,7 +5767,7 @@ static const extended::ZoneEra kZoneEraAmerica_Porto_Velho[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Porto_Velho[] ACE_TIME_PROGMEM = "America/Porto_Velho"; +static const char kZoneNameAmerica_Porto_Velho[] ACE_TIME_PROGMEM = "\x02" "Porto_Velho"; const extended::ZoneInfo kZoneAmerica_Porto_Velho ACE_TIME_PROGMEM = { kZoneNameAmerica_Porto_Velho /*name*/, @@ -5755,9 +5780,9 @@ const extended::ZoneInfo kZoneAmerica_Porto_Velho ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Puerto_Rico // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Puerto_Rico[] ACE_TIME_PROGMEM = { @@ -5776,7 +5801,7 @@ static const extended::ZoneEra kZoneEraAmerica_Puerto_Rico[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Puerto_Rico[] ACE_TIME_PROGMEM = "America/Puerto_Rico"; +static const char kZoneNameAmerica_Puerto_Rico[] ACE_TIME_PROGMEM = "\x02" "Puerto_Rico"; const extended::ZoneInfo kZoneAmerica_Puerto_Rico ACE_TIME_PROGMEM = { kZoneNameAmerica_Puerto_Rico /*name*/, @@ -5789,9 +5814,9 @@ const extended::ZoneInfo kZoneAmerica_Puerto_Rico ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Punta_Arenas // Zone Eras: 2 -// Strings (bytes): 33 -// Memory (8-bit): 66 -// Memory (32-bit): 85 +// Strings (bytes): 26 (originally 33) +// Memory (8-bit): 59 +// Memory (32-bit): 78 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Punta_Arenas[] ACE_TIME_PROGMEM = { @@ -5822,7 +5847,7 @@ static const extended::ZoneEra kZoneEraAmerica_Punta_Arenas[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Punta_Arenas[] ACE_TIME_PROGMEM = "America/Punta_Arenas"; +static const char kZoneNameAmerica_Punta_Arenas[] ACE_TIME_PROGMEM = "\x02" "Punta_Arenas"; const extended::ZoneInfo kZoneAmerica_Punta_Arenas ACE_TIME_PROGMEM = { kZoneNameAmerica_Punta_Arenas /*name*/, @@ -5835,9 +5860,9 @@ const extended::ZoneInfo kZoneAmerica_Punta_Arenas ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Rainy_River // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Rainy_River[] ACE_TIME_PROGMEM = { @@ -5856,7 +5881,7 @@ static const extended::ZoneEra kZoneEraAmerica_Rainy_River[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Rainy_River[] ACE_TIME_PROGMEM = "America/Rainy_River"; +static const char kZoneNameAmerica_Rainy_River[] ACE_TIME_PROGMEM = "\x02" "Rainy_River"; const extended::ZoneInfo kZoneAmerica_Rainy_River ACE_TIME_PROGMEM = { kZoneNameAmerica_Rainy_River /*name*/, @@ -5869,9 +5894,9 @@ const extended::ZoneInfo kZoneAmerica_Rainy_River ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Rankin_Inlet // Zone Eras: 3 -// Strings (bytes): 33 -// Memory (8-bit): 77 -// Memory (32-bit): 101 +// Strings (bytes): 26 (originally 33) +// Memory (8-bit): 70 +// Memory (32-bit): 94 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Rankin_Inlet[] ACE_TIME_PROGMEM = { @@ -5914,7 +5939,7 @@ static const extended::ZoneEra kZoneEraAmerica_Rankin_Inlet[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Rankin_Inlet[] ACE_TIME_PROGMEM = "America/Rankin_Inlet"; +static const char kZoneNameAmerica_Rankin_Inlet[] ACE_TIME_PROGMEM = "\x02" "Rankin_Inlet"; const extended::ZoneInfo kZoneAmerica_Rankin_Inlet ACE_TIME_PROGMEM = { kZoneNameAmerica_Rankin_Inlet /*name*/, @@ -5927,9 +5952,9 @@ const extended::ZoneInfo kZoneAmerica_Rankin_Inlet ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Recife // Zone Eras: 5 -// Strings (bytes): 43 -// Memory (8-bit): 109 -// Memory (32-bit): 143 +// Strings (bytes): 36 (originally 43) +// Memory (8-bit): 102 +// Memory (32-bit): 136 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Recife[] ACE_TIME_PROGMEM = { @@ -5996,7 +6021,7 @@ static const extended::ZoneEra kZoneEraAmerica_Recife[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Recife[] ACE_TIME_PROGMEM = "America/Recife"; +static const char kZoneNameAmerica_Recife[] ACE_TIME_PROGMEM = "\x02" "Recife"; const extended::ZoneInfo kZoneAmerica_Recife ACE_TIME_PROGMEM = { kZoneNameAmerica_Recife /*name*/, @@ -6009,9 +6034,9 @@ const extended::ZoneInfo kZoneAmerica_Recife ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Regina // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Regina[] ACE_TIME_PROGMEM = { @@ -6030,7 +6055,7 @@ static const extended::ZoneEra kZoneEraAmerica_Regina[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Regina[] ACE_TIME_PROGMEM = "America/Regina"; +static const char kZoneNameAmerica_Regina[] ACE_TIME_PROGMEM = "\x02" "Regina"; const extended::ZoneInfo kZoneAmerica_Regina ACE_TIME_PROGMEM = { kZoneNameAmerica_Regina /*name*/, @@ -6043,9 +6068,9 @@ const extended::ZoneInfo kZoneAmerica_Regina ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Resolute // Zone Eras: 5 -// Strings (bytes): 37 -// Memory (8-bit): 103 -// Memory (32-bit): 137 +// Strings (bytes): 30 (originally 37) +// Memory (8-bit): 96 +// Memory (32-bit): 130 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Resolute[] ACE_TIME_PROGMEM = { @@ -6112,7 +6137,7 @@ static const extended::ZoneEra kZoneEraAmerica_Resolute[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Resolute[] ACE_TIME_PROGMEM = "America/Resolute"; +static const char kZoneNameAmerica_Resolute[] ACE_TIME_PROGMEM = "\x02" "Resolute"; const extended::ZoneInfo kZoneAmerica_Resolute ACE_TIME_PROGMEM = { kZoneNameAmerica_Resolute /*name*/, @@ -6125,9 +6150,9 @@ const extended::ZoneInfo kZoneAmerica_Resolute ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Rio_Branco // Zone Eras: 3 -// Strings (bytes): 31 -// Memory (8-bit): 75 -// Memory (32-bit): 99 +// Strings (bytes): 24 (originally 31) +// Memory (8-bit): 68 +// Memory (32-bit): 92 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Rio_Branco[] ACE_TIME_PROGMEM = { @@ -6170,7 +6195,7 @@ static const extended::ZoneEra kZoneEraAmerica_Rio_Branco[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Rio_Branco[] ACE_TIME_PROGMEM = "America/Rio_Branco"; +static const char kZoneNameAmerica_Rio_Branco[] ACE_TIME_PROGMEM = "\x02" "Rio_Branco"; const extended::ZoneInfo kZoneAmerica_Rio_Branco ACE_TIME_PROGMEM = { kZoneNameAmerica_Rio_Branco /*name*/, @@ -6183,9 +6208,9 @@ const extended::ZoneInfo kZoneAmerica_Rio_Branco ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Santarem // Zone Eras: 2 -// Strings (bytes): 25 -// Memory (8-bit): 58 -// Memory (32-bit): 77 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 51 +// Memory (32-bit): 70 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Santarem[] ACE_TIME_PROGMEM = { @@ -6216,7 +6241,7 @@ static const extended::ZoneEra kZoneEraAmerica_Santarem[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Santarem[] ACE_TIME_PROGMEM = "America/Santarem"; +static const char kZoneNameAmerica_Santarem[] ACE_TIME_PROGMEM = "\x02" "Santarem"; const extended::ZoneInfo kZoneAmerica_Santarem ACE_TIME_PROGMEM = { kZoneNameAmerica_Santarem /*name*/, @@ -6229,9 +6254,9 @@ const extended::ZoneInfo kZoneAmerica_Santarem ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Santiago // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Santiago[] ACE_TIME_PROGMEM = { @@ -6250,7 +6275,7 @@ static const extended::ZoneEra kZoneEraAmerica_Santiago[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Santiago[] ACE_TIME_PROGMEM = "America/Santiago"; +static const char kZoneNameAmerica_Santiago[] ACE_TIME_PROGMEM = "\x02" "Santiago"; const extended::ZoneInfo kZoneAmerica_Santiago ACE_TIME_PROGMEM = { kZoneNameAmerica_Santiago /*name*/, @@ -6263,9 +6288,9 @@ const extended::ZoneInfo kZoneAmerica_Santiago ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Santo_Domingo // Zone Eras: 3 -// Strings (bytes): 34 -// Memory (8-bit): 78 -// Memory (32-bit): 102 +// Strings (bytes): 27 (originally 34) +// Memory (8-bit): 71 +// Memory (32-bit): 95 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Santo_Domingo[] ACE_TIME_PROGMEM = { @@ -6308,7 +6333,7 @@ static const extended::ZoneEra kZoneEraAmerica_Santo_Domingo[] ACE_TIME_PROGMEM }; -static const char kZoneNameAmerica_Santo_Domingo[] ACE_TIME_PROGMEM = "America/Santo_Domingo"; +static const char kZoneNameAmerica_Santo_Domingo[] ACE_TIME_PROGMEM = "\x02" "Santo_Domingo"; const extended::ZoneInfo kZoneAmerica_Santo_Domingo ACE_TIME_PROGMEM = { kZoneNameAmerica_Santo_Domingo /*name*/, @@ -6321,9 +6346,9 @@ const extended::ZoneInfo kZoneAmerica_Santo_Domingo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Sao_Paulo // Zone Eras: 1 -// Strings (bytes): 26 -// Memory (8-bit): 48 -// Memory (32-bit): 62 +// Strings (bytes): 19 (originally 26) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Sao_Paulo[] ACE_TIME_PROGMEM = { @@ -6342,7 +6367,7 @@ static const extended::ZoneEra kZoneEraAmerica_Sao_Paulo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Sao_Paulo[] ACE_TIME_PROGMEM = "America/Sao_Paulo"; +static const char kZoneNameAmerica_Sao_Paulo[] ACE_TIME_PROGMEM = "\x02" "Sao_Paulo"; const extended::ZoneInfo kZoneAmerica_Sao_Paulo ACE_TIME_PROGMEM = { kZoneNameAmerica_Sao_Paulo /*name*/, @@ -6355,9 +6380,9 @@ const extended::ZoneInfo kZoneAmerica_Sao_Paulo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Scoresbysund // Zone Eras: 1 -// Strings (bytes): 29 -// Memory (8-bit): 51 -// Memory (32-bit): 65 +// Strings (bytes): 22 (originally 29) +// Memory (8-bit): 44 +// Memory (32-bit): 58 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Scoresbysund[] ACE_TIME_PROGMEM = { @@ -6376,7 +6401,7 @@ static const extended::ZoneEra kZoneEraAmerica_Scoresbysund[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Scoresbysund[] ACE_TIME_PROGMEM = "America/Scoresbysund"; +static const char kZoneNameAmerica_Scoresbysund[] ACE_TIME_PROGMEM = "\x02" "Scoresbysund"; const extended::ZoneInfo kZoneAmerica_Scoresbysund ACE_TIME_PROGMEM = { kZoneNameAmerica_Scoresbysund /*name*/, @@ -6389,9 +6414,9 @@ const extended::ZoneInfo kZoneAmerica_Scoresbysund ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Sitka // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Sitka[] ACE_TIME_PROGMEM = { @@ -6410,7 +6435,7 @@ static const extended::ZoneEra kZoneEraAmerica_Sitka[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Sitka[] ACE_TIME_PROGMEM = "America/Sitka"; +static const char kZoneNameAmerica_Sitka[] ACE_TIME_PROGMEM = "\x02" "Sitka"; const extended::ZoneInfo kZoneAmerica_Sitka ACE_TIME_PROGMEM = { kZoneNameAmerica_Sitka /*name*/, @@ -6423,9 +6448,9 @@ const extended::ZoneInfo kZoneAmerica_Sitka ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/St_Johns // Zone Eras: 2 -// Strings (bytes): 25 -// Memory (8-bit): 58 -// Memory (32-bit): 77 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 51 +// Memory (32-bit): 70 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_St_Johns[] ACE_TIME_PROGMEM = { @@ -6456,7 +6481,7 @@ static const extended::ZoneEra kZoneEraAmerica_St_Johns[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_St_Johns[] ACE_TIME_PROGMEM = "America/St_Johns"; +static const char kZoneNameAmerica_St_Johns[] ACE_TIME_PROGMEM = "\x02" "St_Johns"; const extended::ZoneInfo kZoneAmerica_St_Johns ACE_TIME_PROGMEM = { kZoneNameAmerica_St_Johns /*name*/, @@ -6469,9 +6494,9 @@ const extended::ZoneInfo kZoneAmerica_St_Johns ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Swift_Current // Zone Eras: 1 -// Strings (bytes): 26 -// Memory (8-bit): 48 -// Memory (32-bit): 62 +// Strings (bytes): 19 (originally 26) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Swift_Current[] ACE_TIME_PROGMEM = { @@ -6490,7 +6515,7 @@ static const extended::ZoneEra kZoneEraAmerica_Swift_Current[] ACE_TIME_PROGMEM }; -static const char kZoneNameAmerica_Swift_Current[] ACE_TIME_PROGMEM = "America/Swift_Current"; +static const char kZoneNameAmerica_Swift_Current[] ACE_TIME_PROGMEM = "\x02" "Swift_Current"; const extended::ZoneInfo kZoneAmerica_Swift_Current ACE_TIME_PROGMEM = { kZoneNameAmerica_Swift_Current /*name*/, @@ -6503,9 +6528,9 @@ const extended::ZoneInfo kZoneAmerica_Swift_Current ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Tegucigalpa // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Tegucigalpa[] ACE_TIME_PROGMEM = { @@ -6524,7 +6549,7 @@ static const extended::ZoneEra kZoneEraAmerica_Tegucigalpa[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Tegucigalpa[] ACE_TIME_PROGMEM = "America/Tegucigalpa"; +static const char kZoneNameAmerica_Tegucigalpa[] ACE_TIME_PROGMEM = "\x02" "Tegucigalpa"; const extended::ZoneInfo kZoneAmerica_Tegucigalpa ACE_TIME_PROGMEM = { kZoneNameAmerica_Tegucigalpa /*name*/, @@ -6537,9 +6562,9 @@ const extended::ZoneInfo kZoneAmerica_Tegucigalpa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Thule // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Thule[] ACE_TIME_PROGMEM = { @@ -6558,7 +6583,7 @@ static const extended::ZoneEra kZoneEraAmerica_Thule[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Thule[] ACE_TIME_PROGMEM = "America/Thule"; +static const char kZoneNameAmerica_Thule[] ACE_TIME_PROGMEM = "\x02" "Thule"; const extended::ZoneInfo kZoneAmerica_Thule ACE_TIME_PROGMEM = { kZoneNameAmerica_Thule /*name*/, @@ -6571,9 +6596,9 @@ const extended::ZoneInfo kZoneAmerica_Thule ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Thunder_Bay // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Thunder_Bay[] ACE_TIME_PROGMEM = { @@ -6592,7 +6617,7 @@ static const extended::ZoneEra kZoneEraAmerica_Thunder_Bay[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Thunder_Bay[] ACE_TIME_PROGMEM = "America/Thunder_Bay"; +static const char kZoneNameAmerica_Thunder_Bay[] ACE_TIME_PROGMEM = "\x02" "Thunder_Bay"; const extended::ZoneInfo kZoneAmerica_Thunder_Bay ACE_TIME_PROGMEM = { kZoneNameAmerica_Thunder_Bay /*name*/, @@ -6605,9 +6630,9 @@ const extended::ZoneInfo kZoneAmerica_Thunder_Bay ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Tijuana // Zone Eras: 4 -// Strings (bytes): 32 -// Memory (8-bit): 87 -// Memory (32-bit): 116 +// Strings (bytes): 25 (originally 32) +// Memory (8-bit): 80 +// Memory (32-bit): 109 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Tijuana[] ACE_TIME_PROGMEM = { @@ -6662,7 +6687,7 @@ static const extended::ZoneEra kZoneEraAmerica_Tijuana[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Tijuana[] ACE_TIME_PROGMEM = "America/Tijuana"; +static const char kZoneNameAmerica_Tijuana[] ACE_TIME_PROGMEM = "\x02" "Tijuana"; const extended::ZoneInfo kZoneAmerica_Tijuana ACE_TIME_PROGMEM = { kZoneNameAmerica_Tijuana /*name*/, @@ -6675,9 +6700,9 @@ const extended::ZoneInfo kZoneAmerica_Tijuana ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Toronto // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Toronto[] ACE_TIME_PROGMEM = { @@ -6696,7 +6721,7 @@ static const extended::ZoneEra kZoneEraAmerica_Toronto[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Toronto[] ACE_TIME_PROGMEM = "America/Toronto"; +static const char kZoneNameAmerica_Toronto[] ACE_TIME_PROGMEM = "\x02" "Toronto"; const extended::ZoneInfo kZoneAmerica_Toronto ACE_TIME_PROGMEM = { kZoneNameAmerica_Toronto /*name*/, @@ -6709,9 +6734,9 @@ const extended::ZoneInfo kZoneAmerica_Toronto ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Vancouver // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Vancouver[] ACE_TIME_PROGMEM = { @@ -6730,7 +6755,7 @@ static const extended::ZoneEra kZoneEraAmerica_Vancouver[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Vancouver[] ACE_TIME_PROGMEM = "America/Vancouver"; +static const char kZoneNameAmerica_Vancouver[] ACE_TIME_PROGMEM = "\x02" "Vancouver"; const extended::ZoneInfo kZoneAmerica_Vancouver ACE_TIME_PROGMEM = { kZoneNameAmerica_Vancouver /*name*/, @@ -6743,9 +6768,9 @@ const extended::ZoneInfo kZoneAmerica_Vancouver ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Whitehorse // Zone Eras: 2 -// Strings (bytes): 27 -// Memory (8-bit): 60 -// Memory (32-bit): 79 +// Strings (bytes): 20 (originally 27) +// Memory (8-bit): 53 +// Memory (32-bit): 72 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Whitehorse[] ACE_TIME_PROGMEM = { @@ -6776,7 +6801,7 @@ static const extended::ZoneEra kZoneEraAmerica_Whitehorse[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Whitehorse[] ACE_TIME_PROGMEM = "America/Whitehorse"; +static const char kZoneNameAmerica_Whitehorse[] ACE_TIME_PROGMEM = "\x02" "Whitehorse"; const extended::ZoneInfo kZoneAmerica_Whitehorse ACE_TIME_PROGMEM = { kZoneNameAmerica_Whitehorse /*name*/, @@ -6789,9 +6814,9 @@ const extended::ZoneInfo kZoneAmerica_Whitehorse ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Winnipeg // Zone Eras: 2 -// Strings (bytes): 25 -// Memory (8-bit): 58 -// Memory (32-bit): 77 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 51 +// Memory (32-bit): 70 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Winnipeg[] ACE_TIME_PROGMEM = { @@ -6822,7 +6847,7 @@ static const extended::ZoneEra kZoneEraAmerica_Winnipeg[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Winnipeg[] ACE_TIME_PROGMEM = "America/Winnipeg"; +static const char kZoneNameAmerica_Winnipeg[] ACE_TIME_PROGMEM = "\x02" "Winnipeg"; const extended::ZoneInfo kZoneAmerica_Winnipeg ACE_TIME_PROGMEM = { kZoneNameAmerica_Winnipeg /*name*/, @@ -6835,9 +6860,9 @@ const extended::ZoneInfo kZoneAmerica_Winnipeg ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Yakutat // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Yakutat[] ACE_TIME_PROGMEM = { @@ -6856,7 +6881,7 @@ static const extended::ZoneEra kZoneEraAmerica_Yakutat[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAmerica_Yakutat[] ACE_TIME_PROGMEM = "America/Yakutat"; +static const char kZoneNameAmerica_Yakutat[] ACE_TIME_PROGMEM = "\x02" "Yakutat"; const extended::ZoneInfo kZoneAmerica_Yakutat ACE_TIME_PROGMEM = { kZoneNameAmerica_Yakutat /*name*/, @@ -6869,9 +6894,9 @@ const extended::ZoneInfo kZoneAmerica_Yakutat ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Yellowknife // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Yellowknife[] ACE_TIME_PROGMEM = { @@ -6890,7 +6915,7 @@ static const extended::ZoneEra kZoneEraAmerica_Yellowknife[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAmerica_Yellowknife[] ACE_TIME_PROGMEM = "America/Yellowknife"; +static const char kZoneNameAmerica_Yellowknife[] ACE_TIME_PROGMEM = "\x02" "Yellowknife"; const extended::ZoneInfo kZoneAmerica_Yellowknife ACE_TIME_PROGMEM = { kZoneNameAmerica_Yellowknife /*name*/, @@ -6903,9 +6928,9 @@ const extended::ZoneInfo kZoneAmerica_Yellowknife ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/Casey // Zone Eras: 12 -// Strings (bytes): 65 -// Memory (8-bit): 208 -// Memory (32-bit): 277 +// Strings (bytes): 55 (originally 65) +// Memory (8-bit): 198 +// Memory (32-bit): 267 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { @@ -7056,7 +7081,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAntarctica_Casey[] ACE_TIME_PROGMEM = "Antarctica/Casey"; +static const char kZoneNameAntarctica_Casey[] ACE_TIME_PROGMEM = "\x03" "Casey"; const extended::ZoneInfo kZoneAntarctica_Casey ACE_TIME_PROGMEM = { kZoneNameAntarctica_Casey /*name*/, @@ -7069,9 +7094,9 @@ const extended::ZoneInfo kZoneAntarctica_Casey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/Davis // Zone Eras: 5 -// Strings (bytes): 37 -// Memory (8-bit): 103 -// Memory (32-bit): 137 +// Strings (bytes): 27 (originally 37) +// Memory (8-bit): 93 +// Memory (32-bit): 127 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAntarctica_Davis[] ACE_TIME_PROGMEM = { @@ -7138,7 +7163,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Davis[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAntarctica_Davis[] ACE_TIME_PROGMEM = "Antarctica/Davis"; +static const char kZoneNameAntarctica_Davis[] ACE_TIME_PROGMEM = "\x03" "Davis"; const extended::ZoneInfo kZoneAntarctica_Davis ACE_TIME_PROGMEM = { kZoneNameAntarctica_Davis /*name*/, @@ -7151,9 +7176,9 @@ const extended::ZoneInfo kZoneAntarctica_Davis ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/DumontDUrville // Zone Eras: 1 -// Strings (bytes): 30 -// Memory (8-bit): 52 -// Memory (32-bit): 66 +// Strings (bytes): 20 (originally 30) +// Memory (8-bit): 42 +// Memory (32-bit): 56 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAntarctica_DumontDUrville[] ACE_TIME_PROGMEM = { @@ -7172,7 +7197,7 @@ static const extended::ZoneEra kZoneEraAntarctica_DumontDUrville[] ACE_TIME_PROG }; -static const char kZoneNameAntarctica_DumontDUrville[] ACE_TIME_PROGMEM = "Antarctica/DumontDUrville"; +static const char kZoneNameAntarctica_DumontDUrville[] ACE_TIME_PROGMEM = "\x03" "DumontDUrville"; const extended::ZoneInfo kZoneAntarctica_DumontDUrville ACE_TIME_PROGMEM = { kZoneNameAntarctica_DumontDUrville /*name*/, @@ -7185,9 +7210,9 @@ const extended::ZoneInfo kZoneAntarctica_DumontDUrville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/Macquarie // Zone Eras: 3 -// Strings (bytes): 36 -// Memory (8-bit): 80 -// Memory (32-bit): 104 +// Strings (bytes): 26 (originally 36) +// Memory (8-bit): 70 +// Memory (32-bit): 94 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAntarctica_Macquarie[] ACE_TIME_PROGMEM = { @@ -7230,7 +7255,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Macquarie[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAntarctica_Macquarie[] ACE_TIME_PROGMEM = "Antarctica/Macquarie"; +static const char kZoneNameAntarctica_Macquarie[] ACE_TIME_PROGMEM = "\x03" "Macquarie"; const extended::ZoneInfo kZoneAntarctica_Macquarie ACE_TIME_PROGMEM = { kZoneNameAntarctica_Macquarie /*name*/, @@ -7243,9 +7268,9 @@ const extended::ZoneInfo kZoneAntarctica_Macquarie ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/Mawson // Zone Eras: 2 -// Strings (bytes): 26 -// Memory (8-bit): 59 -// Memory (32-bit): 78 +// Strings (bytes): 16 (originally 26) +// Memory (8-bit): 49 +// Memory (32-bit): 68 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAntarctica_Mawson[] ACE_TIME_PROGMEM = { @@ -7276,7 +7301,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Mawson[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAntarctica_Mawson[] ACE_TIME_PROGMEM = "Antarctica/Mawson"; +static const char kZoneNameAntarctica_Mawson[] ACE_TIME_PROGMEM = "\x03" "Mawson"; const extended::ZoneInfo kZoneAntarctica_Mawson ACE_TIME_PROGMEM = { kZoneNameAntarctica_Mawson /*name*/, @@ -7289,9 +7314,9 @@ const extended::ZoneInfo kZoneAntarctica_Mawson ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/Palmer // Zone Eras: 2 -// Strings (bytes): 30 -// Memory (8-bit): 63 -// Memory (32-bit): 82 +// Strings (bytes): 20 (originally 30) +// Memory (8-bit): 53 +// Memory (32-bit): 72 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAntarctica_Palmer[] ACE_TIME_PROGMEM = { @@ -7322,7 +7347,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Palmer[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAntarctica_Palmer[] ACE_TIME_PROGMEM = "Antarctica/Palmer"; +static const char kZoneNameAntarctica_Palmer[] ACE_TIME_PROGMEM = "\x03" "Palmer"; const extended::ZoneInfo kZoneAntarctica_Palmer ACE_TIME_PROGMEM = { kZoneNameAntarctica_Palmer /*name*/, @@ -7335,9 +7360,9 @@ const extended::ZoneInfo kZoneAntarctica_Palmer ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/Rothera // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 13 (originally 23) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAntarctica_Rothera[] ACE_TIME_PROGMEM = { @@ -7356,7 +7381,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Rothera[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAntarctica_Rothera[] ACE_TIME_PROGMEM = "Antarctica/Rothera"; +static const char kZoneNameAntarctica_Rothera[] ACE_TIME_PROGMEM = "\x03" "Rothera"; const extended::ZoneInfo kZoneAntarctica_Rothera ACE_TIME_PROGMEM = { kZoneNameAntarctica_Rothera /*name*/, @@ -7369,9 +7394,9 @@ const extended::ZoneInfo kZoneAntarctica_Rothera ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/Syowa // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 11 (originally 21) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAntarctica_Syowa[] ACE_TIME_PROGMEM = { @@ -7390,7 +7415,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Syowa[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAntarctica_Syowa[] ACE_TIME_PROGMEM = "Antarctica/Syowa"; +static const char kZoneNameAntarctica_Syowa[] ACE_TIME_PROGMEM = "\x03" "Syowa"; const extended::ZoneInfo kZoneAntarctica_Syowa ACE_TIME_PROGMEM = { kZoneNameAntarctica_Syowa /*name*/, @@ -7403,9 +7428,9 @@ const extended::ZoneInfo kZoneAntarctica_Syowa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/Troll // Zone Eras: 2 -// Strings (bytes): 23 -// Memory (8-bit): 56 -// Memory (32-bit): 75 +// Strings (bytes): 13 (originally 23) +// Memory (8-bit): 46 +// Memory (32-bit): 65 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAntarctica_Troll[] ACE_TIME_PROGMEM = { @@ -7436,7 +7461,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Troll[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAntarctica_Troll[] ACE_TIME_PROGMEM = "Antarctica/Troll"; +static const char kZoneNameAntarctica_Troll[] ACE_TIME_PROGMEM = "\x03" "Troll"; const extended::ZoneInfo kZoneAntarctica_Troll ACE_TIME_PROGMEM = { kZoneNameAntarctica_Troll /*name*/, @@ -7449,9 +7474,9 @@ const extended::ZoneInfo kZoneAntarctica_Troll ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/Vostok // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 12 (originally 22) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAntarctica_Vostok[] ACE_TIME_PROGMEM = { @@ -7470,7 +7495,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Vostok[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAntarctica_Vostok[] ACE_TIME_PROGMEM = "Antarctica/Vostok"; +static const char kZoneNameAntarctica_Vostok[] ACE_TIME_PROGMEM = "\x03" "Vostok"; const extended::ZoneInfo kZoneAntarctica_Vostok ACE_TIME_PROGMEM = { kZoneNameAntarctica_Vostok /*name*/, @@ -7483,9 +7508,9 @@ const extended::ZoneInfo kZoneAntarctica_Vostok ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Almaty // Zone Eras: 2 -// Strings (bytes): 24 -// Memory (8-bit): 57 -// Memory (32-bit): 76 +// Strings (bytes): 20 (originally 24) +// Memory (8-bit): 53 +// Memory (32-bit): 72 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Almaty[] ACE_TIME_PROGMEM = { @@ -7516,7 +7541,7 @@ static const extended::ZoneEra kZoneEraAsia_Almaty[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Almaty[] ACE_TIME_PROGMEM = "Asia/Almaty"; +static const char kZoneNameAsia_Almaty[] ACE_TIME_PROGMEM = "\x05" "Almaty"; const extended::ZoneInfo kZoneAsia_Almaty ACE_TIME_PROGMEM = { kZoneNameAsia_Almaty /*name*/, @@ -7529,9 +7554,9 @@ const extended::ZoneInfo kZoneAsia_Almaty ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Amman // Zone Eras: 1 -// Strings (bytes): 16 -// Memory (8-bit): 38 -// Memory (32-bit): 52 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Amman[] ACE_TIME_PROGMEM = { @@ -7550,7 +7575,7 @@ static const extended::ZoneEra kZoneEraAsia_Amman[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Amman[] ACE_TIME_PROGMEM = "Asia/Amman"; +static const char kZoneNameAsia_Amman[] ACE_TIME_PROGMEM = "\x05" "Amman"; const extended::ZoneInfo kZoneAsia_Amman ACE_TIME_PROGMEM = { kZoneNameAsia_Amman /*name*/, @@ -7563,9 +7588,9 @@ const extended::ZoneInfo kZoneAsia_Amman ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Anadyr // Zone Eras: 3 -// Strings (bytes): 32 -// Memory (8-bit): 76 -// Memory (32-bit): 100 +// Strings (bytes): 28 (originally 32) +// Memory (8-bit): 72 +// Memory (32-bit): 96 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Anadyr[] ACE_TIME_PROGMEM = { @@ -7608,7 +7633,7 @@ static const extended::ZoneEra kZoneEraAsia_Anadyr[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Anadyr[] ACE_TIME_PROGMEM = "Asia/Anadyr"; +static const char kZoneNameAsia_Anadyr[] ACE_TIME_PROGMEM = "\x05" "Anadyr"; const extended::ZoneInfo kZoneAsia_Anadyr ACE_TIME_PROGMEM = { kZoneNameAsia_Anadyr /*name*/, @@ -7621,9 +7646,9 @@ const extended::ZoneInfo kZoneAsia_Anadyr ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Aqtau // Zone Eras: 2 -// Strings (bytes): 23 -// Memory (8-bit): 56 -// Memory (32-bit): 75 +// Strings (bytes): 19 (originally 23) +// Memory (8-bit): 52 +// Memory (32-bit): 71 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Aqtau[] ACE_TIME_PROGMEM = { @@ -7654,7 +7679,7 @@ static const extended::ZoneEra kZoneEraAsia_Aqtau[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Aqtau[] ACE_TIME_PROGMEM = "Asia/Aqtau"; +static const char kZoneNameAsia_Aqtau[] ACE_TIME_PROGMEM = "\x05" "Aqtau"; const extended::ZoneInfo kZoneAsia_Aqtau ACE_TIME_PROGMEM = { kZoneNameAsia_Aqtau /*name*/, @@ -7667,9 +7692,9 @@ const extended::ZoneInfo kZoneAsia_Aqtau ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Aqtobe // Zone Eras: 2 -// Strings (bytes): 24 -// Memory (8-bit): 57 -// Memory (32-bit): 76 +// Strings (bytes): 20 (originally 24) +// Memory (8-bit): 53 +// Memory (32-bit): 72 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Aqtobe[] ACE_TIME_PROGMEM = { @@ -7700,7 +7725,7 @@ static const extended::ZoneEra kZoneEraAsia_Aqtobe[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Aqtobe[] ACE_TIME_PROGMEM = "Asia/Aqtobe"; +static const char kZoneNameAsia_Aqtobe[] ACE_TIME_PROGMEM = "\x05" "Aqtobe"; const extended::ZoneInfo kZoneAsia_Aqtobe ACE_TIME_PROGMEM = { kZoneNameAsia_Aqtobe /*name*/, @@ -7713,9 +7738,9 @@ const extended::ZoneInfo kZoneAsia_Aqtobe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Ashgabat // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Ashgabat[] ACE_TIME_PROGMEM = { @@ -7734,7 +7759,7 @@ static const extended::ZoneEra kZoneEraAsia_Ashgabat[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Ashgabat[] ACE_TIME_PROGMEM = "Asia/Ashgabat"; +static const char kZoneNameAsia_Ashgabat[] ACE_TIME_PROGMEM = "\x05" "Ashgabat"; const extended::ZoneInfo kZoneAsia_Ashgabat ACE_TIME_PROGMEM = { kZoneNameAsia_Ashgabat /*name*/, @@ -7747,9 +7772,9 @@ const extended::ZoneInfo kZoneAsia_Ashgabat ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Atyrau // Zone Eras: 3 -// Strings (bytes): 32 -// Memory (8-bit): 76 -// Memory (32-bit): 100 +// Strings (bytes): 28 (originally 32) +// Memory (8-bit): 72 +// Memory (32-bit): 96 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Atyrau[] ACE_TIME_PROGMEM = { @@ -7792,7 +7817,7 @@ static const extended::ZoneEra kZoneEraAsia_Atyrau[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Atyrau[] ACE_TIME_PROGMEM = "Asia/Atyrau"; +static const char kZoneNameAsia_Atyrau[] ACE_TIME_PROGMEM = "\x05" "Atyrau"; const extended::ZoneInfo kZoneAsia_Atyrau ACE_TIME_PROGMEM = { kZoneNameAsia_Atyrau /*name*/, @@ -7805,9 +7830,9 @@ const extended::ZoneInfo kZoneAsia_Atyrau ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Baghdad // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 17 (originally 21) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Baghdad[] ACE_TIME_PROGMEM = { @@ -7826,7 +7851,7 @@ static const extended::ZoneEra kZoneEraAsia_Baghdad[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Baghdad[] ACE_TIME_PROGMEM = "Asia/Baghdad"; +static const char kZoneNameAsia_Baghdad[] ACE_TIME_PROGMEM = "\x05" "Baghdad"; const extended::ZoneInfo kZoneAsia_Baghdad ACE_TIME_PROGMEM = { kZoneNameAsia_Baghdad /*name*/, @@ -7839,9 +7864,9 @@ const extended::ZoneInfo kZoneAsia_Baghdad ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Baku // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Baku[] ACE_TIME_PROGMEM = { @@ -7860,7 +7885,7 @@ static const extended::ZoneEra kZoneEraAsia_Baku[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Baku[] ACE_TIME_PROGMEM = "Asia/Baku"; +static const char kZoneNameAsia_Baku[] ACE_TIME_PROGMEM = "\x05" "Baku"; const extended::ZoneInfo kZoneAsia_Baku ACE_TIME_PROGMEM = { kZoneNameAsia_Baku /*name*/, @@ -7873,9 +7898,9 @@ const extended::ZoneInfo kZoneAsia_Baku ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Bangkok // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 13 (originally 17) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Bangkok[] ACE_TIME_PROGMEM = { @@ -7894,7 +7919,7 @@ static const extended::ZoneEra kZoneEraAsia_Bangkok[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Bangkok[] ACE_TIME_PROGMEM = "Asia/Bangkok"; +static const char kZoneNameAsia_Bangkok[] ACE_TIME_PROGMEM = "\x05" "Bangkok"; const extended::ZoneInfo kZoneAsia_Bangkok ACE_TIME_PROGMEM = { kZoneNameAsia_Bangkok /*name*/, @@ -7907,9 +7932,9 @@ const extended::ZoneInfo kZoneAsia_Bangkok ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Barnaul // Zone Eras: 4 -// Strings (bytes): 33 -// Memory (8-bit): 88 -// Memory (32-bit): 117 +// Strings (bytes): 29 (originally 33) +// Memory (8-bit): 84 +// Memory (32-bit): 113 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Barnaul[] ACE_TIME_PROGMEM = { @@ -7964,7 +7989,7 @@ static const extended::ZoneEra kZoneEraAsia_Barnaul[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Barnaul[] ACE_TIME_PROGMEM = "Asia/Barnaul"; +static const char kZoneNameAsia_Barnaul[] ACE_TIME_PROGMEM = "\x05" "Barnaul"; const extended::ZoneInfo kZoneAsia_Barnaul ACE_TIME_PROGMEM = { kZoneNameAsia_Barnaul /*name*/, @@ -7977,9 +8002,9 @@ const extended::ZoneInfo kZoneAsia_Barnaul ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Beirut // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 13 (originally 17) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Beirut[] ACE_TIME_PROGMEM = { @@ -7998,7 +8023,7 @@ static const extended::ZoneEra kZoneEraAsia_Beirut[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Beirut[] ACE_TIME_PROGMEM = "Asia/Beirut"; +static const char kZoneNameAsia_Beirut[] ACE_TIME_PROGMEM = "\x05" "Beirut"; const extended::ZoneInfo kZoneAsia_Beirut ACE_TIME_PROGMEM = { kZoneNameAsia_Beirut /*name*/, @@ -8011,9 +8036,9 @@ const extended::ZoneInfo kZoneAsia_Beirut ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Bishkek // Zone Eras: 2 -// Strings (bytes): 25 -// Memory (8-bit): 58 -// Memory (32-bit): 77 +// Strings (bytes): 21 (originally 25) +// Memory (8-bit): 54 +// Memory (32-bit): 73 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Bishkek[] ACE_TIME_PROGMEM = { @@ -8044,7 +8069,7 @@ static const extended::ZoneEra kZoneEraAsia_Bishkek[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Bishkek[] ACE_TIME_PROGMEM = "Asia/Bishkek"; +static const char kZoneNameAsia_Bishkek[] ACE_TIME_PROGMEM = "\x05" "Bishkek"; const extended::ZoneInfo kZoneAsia_Bishkek ACE_TIME_PROGMEM = { kZoneNameAsia_Bishkek /*name*/, @@ -8057,9 +8082,9 @@ const extended::ZoneInfo kZoneAsia_Bishkek ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Brunei // Zone Eras: 1 -// Strings (bytes): 16 -// Memory (8-bit): 38 -// Memory (32-bit): 52 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Brunei[] ACE_TIME_PROGMEM = { @@ -8078,7 +8103,7 @@ static const extended::ZoneEra kZoneEraAsia_Brunei[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Brunei[] ACE_TIME_PROGMEM = "Asia/Brunei"; +static const char kZoneNameAsia_Brunei[] ACE_TIME_PROGMEM = "\x05" "Brunei"; const extended::ZoneInfo kZoneAsia_Brunei ACE_TIME_PROGMEM = { kZoneNameAsia_Brunei /*name*/, @@ -8091,9 +8116,9 @@ const extended::ZoneInfo kZoneAsia_Brunei ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Chita // Zone Eras: 4 -// Strings (bytes): 31 -// Memory (8-bit): 86 -// Memory (32-bit): 115 +// Strings (bytes): 27 (originally 31) +// Memory (8-bit): 82 +// Memory (32-bit): 111 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Chita[] ACE_TIME_PROGMEM = { @@ -8148,7 +8173,7 @@ static const extended::ZoneEra kZoneEraAsia_Chita[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Chita[] ACE_TIME_PROGMEM = "Asia/Chita"; +static const char kZoneNameAsia_Chita[] ACE_TIME_PROGMEM = "\x05" "Chita"; const extended::ZoneInfo kZoneAsia_Chita ACE_TIME_PROGMEM = { kZoneNameAsia_Chita /*name*/, @@ -8161,9 +8186,9 @@ const extended::ZoneInfo kZoneAsia_Chita ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Choibalsan // Zone Eras: 2 -// Strings (bytes): 32 -// Memory (8-bit): 65 -// Memory (32-bit): 84 +// Strings (bytes): 28 (originally 32) +// Memory (8-bit): 61 +// Memory (32-bit): 80 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Choibalsan[] ACE_TIME_PROGMEM = { @@ -8194,7 +8219,7 @@ static const extended::ZoneEra kZoneEraAsia_Choibalsan[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Choibalsan[] ACE_TIME_PROGMEM = "Asia/Choibalsan"; +static const char kZoneNameAsia_Choibalsan[] ACE_TIME_PROGMEM = "\x05" "Choibalsan"; const extended::ZoneInfo kZoneAsia_Choibalsan ACE_TIME_PROGMEM = { kZoneNameAsia_Choibalsan /*name*/, @@ -8207,9 +8232,9 @@ const extended::ZoneInfo kZoneAsia_Choibalsan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Colombo // Zone Eras: 2 -// Strings (bytes): 23 -// Memory (8-bit): 56 -// Memory (32-bit): 75 +// Strings (bytes): 19 (originally 23) +// Memory (8-bit): 52 +// Memory (32-bit): 71 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Colombo[] ACE_TIME_PROGMEM = { @@ -8240,7 +8265,7 @@ static const extended::ZoneEra kZoneEraAsia_Colombo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Colombo[] ACE_TIME_PROGMEM = "Asia/Colombo"; +static const char kZoneNameAsia_Colombo[] ACE_TIME_PROGMEM = "\x05" "Colombo"; const extended::ZoneInfo kZoneAsia_Colombo ACE_TIME_PROGMEM = { kZoneNameAsia_Colombo /*name*/, @@ -8253,9 +8278,9 @@ const extended::ZoneInfo kZoneAsia_Colombo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Damascus // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 15 (originally 19) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Damascus[] ACE_TIME_PROGMEM = { @@ -8274,7 +8299,7 @@ static const extended::ZoneEra kZoneEraAsia_Damascus[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Damascus[] ACE_TIME_PROGMEM = "Asia/Damascus"; +static const char kZoneNameAsia_Damascus[] ACE_TIME_PROGMEM = "\x05" "Damascus"; const extended::ZoneInfo kZoneAsia_Damascus ACE_TIME_PROGMEM = { kZoneNameAsia_Damascus /*name*/, @@ -8287,9 +8312,9 @@ const extended::ZoneInfo kZoneAsia_Damascus ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Dhaka // Zone Eras: 2 -// Strings (bytes): 23 -// Memory (8-bit): 56 -// Memory (32-bit): 75 +// Strings (bytes): 19 (originally 23) +// Memory (8-bit): 52 +// Memory (32-bit): 71 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Dhaka[] ACE_TIME_PROGMEM = { @@ -8320,7 +8345,7 @@ static const extended::ZoneEra kZoneEraAsia_Dhaka[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Dhaka[] ACE_TIME_PROGMEM = "Asia/Dhaka"; +static const char kZoneNameAsia_Dhaka[] ACE_TIME_PROGMEM = "\x05" "Dhaka"; const extended::ZoneInfo kZoneAsia_Dhaka ACE_TIME_PROGMEM = { kZoneNameAsia_Dhaka /*name*/, @@ -8333,9 +8358,9 @@ const extended::ZoneInfo kZoneAsia_Dhaka ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Dili // Zone Eras: 2 -// Strings (bytes): 18 -// Memory (8-bit): 51 -// Memory (32-bit): 70 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 47 +// Memory (32-bit): 66 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Dili[] ACE_TIME_PROGMEM = { @@ -8366,7 +8391,7 @@ static const extended::ZoneEra kZoneEraAsia_Dili[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Dili[] ACE_TIME_PROGMEM = "Asia/Dili"; +static const char kZoneNameAsia_Dili[] ACE_TIME_PROGMEM = "\x05" "Dili"; const extended::ZoneInfo kZoneAsia_Dili ACE_TIME_PROGMEM = { kZoneNameAsia_Dili /*name*/, @@ -8379,9 +8404,9 @@ const extended::ZoneInfo kZoneAsia_Dili ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Dubai // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Dubai[] ACE_TIME_PROGMEM = { @@ -8400,7 +8425,7 @@ static const extended::ZoneEra kZoneEraAsia_Dubai[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Dubai[] ACE_TIME_PROGMEM = "Asia/Dubai"; +static const char kZoneNameAsia_Dubai[] ACE_TIME_PROGMEM = "\x05" "Dubai"; const extended::ZoneInfo kZoneAsia_Dubai ACE_TIME_PROGMEM = { kZoneNameAsia_Dubai /*name*/, @@ -8413,9 +8438,9 @@ const extended::ZoneInfo kZoneAsia_Dubai ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Dushanbe // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Dushanbe[] ACE_TIME_PROGMEM = { @@ -8434,7 +8459,7 @@ static const extended::ZoneEra kZoneEraAsia_Dushanbe[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Dushanbe[] ACE_TIME_PROGMEM = "Asia/Dushanbe"; +static const char kZoneNameAsia_Dushanbe[] ACE_TIME_PROGMEM = "\x05" "Dushanbe"; const extended::ZoneInfo kZoneAsia_Dushanbe ACE_TIME_PROGMEM = { kZoneNameAsia_Dushanbe /*name*/, @@ -8447,9 +8472,9 @@ const extended::ZoneInfo kZoneAsia_Dushanbe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Famagusta // Zone Eras: 3 -// Strings (bytes): 29 -// Memory (8-bit): 73 -// Memory (32-bit): 97 +// Strings (bytes): 25 (originally 29) +// Memory (8-bit): 69 +// Memory (32-bit): 93 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Famagusta[] ACE_TIME_PROGMEM = { @@ -8492,7 +8517,7 @@ static const extended::ZoneEra kZoneEraAsia_Famagusta[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Famagusta[] ACE_TIME_PROGMEM = "Asia/Famagusta"; +static const char kZoneNameAsia_Famagusta[] ACE_TIME_PROGMEM = "\x05" "Famagusta"; const extended::ZoneInfo kZoneAsia_Famagusta ACE_TIME_PROGMEM = { kZoneNameAsia_Famagusta /*name*/, @@ -8505,9 +8530,9 @@ const extended::ZoneInfo kZoneAsia_Famagusta ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Gaza // Zone Eras: 8 -// Strings (bytes): 47 -// Memory (8-bit): 146 -// Memory (32-bit): 195 +// Strings (bytes): 43 (originally 47) +// Memory (8-bit): 142 +// Memory (32-bit): 191 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Gaza[] ACE_TIME_PROGMEM = { @@ -8610,7 +8635,7 @@ static const extended::ZoneEra kZoneEraAsia_Gaza[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Gaza[] ACE_TIME_PROGMEM = "Asia/Gaza"; +static const char kZoneNameAsia_Gaza[] ACE_TIME_PROGMEM = "\x05" "Gaza"; const extended::ZoneInfo kZoneAsia_Gaza ACE_TIME_PROGMEM = { kZoneNameAsia_Gaza /*name*/, @@ -8623,9 +8648,9 @@ const extended::ZoneInfo kZoneAsia_Gaza ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Hebron // Zone Eras: 2 -// Strings (bytes): 22 -// Memory (8-bit): 55 -// Memory (32-bit): 74 +// Strings (bytes): 18 (originally 22) +// Memory (8-bit): 51 +// Memory (32-bit): 70 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Hebron[] ACE_TIME_PROGMEM = { @@ -8656,7 +8681,7 @@ static const extended::ZoneEra kZoneEraAsia_Hebron[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Hebron[] ACE_TIME_PROGMEM = "Asia/Hebron"; +static const char kZoneNameAsia_Hebron[] ACE_TIME_PROGMEM = "\x05" "Hebron"; const extended::ZoneInfo kZoneAsia_Hebron ACE_TIME_PROGMEM = { kZoneNameAsia_Hebron /*name*/, @@ -8669,9 +8694,9 @@ const extended::ZoneInfo kZoneAsia_Hebron ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Ho_Chi_Minh // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 17 (originally 21) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Ho_Chi_Minh[] ACE_TIME_PROGMEM = { @@ -8690,7 +8715,7 @@ static const extended::ZoneEra kZoneEraAsia_Ho_Chi_Minh[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Ho_Chi_Minh[] ACE_TIME_PROGMEM = "Asia/Ho_Chi_Minh"; +static const char kZoneNameAsia_Ho_Chi_Minh[] ACE_TIME_PROGMEM = "\x05" "Ho_Chi_Minh"; const extended::ZoneInfo kZoneAsia_Ho_Chi_Minh ACE_TIME_PROGMEM = { kZoneNameAsia_Ho_Chi_Minh /*name*/, @@ -8703,9 +8728,9 @@ const extended::ZoneInfo kZoneAsia_Ho_Chi_Minh ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Hong_Kong // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 16 (originally 20) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Hong_Kong[] ACE_TIME_PROGMEM = { @@ -8724,7 +8749,7 @@ static const extended::ZoneEra kZoneEraAsia_Hong_Kong[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Hong_Kong[] ACE_TIME_PROGMEM = "Asia/Hong_Kong"; +static const char kZoneNameAsia_Hong_Kong[] ACE_TIME_PROGMEM = "\x05" "Hong_Kong"; const extended::ZoneInfo kZoneAsia_Hong_Kong ACE_TIME_PROGMEM = { kZoneNameAsia_Hong_Kong /*name*/, @@ -8737,9 +8762,9 @@ const extended::ZoneInfo kZoneAsia_Hong_Kong ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Hovd // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Hovd[] ACE_TIME_PROGMEM = { @@ -8758,7 +8783,7 @@ static const extended::ZoneEra kZoneEraAsia_Hovd[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Hovd[] ACE_TIME_PROGMEM = "Asia/Hovd"; +static const char kZoneNameAsia_Hovd[] ACE_TIME_PROGMEM = "\x05" "Hovd"; const extended::ZoneInfo kZoneAsia_Hovd ACE_TIME_PROGMEM = { kZoneNameAsia_Hovd /*name*/, @@ -8771,9 +8796,9 @@ const extended::ZoneInfo kZoneAsia_Hovd ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Irkutsk // Zone Eras: 3 -// Strings (bytes): 29 -// Memory (8-bit): 73 -// Memory (32-bit): 97 +// Strings (bytes): 25 (originally 29) +// Memory (8-bit): 69 +// Memory (32-bit): 93 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Irkutsk[] ACE_TIME_PROGMEM = { @@ -8816,7 +8841,7 @@ static const extended::ZoneEra kZoneEraAsia_Irkutsk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Irkutsk[] ACE_TIME_PROGMEM = "Asia/Irkutsk"; +static const char kZoneNameAsia_Irkutsk[] ACE_TIME_PROGMEM = "\x05" "Irkutsk"; const extended::ZoneInfo kZoneAsia_Irkutsk ACE_TIME_PROGMEM = { kZoneNameAsia_Irkutsk /*name*/, @@ -8829,9 +8854,9 @@ const extended::ZoneInfo kZoneAsia_Irkutsk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Jakarta // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 13 (originally 17) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Jakarta[] ACE_TIME_PROGMEM = { @@ -8850,7 +8875,7 @@ static const extended::ZoneEra kZoneEraAsia_Jakarta[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Jakarta[] ACE_TIME_PROGMEM = "Asia/Jakarta"; +static const char kZoneNameAsia_Jakarta[] ACE_TIME_PROGMEM = "\x05" "Jakarta"; const extended::ZoneInfo kZoneAsia_Jakarta ACE_TIME_PROGMEM = { kZoneNameAsia_Jakarta /*name*/, @@ -8863,9 +8888,9 @@ const extended::ZoneInfo kZoneAsia_Jakarta ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Jayapura // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Jayapura[] ACE_TIME_PROGMEM = { @@ -8884,7 +8909,7 @@ static const extended::ZoneEra kZoneEraAsia_Jayapura[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Jayapura[] ACE_TIME_PROGMEM = "Asia/Jayapura"; +static const char kZoneNameAsia_Jayapura[] ACE_TIME_PROGMEM = "\x05" "Jayapura"; const extended::ZoneInfo kZoneAsia_Jayapura ACE_TIME_PROGMEM = { kZoneNameAsia_Jayapura /*name*/, @@ -8897,9 +8922,9 @@ const extended::ZoneInfo kZoneAsia_Jayapura ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Jerusalem // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 15 (originally 19) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Jerusalem[] ACE_TIME_PROGMEM = { @@ -8918,7 +8943,7 @@ static const extended::ZoneEra kZoneEraAsia_Jerusalem[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Jerusalem[] ACE_TIME_PROGMEM = "Asia/Jerusalem"; +static const char kZoneNameAsia_Jerusalem[] ACE_TIME_PROGMEM = "\x05" "Jerusalem"; const extended::ZoneInfo kZoneAsia_Jerusalem ACE_TIME_PROGMEM = { kZoneNameAsia_Jerusalem /*name*/, @@ -8931,9 +8956,9 @@ const extended::ZoneInfo kZoneAsia_Jerusalem ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Kabul // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 13 (originally 17) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Kabul[] ACE_TIME_PROGMEM = { @@ -8952,7 +8977,7 @@ static const extended::ZoneEra kZoneEraAsia_Kabul[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Kabul[] ACE_TIME_PROGMEM = "Asia/Kabul"; +static const char kZoneNameAsia_Kabul[] ACE_TIME_PROGMEM = "\x05" "Kabul"; const extended::ZoneInfo kZoneAsia_Kabul ACE_TIME_PROGMEM = { kZoneNameAsia_Kabul /*name*/, @@ -8965,9 +8990,9 @@ const extended::ZoneInfo kZoneAsia_Kabul ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Kamchatka // Zone Eras: 3 -// Strings (bytes): 35 -// Memory (8-bit): 79 -// Memory (32-bit): 103 +// Strings (bytes): 31 (originally 35) +// Memory (8-bit): 75 +// Memory (32-bit): 99 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Kamchatka[] ACE_TIME_PROGMEM = { @@ -9010,7 +9035,7 @@ static const extended::ZoneEra kZoneEraAsia_Kamchatka[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Kamchatka[] ACE_TIME_PROGMEM = "Asia/Kamchatka"; +static const char kZoneNameAsia_Kamchatka[] ACE_TIME_PROGMEM = "\x05" "Kamchatka"; const extended::ZoneInfo kZoneAsia_Kamchatka ACE_TIME_PROGMEM = { kZoneNameAsia_Kamchatka /*name*/, @@ -9023,9 +9048,9 @@ const extended::ZoneInfo kZoneAsia_Kamchatka ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Karachi // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Karachi[] ACE_TIME_PROGMEM = { @@ -9044,7 +9069,7 @@ static const extended::ZoneEra kZoneEraAsia_Karachi[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Karachi[] ACE_TIME_PROGMEM = "Asia/Karachi"; +static const char kZoneNameAsia_Karachi[] ACE_TIME_PROGMEM = "\x05" "Karachi"; const extended::ZoneInfo kZoneAsia_Karachi ACE_TIME_PROGMEM = { kZoneNameAsia_Karachi /*name*/, @@ -9057,9 +9082,9 @@ const extended::ZoneInfo kZoneAsia_Karachi ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Kathmandu // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 17 (originally 21) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Kathmandu[] ACE_TIME_PROGMEM = { @@ -9078,7 +9103,7 @@ static const extended::ZoneEra kZoneEraAsia_Kathmandu[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Kathmandu[] ACE_TIME_PROGMEM = "Asia/Kathmandu"; +static const char kZoneNameAsia_Kathmandu[] ACE_TIME_PROGMEM = "\x05" "Kathmandu"; const extended::ZoneInfo kZoneAsia_Kathmandu ACE_TIME_PROGMEM = { kZoneNameAsia_Kathmandu /*name*/, @@ -9091,9 +9116,9 @@ const extended::ZoneInfo kZoneAsia_Kathmandu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Khandyga // Zone Eras: 5 -// Strings (bytes): 42 -// Memory (8-bit): 108 -// Memory (32-bit): 142 +// Strings (bytes): 38 (originally 42) +// Memory (8-bit): 104 +// Memory (32-bit): 138 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Khandyga[] ACE_TIME_PROGMEM = { @@ -9160,7 +9185,7 @@ static const extended::ZoneEra kZoneEraAsia_Khandyga[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Khandyga[] ACE_TIME_PROGMEM = "Asia/Khandyga"; +static const char kZoneNameAsia_Khandyga[] ACE_TIME_PROGMEM = "\x05" "Khandyga"; const extended::ZoneInfo kZoneAsia_Khandyga ACE_TIME_PROGMEM = { kZoneNameAsia_Khandyga /*name*/, @@ -9173,9 +9198,9 @@ const extended::ZoneInfo kZoneAsia_Khandyga ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Kolkata // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 13 (originally 17) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Kolkata[] ACE_TIME_PROGMEM = { @@ -9194,7 +9219,7 @@ static const extended::ZoneEra kZoneEraAsia_Kolkata[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Kolkata[] ACE_TIME_PROGMEM = "Asia/Kolkata"; +static const char kZoneNameAsia_Kolkata[] ACE_TIME_PROGMEM = "\x05" "Kolkata"; const extended::ZoneInfo kZoneAsia_Kolkata ACE_TIME_PROGMEM = { kZoneNameAsia_Kolkata /*name*/, @@ -9207,9 +9232,9 @@ const extended::ZoneInfo kZoneAsia_Kolkata ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Krasnoyarsk // Zone Eras: 3 -// Strings (bytes): 33 -// Memory (8-bit): 77 -// Memory (32-bit): 101 +// Strings (bytes): 29 (originally 33) +// Memory (8-bit): 73 +// Memory (32-bit): 97 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Krasnoyarsk[] ACE_TIME_PROGMEM = { @@ -9252,7 +9277,7 @@ static const extended::ZoneEra kZoneEraAsia_Krasnoyarsk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Krasnoyarsk[] ACE_TIME_PROGMEM = "Asia/Krasnoyarsk"; +static const char kZoneNameAsia_Krasnoyarsk[] ACE_TIME_PROGMEM = "\x05" "Krasnoyarsk"; const extended::ZoneInfo kZoneAsia_Krasnoyarsk ACE_TIME_PROGMEM = { kZoneNameAsia_Krasnoyarsk /*name*/, @@ -9265,9 +9290,9 @@ const extended::ZoneInfo kZoneAsia_Krasnoyarsk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Kuala_Lumpur // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 18 (originally 22) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Kuala_Lumpur[] ACE_TIME_PROGMEM = { @@ -9286,7 +9311,7 @@ static const extended::ZoneEra kZoneEraAsia_Kuala_Lumpur[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Kuala_Lumpur[] ACE_TIME_PROGMEM = "Asia/Kuala_Lumpur"; +static const char kZoneNameAsia_Kuala_Lumpur[] ACE_TIME_PROGMEM = "\x05" "Kuala_Lumpur"; const extended::ZoneInfo kZoneAsia_Kuala_Lumpur ACE_TIME_PROGMEM = { kZoneNameAsia_Kuala_Lumpur /*name*/, @@ -9299,9 +9324,9 @@ const extended::ZoneInfo kZoneAsia_Kuala_Lumpur ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Kuching // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 13 (originally 17) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Kuching[] ACE_TIME_PROGMEM = { @@ -9320,7 +9345,7 @@ static const extended::ZoneEra kZoneEraAsia_Kuching[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Kuching[] ACE_TIME_PROGMEM = "Asia/Kuching"; +static const char kZoneNameAsia_Kuching[] ACE_TIME_PROGMEM = "\x05" "Kuching"; const extended::ZoneInfo kZoneAsia_Kuching ACE_TIME_PROGMEM = { kZoneNameAsia_Kuching /*name*/, @@ -9333,9 +9358,9 @@ const extended::ZoneInfo kZoneAsia_Kuching ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Macau // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Macau[] ACE_TIME_PROGMEM = { @@ -9354,7 +9379,7 @@ static const extended::ZoneEra kZoneEraAsia_Macau[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Macau[] ACE_TIME_PROGMEM = "Asia/Macau"; +static const char kZoneNameAsia_Macau[] ACE_TIME_PROGMEM = "\x05" "Macau"; const extended::ZoneInfo kZoneAsia_Macau ACE_TIME_PROGMEM = { kZoneNameAsia_Macau /*name*/, @@ -9367,9 +9392,9 @@ const extended::ZoneInfo kZoneAsia_Macau ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Magadan // Zone Eras: 4 -// Strings (bytes): 33 -// Memory (8-bit): 88 -// Memory (32-bit): 117 +// Strings (bytes): 29 (originally 33) +// Memory (8-bit): 84 +// Memory (32-bit): 113 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Magadan[] ACE_TIME_PROGMEM = { @@ -9424,7 +9449,7 @@ static const extended::ZoneEra kZoneEraAsia_Magadan[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Magadan[] ACE_TIME_PROGMEM = "Asia/Magadan"; +static const char kZoneNameAsia_Magadan[] ACE_TIME_PROGMEM = "\x05" "Magadan"; const extended::ZoneInfo kZoneAsia_Magadan ACE_TIME_PROGMEM = { kZoneNameAsia_Magadan /*name*/, @@ -9437,9 +9462,9 @@ const extended::ZoneInfo kZoneAsia_Magadan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Makassar // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 15 (originally 19) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Makassar[] ACE_TIME_PROGMEM = { @@ -9458,7 +9483,7 @@ static const extended::ZoneEra kZoneEraAsia_Makassar[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Makassar[] ACE_TIME_PROGMEM = "Asia/Makassar"; +static const char kZoneNameAsia_Makassar[] ACE_TIME_PROGMEM = "\x05" "Makassar"; const extended::ZoneInfo kZoneAsia_Makassar ACE_TIME_PROGMEM = { kZoneNameAsia_Makassar /*name*/, @@ -9471,9 +9496,9 @@ const extended::ZoneInfo kZoneAsia_Makassar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Manila // Zone Eras: 1 -// Strings (bytes): 16 -// Memory (8-bit): 38 -// Memory (32-bit): 52 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Manila[] ACE_TIME_PROGMEM = { @@ -9492,7 +9517,7 @@ static const extended::ZoneEra kZoneEraAsia_Manila[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Manila[] ACE_TIME_PROGMEM = "Asia/Manila"; +static const char kZoneNameAsia_Manila[] ACE_TIME_PROGMEM = "\x05" "Manila"; const extended::ZoneInfo kZoneAsia_Manila ACE_TIME_PROGMEM = { kZoneNameAsia_Manila /*name*/, @@ -9505,9 +9530,9 @@ const extended::ZoneInfo kZoneAsia_Manila ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Nicosia // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Nicosia[] ACE_TIME_PROGMEM = { @@ -9526,7 +9551,7 @@ static const extended::ZoneEra kZoneEraAsia_Nicosia[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Nicosia[] ACE_TIME_PROGMEM = "Asia/Nicosia"; +static const char kZoneNameAsia_Nicosia[] ACE_TIME_PROGMEM = "\x05" "Nicosia"; const extended::ZoneInfo kZoneAsia_Nicosia ACE_TIME_PROGMEM = { kZoneNameAsia_Nicosia /*name*/, @@ -9539,9 +9564,9 @@ const extended::ZoneInfo kZoneAsia_Nicosia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Novokuznetsk // Zone Eras: 3 -// Strings (bytes): 38 -// Memory (8-bit): 82 -// Memory (32-bit): 106 +// Strings (bytes): 34 (originally 38) +// Memory (8-bit): 78 +// Memory (32-bit): 102 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Novokuznetsk[] ACE_TIME_PROGMEM = { @@ -9584,7 +9609,7 @@ static const extended::ZoneEra kZoneEraAsia_Novokuznetsk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Novokuznetsk[] ACE_TIME_PROGMEM = "Asia/Novokuznetsk"; +static const char kZoneNameAsia_Novokuznetsk[] ACE_TIME_PROGMEM = "\x05" "Novokuznetsk"; const extended::ZoneInfo kZoneAsia_Novokuznetsk ACE_TIME_PROGMEM = { kZoneNameAsia_Novokuznetsk /*name*/, @@ -9597,9 +9622,9 @@ const extended::ZoneInfo kZoneAsia_Novokuznetsk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Novosibirsk // Zone Eras: 4 -// Strings (bytes): 37 -// Memory (8-bit): 92 -// Memory (32-bit): 121 +// Strings (bytes): 33 (originally 37) +// Memory (8-bit): 88 +// Memory (32-bit): 117 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Novosibirsk[] ACE_TIME_PROGMEM = { @@ -9654,7 +9679,7 @@ static const extended::ZoneEra kZoneEraAsia_Novosibirsk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Novosibirsk[] ACE_TIME_PROGMEM = "Asia/Novosibirsk"; +static const char kZoneNameAsia_Novosibirsk[] ACE_TIME_PROGMEM = "\x05" "Novosibirsk"; const extended::ZoneInfo kZoneAsia_Novosibirsk ACE_TIME_PROGMEM = { kZoneNameAsia_Novosibirsk /*name*/, @@ -9667,9 +9692,9 @@ const extended::ZoneInfo kZoneAsia_Novosibirsk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Omsk // Zone Eras: 3 -// Strings (bytes): 26 -// Memory (8-bit): 70 -// Memory (32-bit): 94 +// Strings (bytes): 22 (originally 26) +// Memory (8-bit): 66 +// Memory (32-bit): 90 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Omsk[] ACE_TIME_PROGMEM = { @@ -9712,7 +9737,7 @@ static const extended::ZoneEra kZoneEraAsia_Omsk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Omsk[] ACE_TIME_PROGMEM = "Asia/Omsk"; +static const char kZoneNameAsia_Omsk[] ACE_TIME_PROGMEM = "\x05" "Omsk"; const extended::ZoneInfo kZoneAsia_Omsk ACE_TIME_PROGMEM = { kZoneNameAsia_Omsk /*name*/, @@ -9725,9 +9750,9 @@ const extended::ZoneInfo kZoneAsia_Omsk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Oral // Zone Eras: 2 -// Strings (bytes): 22 -// Memory (8-bit): 55 -// Memory (32-bit): 74 +// Strings (bytes): 18 (originally 22) +// Memory (8-bit): 51 +// Memory (32-bit): 70 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Oral[] ACE_TIME_PROGMEM = { @@ -9758,7 +9783,7 @@ static const extended::ZoneEra kZoneEraAsia_Oral[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Oral[] ACE_TIME_PROGMEM = "Asia/Oral"; +static const char kZoneNameAsia_Oral[] ACE_TIME_PROGMEM = "\x05" "Oral"; const extended::ZoneInfo kZoneAsia_Oral ACE_TIME_PROGMEM = { kZoneNameAsia_Oral /*name*/, @@ -9771,9 +9796,9 @@ const extended::ZoneInfo kZoneAsia_Oral ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Pontianak // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 15 (originally 19) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Pontianak[] ACE_TIME_PROGMEM = { @@ -9792,7 +9817,7 @@ static const extended::ZoneEra kZoneEraAsia_Pontianak[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Pontianak[] ACE_TIME_PROGMEM = "Asia/Pontianak"; +static const char kZoneNameAsia_Pontianak[] ACE_TIME_PROGMEM = "\x05" "Pontianak"; const extended::ZoneInfo kZoneAsia_Pontianak ACE_TIME_PROGMEM = { kZoneNameAsia_Pontianak /*name*/, @@ -9805,9 +9830,9 @@ const extended::ZoneInfo kZoneAsia_Pontianak ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Pyongyang // Zone Eras: 3 -// Strings (bytes): 27 -// Memory (8-bit): 71 -// Memory (32-bit): 95 +// Strings (bytes): 23 (originally 27) +// Memory (8-bit): 67 +// Memory (32-bit): 91 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Pyongyang[] ACE_TIME_PROGMEM = { @@ -9850,7 +9875,7 @@ static const extended::ZoneEra kZoneEraAsia_Pyongyang[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Pyongyang[] ACE_TIME_PROGMEM = "Asia/Pyongyang"; +static const char kZoneNameAsia_Pyongyang[] ACE_TIME_PROGMEM = "\x05" "Pyongyang"; const extended::ZoneInfo kZoneAsia_Pyongyang ACE_TIME_PROGMEM = { kZoneNameAsia_Pyongyang /*name*/, @@ -9863,9 +9888,9 @@ const extended::ZoneInfo kZoneAsia_Pyongyang ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Qatar // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Qatar[] ACE_TIME_PROGMEM = { @@ -9884,7 +9909,7 @@ static const extended::ZoneEra kZoneEraAsia_Qatar[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Qatar[] ACE_TIME_PROGMEM = "Asia/Qatar"; +static const char kZoneNameAsia_Qatar[] ACE_TIME_PROGMEM = "\x05" "Qatar"; const extended::ZoneInfo kZoneAsia_Qatar ACE_TIME_PROGMEM = { kZoneNameAsia_Qatar /*name*/, @@ -9897,9 +9922,9 @@ const extended::ZoneInfo kZoneAsia_Qatar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Qostanay // Zone Eras: 2 -// Strings (bytes): 26 -// Memory (8-bit): 59 -// Memory (32-bit): 78 +// Strings (bytes): 22 (originally 26) +// Memory (8-bit): 55 +// Memory (32-bit): 74 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Qostanay[] ACE_TIME_PROGMEM = { @@ -9930,7 +9955,7 @@ static const extended::ZoneEra kZoneEraAsia_Qostanay[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Qostanay[] ACE_TIME_PROGMEM = "Asia/Qostanay"; +static const char kZoneNameAsia_Qostanay[] ACE_TIME_PROGMEM = "\x05" "Qostanay"; const extended::ZoneInfo kZoneAsia_Qostanay ACE_TIME_PROGMEM = { kZoneNameAsia_Qostanay /*name*/, @@ -9943,9 +9968,9 @@ const extended::ZoneInfo kZoneAsia_Qostanay ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Qyzylorda // Zone Eras: 3 -// Strings (bytes): 31 -// Memory (8-bit): 75 -// Memory (32-bit): 99 +// Strings (bytes): 27 (originally 31) +// Memory (8-bit): 71 +// Memory (32-bit): 95 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Qyzylorda[] ACE_TIME_PROGMEM = { @@ -9988,7 +10013,7 @@ static const extended::ZoneEra kZoneEraAsia_Qyzylorda[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Qyzylorda[] ACE_TIME_PROGMEM = "Asia/Qyzylorda"; +static const char kZoneNameAsia_Qyzylorda[] ACE_TIME_PROGMEM = "\x05" "Qyzylorda"; const extended::ZoneInfo kZoneAsia_Qyzylorda ACE_TIME_PROGMEM = { kZoneNameAsia_Qyzylorda /*name*/, @@ -10001,9 +10026,9 @@ const extended::ZoneInfo kZoneAsia_Qyzylorda ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Riyadh // Zone Eras: 1 -// Strings (bytes): 16 -// Memory (8-bit): 38 -// Memory (32-bit): 52 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Riyadh[] ACE_TIME_PROGMEM = { @@ -10022,7 +10047,7 @@ static const extended::ZoneEra kZoneEraAsia_Riyadh[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Riyadh[] ACE_TIME_PROGMEM = "Asia/Riyadh"; +static const char kZoneNameAsia_Riyadh[] ACE_TIME_PROGMEM = "\x05" "Riyadh"; const extended::ZoneInfo kZoneAsia_Riyadh ACE_TIME_PROGMEM = { kZoneNameAsia_Riyadh /*name*/, @@ -10035,9 +10060,9 @@ const extended::ZoneInfo kZoneAsia_Riyadh ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Sakhalin // Zone Eras: 4 -// Strings (bytes): 34 -// Memory (8-bit): 89 -// Memory (32-bit): 118 +// Strings (bytes): 30 (originally 34) +// Memory (8-bit): 85 +// Memory (32-bit): 114 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Sakhalin[] ACE_TIME_PROGMEM = { @@ -10092,7 +10117,7 @@ static const extended::ZoneEra kZoneEraAsia_Sakhalin[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Sakhalin[] ACE_TIME_PROGMEM = "Asia/Sakhalin"; +static const char kZoneNameAsia_Sakhalin[] ACE_TIME_PROGMEM = "\x05" "Sakhalin"; const extended::ZoneInfo kZoneAsia_Sakhalin ACE_TIME_PROGMEM = { kZoneNameAsia_Sakhalin /*name*/, @@ -10105,9 +10130,9 @@ const extended::ZoneInfo kZoneAsia_Sakhalin ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Samarkand // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 15 (originally 19) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Samarkand[] ACE_TIME_PROGMEM = { @@ -10126,7 +10151,7 @@ static const extended::ZoneEra kZoneEraAsia_Samarkand[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Samarkand[] ACE_TIME_PROGMEM = "Asia/Samarkand"; +static const char kZoneNameAsia_Samarkand[] ACE_TIME_PROGMEM = "\x05" "Samarkand"; const extended::ZoneInfo kZoneAsia_Samarkand ACE_TIME_PROGMEM = { kZoneNameAsia_Samarkand /*name*/, @@ -10139,9 +10164,9 @@ const extended::ZoneInfo kZoneAsia_Samarkand ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Seoul // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Seoul[] ACE_TIME_PROGMEM = { @@ -10160,7 +10185,7 @@ static const extended::ZoneEra kZoneEraAsia_Seoul[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Seoul[] ACE_TIME_PROGMEM = "Asia/Seoul"; +static const char kZoneNameAsia_Seoul[] ACE_TIME_PROGMEM = "\x05" "Seoul"; const extended::ZoneInfo kZoneAsia_Seoul ACE_TIME_PROGMEM = { kZoneNameAsia_Seoul /*name*/, @@ -10173,9 +10198,9 @@ const extended::ZoneInfo kZoneAsia_Seoul ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Shanghai // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Shanghai[] ACE_TIME_PROGMEM = { @@ -10194,7 +10219,7 @@ static const extended::ZoneEra kZoneEraAsia_Shanghai[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Shanghai[] ACE_TIME_PROGMEM = "Asia/Shanghai"; +static const char kZoneNameAsia_Shanghai[] ACE_TIME_PROGMEM = "\x05" "Shanghai"; const extended::ZoneInfo kZoneAsia_Shanghai ACE_TIME_PROGMEM = { kZoneNameAsia_Shanghai /*name*/, @@ -10207,9 +10232,9 @@ const extended::ZoneInfo kZoneAsia_Shanghai ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Singapore // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 15 (originally 19) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Singapore[] ACE_TIME_PROGMEM = { @@ -10228,7 +10253,7 @@ static const extended::ZoneEra kZoneEraAsia_Singapore[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Singapore[] ACE_TIME_PROGMEM = "Asia/Singapore"; +static const char kZoneNameAsia_Singapore[] ACE_TIME_PROGMEM = "\x05" "Singapore"; const extended::ZoneInfo kZoneAsia_Singapore ACE_TIME_PROGMEM = { kZoneNameAsia_Singapore /*name*/, @@ -10241,9 +10266,9 @@ const extended::ZoneInfo kZoneAsia_Singapore ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Srednekolymsk // Zone Eras: 3 -// Strings (bytes): 35 -// Memory (8-bit): 79 -// Memory (32-bit): 103 +// Strings (bytes): 31 (originally 35) +// Memory (8-bit): 75 +// Memory (32-bit): 99 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Srednekolymsk[] ACE_TIME_PROGMEM = { @@ -10286,7 +10311,7 @@ static const extended::ZoneEra kZoneEraAsia_Srednekolymsk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Srednekolymsk[] ACE_TIME_PROGMEM = "Asia/Srednekolymsk"; +static const char kZoneNameAsia_Srednekolymsk[] ACE_TIME_PROGMEM = "\x05" "Srednekolymsk"; const extended::ZoneInfo kZoneAsia_Srednekolymsk ACE_TIME_PROGMEM = { kZoneNameAsia_Srednekolymsk /*name*/, @@ -10299,9 +10324,9 @@ const extended::ZoneInfo kZoneAsia_Srednekolymsk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Taipei // Zone Eras: 1 -// Strings (bytes): 16 -// Memory (8-bit): 38 -// Memory (32-bit): 52 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Taipei[] ACE_TIME_PROGMEM = { @@ -10320,7 +10345,7 @@ static const extended::ZoneEra kZoneEraAsia_Taipei[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Taipei[] ACE_TIME_PROGMEM = "Asia/Taipei"; +static const char kZoneNameAsia_Taipei[] ACE_TIME_PROGMEM = "\x05" "Taipei"; const extended::ZoneInfo kZoneAsia_Taipei ACE_TIME_PROGMEM = { kZoneNameAsia_Taipei /*name*/, @@ -10333,9 +10358,9 @@ const extended::ZoneInfo kZoneAsia_Taipei ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Tashkent // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Tashkent[] ACE_TIME_PROGMEM = { @@ -10354,7 +10379,7 @@ static const extended::ZoneEra kZoneEraAsia_Tashkent[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Tashkent[] ACE_TIME_PROGMEM = "Asia/Tashkent"; +static const char kZoneNameAsia_Tashkent[] ACE_TIME_PROGMEM = "\x05" "Tashkent"; const extended::ZoneInfo kZoneAsia_Tashkent ACE_TIME_PROGMEM = { kZoneNameAsia_Tashkent /*name*/, @@ -10367,9 +10392,9 @@ const extended::ZoneInfo kZoneAsia_Tashkent ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Tbilisi // Zone Eras: 3 -// Strings (bytes): 33 -// Memory (8-bit): 77 -// Memory (32-bit): 101 +// Strings (bytes): 29 (originally 33) +// Memory (8-bit): 73 +// Memory (32-bit): 97 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Tbilisi[] ACE_TIME_PROGMEM = { @@ -10412,7 +10437,7 @@ static const extended::ZoneEra kZoneEraAsia_Tbilisi[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Tbilisi[] ACE_TIME_PROGMEM = "Asia/Tbilisi"; +static const char kZoneNameAsia_Tbilisi[] ACE_TIME_PROGMEM = "\x05" "Tbilisi"; const extended::ZoneInfo kZoneAsia_Tbilisi ACE_TIME_PROGMEM = { kZoneNameAsia_Tbilisi /*name*/, @@ -10425,9 +10450,9 @@ const extended::ZoneInfo kZoneAsia_Tbilisi ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Tehran // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 20 (originally 24) +// Memory (8-bit): 42 +// Memory (32-bit): 56 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Tehran[] ACE_TIME_PROGMEM = { @@ -10446,7 +10471,7 @@ static const extended::ZoneEra kZoneEraAsia_Tehran[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Tehran[] ACE_TIME_PROGMEM = "Asia/Tehran"; +static const char kZoneNameAsia_Tehran[] ACE_TIME_PROGMEM = "\x05" "Tehran"; const extended::ZoneInfo kZoneAsia_Tehran ACE_TIME_PROGMEM = { kZoneNameAsia_Tehran /*name*/, @@ -10459,9 +10484,9 @@ const extended::ZoneInfo kZoneAsia_Tehran ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Thimphu // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 13 (originally 17) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Thimphu[] ACE_TIME_PROGMEM = { @@ -10480,7 +10505,7 @@ static const extended::ZoneEra kZoneEraAsia_Thimphu[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Thimphu[] ACE_TIME_PROGMEM = "Asia/Thimphu"; +static const char kZoneNameAsia_Thimphu[] ACE_TIME_PROGMEM = "\x05" "Thimphu"; const extended::ZoneInfo kZoneAsia_Thimphu ACE_TIME_PROGMEM = { kZoneNameAsia_Thimphu /*name*/, @@ -10493,9 +10518,9 @@ const extended::ZoneInfo kZoneAsia_Thimphu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Tokyo // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Tokyo[] ACE_TIME_PROGMEM = { @@ -10514,7 +10539,7 @@ static const extended::ZoneEra kZoneEraAsia_Tokyo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Tokyo[] ACE_TIME_PROGMEM = "Asia/Tokyo"; +static const char kZoneNameAsia_Tokyo[] ACE_TIME_PROGMEM = "\x05" "Tokyo"; const extended::ZoneInfo kZoneAsia_Tokyo ACE_TIME_PROGMEM = { kZoneNameAsia_Tokyo /*name*/, @@ -10527,9 +10552,9 @@ const extended::ZoneInfo kZoneAsia_Tokyo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Tomsk // Zone Eras: 5 -// Strings (bytes): 39 -// Memory (8-bit): 105 -// Memory (32-bit): 139 +// Strings (bytes): 35 (originally 39) +// Memory (8-bit): 101 +// Memory (32-bit): 135 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Tomsk[] ACE_TIME_PROGMEM = { @@ -10596,7 +10621,7 @@ static const extended::ZoneEra kZoneEraAsia_Tomsk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Tomsk[] ACE_TIME_PROGMEM = "Asia/Tomsk"; +static const char kZoneNameAsia_Tomsk[] ACE_TIME_PROGMEM = "\x05" "Tomsk"; const extended::ZoneInfo kZoneAsia_Tomsk ACE_TIME_PROGMEM = { kZoneNameAsia_Tomsk /*name*/, @@ -10609,9 +10634,9 @@ const extended::ZoneInfo kZoneAsia_Tomsk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Ulaanbaatar // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 21 (originally 25) +// Memory (8-bit): 43 +// Memory (32-bit): 57 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Ulaanbaatar[] ACE_TIME_PROGMEM = { @@ -10630,7 +10655,7 @@ static const extended::ZoneEra kZoneEraAsia_Ulaanbaatar[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Ulaanbaatar[] ACE_TIME_PROGMEM = "Asia/Ulaanbaatar"; +static const char kZoneNameAsia_Ulaanbaatar[] ACE_TIME_PROGMEM = "\x05" "Ulaanbaatar"; const extended::ZoneInfo kZoneAsia_Ulaanbaatar ACE_TIME_PROGMEM = { kZoneNameAsia_Ulaanbaatar /*name*/, @@ -10643,9 +10668,9 @@ const extended::ZoneInfo kZoneAsia_Ulaanbaatar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Urumqi // Zone Eras: 1 -// Strings (bytes): 16 -// Memory (8-bit): 38 -// Memory (32-bit): 52 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Urumqi[] ACE_TIME_PROGMEM = { @@ -10664,7 +10689,7 @@ static const extended::ZoneEra kZoneEraAsia_Urumqi[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Urumqi[] ACE_TIME_PROGMEM = "Asia/Urumqi"; +static const char kZoneNameAsia_Urumqi[] ACE_TIME_PROGMEM = "\x05" "Urumqi"; const extended::ZoneInfo kZoneAsia_Urumqi ACE_TIME_PROGMEM = { kZoneNameAsia_Urumqi /*name*/, @@ -10677,9 +10702,9 @@ const extended::ZoneInfo kZoneAsia_Urumqi ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Ust-Nera // Zone Eras: 4 -// Strings (bytes): 34 -// Memory (8-bit): 89 -// Memory (32-bit): 118 +// Strings (bytes): 30 (originally 34) +// Memory (8-bit): 85 +// Memory (32-bit): 114 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Ust_Nera[] ACE_TIME_PROGMEM = { @@ -10734,7 +10759,7 @@ static const extended::ZoneEra kZoneEraAsia_Ust_Nera[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Ust_Nera[] ACE_TIME_PROGMEM = "Asia/Ust-Nera"; +static const char kZoneNameAsia_Ust_Nera[] ACE_TIME_PROGMEM = "\x05" "Ust-Nera"; const extended::ZoneInfo kZoneAsia_Ust_Nera ACE_TIME_PROGMEM = { kZoneNameAsia_Ust_Nera /*name*/, @@ -10747,9 +10772,9 @@ const extended::ZoneInfo kZoneAsia_Ust_Nera ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Vladivostok // Zone Eras: 3 -// Strings (bytes): 33 -// Memory (8-bit): 77 -// Memory (32-bit): 101 +// Strings (bytes): 29 (originally 33) +// Memory (8-bit): 73 +// Memory (32-bit): 97 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Vladivostok[] ACE_TIME_PROGMEM = { @@ -10792,7 +10817,7 @@ static const extended::ZoneEra kZoneEraAsia_Vladivostok[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Vladivostok[] ACE_TIME_PROGMEM = "Asia/Vladivostok"; +static const char kZoneNameAsia_Vladivostok[] ACE_TIME_PROGMEM = "\x05" "Vladivostok"; const extended::ZoneInfo kZoneAsia_Vladivostok ACE_TIME_PROGMEM = { kZoneNameAsia_Vladivostok /*name*/, @@ -10805,9 +10830,9 @@ const extended::ZoneInfo kZoneAsia_Vladivostok ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Yakutsk // Zone Eras: 3 -// Strings (bytes): 29 -// Memory (8-bit): 73 -// Memory (32-bit): 97 +// Strings (bytes): 25 (originally 29) +// Memory (8-bit): 69 +// Memory (32-bit): 93 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Yakutsk[] ACE_TIME_PROGMEM = { @@ -10850,7 +10875,7 @@ static const extended::ZoneEra kZoneEraAsia_Yakutsk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Yakutsk[] ACE_TIME_PROGMEM = "Asia/Yakutsk"; +static const char kZoneNameAsia_Yakutsk[] ACE_TIME_PROGMEM = "\x05" "Yakutsk"; const extended::ZoneInfo kZoneAsia_Yakutsk ACE_TIME_PROGMEM = { kZoneNameAsia_Yakutsk /*name*/, @@ -10863,9 +10888,9 @@ const extended::ZoneInfo kZoneAsia_Yakutsk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Yangon // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 14 (originally 18) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Yangon[] ACE_TIME_PROGMEM = { @@ -10884,7 +10909,7 @@ static const extended::ZoneEra kZoneEraAsia_Yangon[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Yangon[] ACE_TIME_PROGMEM = "Asia/Yangon"; +static const char kZoneNameAsia_Yangon[] ACE_TIME_PROGMEM = "\x05" "Yangon"; const extended::ZoneInfo kZoneAsia_Yangon ACE_TIME_PROGMEM = { kZoneNameAsia_Yangon /*name*/, @@ -10897,9 +10922,9 @@ const extended::ZoneInfo kZoneAsia_Yangon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Yekaterinburg // Zone Eras: 3 -// Strings (bytes): 35 -// Memory (8-bit): 79 -// Memory (32-bit): 103 +// Strings (bytes): 31 (originally 35) +// Memory (8-bit): 75 +// Memory (32-bit): 99 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Yekaterinburg[] ACE_TIME_PROGMEM = { @@ -10942,7 +10967,7 @@ static const extended::ZoneEra kZoneEraAsia_Yekaterinburg[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Yekaterinburg[] ACE_TIME_PROGMEM = "Asia/Yekaterinburg"; +static const char kZoneNameAsia_Yekaterinburg[] ACE_TIME_PROGMEM = "\x05" "Yekaterinburg"; const extended::ZoneInfo kZoneAsia_Yekaterinburg ACE_TIME_PROGMEM = { kZoneNameAsia_Yekaterinburg /*name*/, @@ -10955,9 +10980,9 @@ const extended::ZoneInfo kZoneAsia_Yekaterinburg ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Asia/Yerevan // Zone Eras: 2 -// Strings (bytes): 29 -// Memory (8-bit): 62 -// Memory (32-bit): 81 +// Strings (bytes): 25 (originally 29) +// Memory (8-bit): 58 +// Memory (32-bit): 77 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAsia_Yerevan[] ACE_TIME_PROGMEM = { @@ -10988,7 +11013,7 @@ static const extended::ZoneEra kZoneEraAsia_Yerevan[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAsia_Yerevan[] ACE_TIME_PROGMEM = "Asia/Yerevan"; +static const char kZoneNameAsia_Yerevan[] ACE_TIME_PROGMEM = "\x05" "Yerevan"; const extended::ZoneInfo kZoneAsia_Yerevan ACE_TIME_PROGMEM = { kZoneNameAsia_Yerevan /*name*/, @@ -11001,9 +11026,9 @@ const extended::ZoneInfo kZoneAsia_Yerevan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/Azores // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 16 (originally 24) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAtlantic_Azores[] ACE_TIME_PROGMEM = { @@ -11022,7 +11047,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Azores[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAtlantic_Azores[] ACE_TIME_PROGMEM = "Atlantic/Azores"; +static const char kZoneNameAtlantic_Azores[] ACE_TIME_PROGMEM = "\x06" "Azores"; const extended::ZoneInfo kZoneAtlantic_Azores ACE_TIME_PROGMEM = { kZoneNameAtlantic_Azores /*name*/, @@ -11035,9 +11060,9 @@ const extended::ZoneInfo kZoneAtlantic_Azores ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/Bermuda // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 13 (originally 21) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAtlantic_Bermuda[] ACE_TIME_PROGMEM = { @@ -11056,7 +11081,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Bermuda[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAtlantic_Bermuda[] ACE_TIME_PROGMEM = "Atlantic/Bermuda"; +static const char kZoneNameAtlantic_Bermuda[] ACE_TIME_PROGMEM = "\x06" "Bermuda"; const extended::ZoneInfo kZoneAtlantic_Bermuda ACE_TIME_PROGMEM = { kZoneNameAtlantic_Bermuda /*name*/, @@ -11069,9 +11094,9 @@ const extended::ZoneInfo kZoneAtlantic_Bermuda ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/Canary // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 13 (originally 21) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAtlantic_Canary[] ACE_TIME_PROGMEM = { @@ -11090,7 +11115,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Canary[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAtlantic_Canary[] ACE_TIME_PROGMEM = "Atlantic/Canary"; +static const char kZoneNameAtlantic_Canary[] ACE_TIME_PROGMEM = "\x06" "Canary"; const extended::ZoneInfo kZoneAtlantic_Canary ACE_TIME_PROGMEM = { kZoneNameAtlantic_Canary /*name*/, @@ -11103,9 +11128,9 @@ const extended::ZoneInfo kZoneAtlantic_Canary ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/Cape_Verde // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 16 (originally 24) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAtlantic_Cape_Verde[] ACE_TIME_PROGMEM = { @@ -11124,7 +11149,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Cape_Verde[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAtlantic_Cape_Verde[] ACE_TIME_PROGMEM = "Atlantic/Cape_Verde"; +static const char kZoneNameAtlantic_Cape_Verde[] ACE_TIME_PROGMEM = "\x06" "Cape_Verde"; const extended::ZoneInfo kZoneAtlantic_Cape_Verde ACE_TIME_PROGMEM = { kZoneNameAtlantic_Cape_Verde /*name*/, @@ -11137,9 +11162,9 @@ const extended::ZoneInfo kZoneAtlantic_Cape_Verde ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/Faroe // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 12 (originally 20) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAtlantic_Faroe[] ACE_TIME_PROGMEM = { @@ -11158,7 +11183,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Faroe[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAtlantic_Faroe[] ACE_TIME_PROGMEM = "Atlantic/Faroe"; +static const char kZoneNameAtlantic_Faroe[] ACE_TIME_PROGMEM = "\x06" "Faroe"; const extended::ZoneInfo kZoneAtlantic_Faroe ACE_TIME_PROGMEM = { kZoneNameAtlantic_Faroe /*name*/, @@ -11171,9 +11196,9 @@ const extended::ZoneInfo kZoneAtlantic_Faroe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/Madeira // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 14 (originally 22) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAtlantic_Madeira[] ACE_TIME_PROGMEM = { @@ -11192,7 +11217,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Madeira[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAtlantic_Madeira[] ACE_TIME_PROGMEM = "Atlantic/Madeira"; +static const char kZoneNameAtlantic_Madeira[] ACE_TIME_PROGMEM = "\x06" "Madeira"; const extended::ZoneInfo kZoneAtlantic_Madeira ACE_TIME_PROGMEM = { kZoneNameAtlantic_Madeira /*name*/, @@ -11205,9 +11230,9 @@ const extended::ZoneInfo kZoneAtlantic_Madeira ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/Reykjavik // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 15 (originally 23) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAtlantic_Reykjavik[] ACE_TIME_PROGMEM = { @@ -11226,7 +11251,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Reykjavik[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAtlantic_Reykjavik[] ACE_TIME_PROGMEM = "Atlantic/Reykjavik"; +static const char kZoneNameAtlantic_Reykjavik[] ACE_TIME_PROGMEM = "\x06" "Reykjavik"; const extended::ZoneInfo kZoneAtlantic_Reykjavik ACE_TIME_PROGMEM = { kZoneNameAtlantic_Reykjavik /*name*/, @@ -11239,9 +11264,9 @@ const extended::ZoneInfo kZoneAtlantic_Reykjavik ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/South_Georgia // Zone Eras: 1 -// Strings (bytes): 27 -// Memory (8-bit): 49 -// Memory (32-bit): 63 +// Strings (bytes): 19 (originally 27) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAtlantic_South_Georgia[] ACE_TIME_PROGMEM = { @@ -11260,7 +11285,7 @@ static const extended::ZoneEra kZoneEraAtlantic_South_Georgia[] ACE_TIME_PROGMEM }; -static const char kZoneNameAtlantic_South_Georgia[] ACE_TIME_PROGMEM = "Atlantic/South_Georgia"; +static const char kZoneNameAtlantic_South_Georgia[] ACE_TIME_PROGMEM = "\x06" "South_Georgia"; const extended::ZoneInfo kZoneAtlantic_South_Georgia ACE_TIME_PROGMEM = { kZoneNameAtlantic_South_Georgia /*name*/, @@ -11273,9 +11298,9 @@ const extended::ZoneInfo kZoneAtlantic_South_Georgia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Atlantic/Stanley // Zone Eras: 2 -// Strings (bytes): 29 -// Memory (8-bit): 62 -// Memory (32-bit): 81 +// Strings (bytes): 21 (originally 29) +// Memory (8-bit): 54 +// Memory (32-bit): 73 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAtlantic_Stanley[] ACE_TIME_PROGMEM = { @@ -11306,7 +11331,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Stanley[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAtlantic_Stanley[] ACE_TIME_PROGMEM = "Atlantic/Stanley"; +static const char kZoneNameAtlantic_Stanley[] ACE_TIME_PROGMEM = "\x06" "Stanley"; const extended::ZoneInfo kZoneAtlantic_Stanley ACE_TIME_PROGMEM = { kZoneNameAtlantic_Stanley /*name*/, @@ -11319,9 +11344,9 @@ const extended::ZoneInfo kZoneAtlantic_Stanley ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Adelaide // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 15 (originally 24) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAustralia_Adelaide[] ACE_TIME_PROGMEM = { @@ -11340,7 +11365,7 @@ static const extended::ZoneEra kZoneEraAustralia_Adelaide[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Adelaide[] ACE_TIME_PROGMEM = "Australia/Adelaide"; +static const char kZoneNameAustralia_Adelaide[] ACE_TIME_PROGMEM = "\x07" "Adelaide"; const extended::ZoneInfo kZoneAustralia_Adelaide ACE_TIME_PROGMEM = { kZoneNameAustralia_Adelaide /*name*/, @@ -11353,9 +11378,9 @@ const extended::ZoneInfo kZoneAustralia_Adelaide ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Brisbane // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 15 (originally 24) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAustralia_Brisbane[] ACE_TIME_PROGMEM = { @@ -11374,7 +11399,7 @@ static const extended::ZoneEra kZoneEraAustralia_Brisbane[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Brisbane[] ACE_TIME_PROGMEM = "Australia/Brisbane"; +static const char kZoneNameAustralia_Brisbane[] ACE_TIME_PROGMEM = "\x07" "Brisbane"; const extended::ZoneInfo kZoneAustralia_Brisbane ACE_TIME_PROGMEM = { kZoneNameAustralia_Brisbane /*name*/, @@ -11387,9 +11412,9 @@ const extended::ZoneInfo kZoneAustralia_Brisbane ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Broken_Hill // Zone Eras: 2 -// Strings (bytes): 32 -// Memory (8-bit): 65 -// Memory (32-bit): 84 +// Strings (bytes): 23 (originally 32) +// Memory (8-bit): 56 +// Memory (32-bit): 75 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAustralia_Broken_Hill[] ACE_TIME_PROGMEM = { @@ -11420,7 +11445,7 @@ static const extended::ZoneEra kZoneEraAustralia_Broken_Hill[] ACE_TIME_PROGMEM }; -static const char kZoneNameAustralia_Broken_Hill[] ACE_TIME_PROGMEM = "Australia/Broken_Hill"; +static const char kZoneNameAustralia_Broken_Hill[] ACE_TIME_PROGMEM = "\x07" "Broken_Hill"; const extended::ZoneInfo kZoneAustralia_Broken_Hill ACE_TIME_PROGMEM = { kZoneNameAustralia_Broken_Hill /*name*/, @@ -11433,9 +11458,9 @@ const extended::ZoneInfo kZoneAustralia_Broken_Hill ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Darwin // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 13 (originally 22) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAustralia_Darwin[] ACE_TIME_PROGMEM = { @@ -11454,7 +11479,7 @@ static const extended::ZoneEra kZoneEraAustralia_Darwin[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Darwin[] ACE_TIME_PROGMEM = "Australia/Darwin"; +static const char kZoneNameAustralia_Darwin[] ACE_TIME_PROGMEM = "\x07" "Darwin"; const extended::ZoneInfo kZoneAustralia_Darwin ACE_TIME_PROGMEM = { kZoneNameAustralia_Darwin /*name*/, @@ -11467,9 +11492,9 @@ const extended::ZoneInfo kZoneAustralia_Darwin ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Eucla // Zone Eras: 1 -// Strings (bytes): 28 -// Memory (8-bit): 50 -// Memory (32-bit): 64 +// Strings (bytes): 19 (originally 28) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAustralia_Eucla[] ACE_TIME_PROGMEM = { @@ -11488,7 +11513,7 @@ static const extended::ZoneEra kZoneEraAustralia_Eucla[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Eucla[] ACE_TIME_PROGMEM = "Australia/Eucla"; +static const char kZoneNameAustralia_Eucla[] ACE_TIME_PROGMEM = "\x07" "Eucla"; const extended::ZoneInfo kZoneAustralia_Eucla ACE_TIME_PROGMEM = { kZoneNameAustralia_Eucla /*name*/, @@ -11501,9 +11526,9 @@ const extended::ZoneInfo kZoneAustralia_Eucla ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Hobart // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 13 (originally 22) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAustralia_Hobart[] ACE_TIME_PROGMEM = { @@ -11522,7 +11547,7 @@ static const extended::ZoneEra kZoneEraAustralia_Hobart[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Hobart[] ACE_TIME_PROGMEM = "Australia/Hobart"; +static const char kZoneNameAustralia_Hobart[] ACE_TIME_PROGMEM = "\x07" "Hobart"; const extended::ZoneInfo kZoneAustralia_Hobart ACE_TIME_PROGMEM = { kZoneNameAustralia_Hobart /*name*/, @@ -11535,9 +11560,9 @@ const extended::ZoneInfo kZoneAustralia_Hobart ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Lindeman // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 15 (originally 24) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAustralia_Lindeman[] ACE_TIME_PROGMEM = { @@ -11556,7 +11581,7 @@ static const extended::ZoneEra kZoneEraAustralia_Lindeman[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Lindeman[] ACE_TIME_PROGMEM = "Australia/Lindeman"; +static const char kZoneNameAustralia_Lindeman[] ACE_TIME_PROGMEM = "\x07" "Lindeman"; const extended::ZoneInfo kZoneAustralia_Lindeman ACE_TIME_PROGMEM = { kZoneNameAustralia_Lindeman /*name*/, @@ -11569,9 +11594,9 @@ const extended::ZoneInfo kZoneAustralia_Lindeman ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Lord_Howe // Zone Eras: 1 -// Strings (bytes): 30 -// Memory (8-bit): 52 -// Memory (32-bit): 66 +// Strings (bytes): 21 (originally 30) +// Memory (8-bit): 43 +// Memory (32-bit): 57 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAustralia_Lord_Howe[] ACE_TIME_PROGMEM = { @@ -11590,7 +11615,7 @@ static const extended::ZoneEra kZoneEraAustralia_Lord_Howe[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAustralia_Lord_Howe[] ACE_TIME_PROGMEM = "Australia/Lord_Howe"; +static const char kZoneNameAustralia_Lord_Howe[] ACE_TIME_PROGMEM = "\x07" "Lord_Howe"; const extended::ZoneInfo kZoneAustralia_Lord_Howe ACE_TIME_PROGMEM = { kZoneNameAustralia_Lord_Howe /*name*/, @@ -11603,9 +11628,9 @@ const extended::ZoneInfo kZoneAustralia_Lord_Howe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Melbourne // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 16 (originally 25) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAustralia_Melbourne[] ACE_TIME_PROGMEM = { @@ -11624,7 +11649,7 @@ static const extended::ZoneEra kZoneEraAustralia_Melbourne[] ACE_TIME_PROGMEM = }; -static const char kZoneNameAustralia_Melbourne[] ACE_TIME_PROGMEM = "Australia/Melbourne"; +static const char kZoneNameAustralia_Melbourne[] ACE_TIME_PROGMEM = "\x07" "Melbourne"; const extended::ZoneInfo kZoneAustralia_Melbourne ACE_TIME_PROGMEM = { kZoneNameAustralia_Melbourne /*name*/, @@ -11637,9 +11662,9 @@ const extended::ZoneInfo kZoneAustralia_Melbourne ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Perth // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 12 (originally 21) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAustralia_Perth[] ACE_TIME_PROGMEM = { @@ -11658,7 +11683,7 @@ static const extended::ZoneEra kZoneEraAustralia_Perth[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Perth[] ACE_TIME_PROGMEM = "Australia/Perth"; +static const char kZoneNameAustralia_Perth[] ACE_TIME_PROGMEM = "\x07" "Perth"; const extended::ZoneInfo kZoneAustralia_Perth ACE_TIME_PROGMEM = { kZoneNameAustralia_Perth /*name*/, @@ -11671,9 +11696,9 @@ const extended::ZoneInfo kZoneAustralia_Perth ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Australia/Sydney // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 13 (originally 22) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAustralia_Sydney[] ACE_TIME_PROGMEM = { @@ -11692,7 +11717,7 @@ static const extended::ZoneEra kZoneEraAustralia_Sydney[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameAustralia_Sydney[] ACE_TIME_PROGMEM = "Australia/Sydney"; +static const char kZoneNameAustralia_Sydney[] ACE_TIME_PROGMEM = "\x07" "Sydney"; const extended::ZoneInfo kZoneAustralia_Sydney ACE_TIME_PROGMEM = { kZoneNameAustralia_Sydney /*name*/, @@ -11705,7 +11730,7 @@ const extended::ZoneInfo kZoneAustralia_Sydney ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: CET // Zone Eras: 1 -// Strings (bytes): 9 +// Strings (bytes): 9 (originally 9) // Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- @@ -11739,7 +11764,7 @@ const extended::ZoneInfo kZoneCET ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: CST6CDT // Zone Eras: 1 -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -11773,7 +11798,7 @@ const extended::ZoneInfo kZoneCST6CDT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: EET // Zone Eras: 1 -// Strings (bytes): 9 +// Strings (bytes): 9 (originally 9) // Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- @@ -11807,7 +11832,7 @@ const extended::ZoneInfo kZoneEET ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: EST // Zone Eras: 1 -// Strings (bytes): 8 +// Strings (bytes): 8 (originally 8) // Memory (8-bit): 30 // Memory (32-bit): 44 //--------------------------------------------------------------------------- @@ -11841,7 +11866,7 @@ const extended::ZoneInfo kZoneEST ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: EST5EDT // Zone Eras: 1 -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -11875,9 +11900,9 @@ const extended::ZoneInfo kZoneEST5EDT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT // Zone Eras: 1 -// Strings (bytes): 12 -// Memory (8-bit): 34 -// Memory (32-bit): 48 +// Strings (bytes): 9 (originally 12) +// Memory (8-bit): 31 +// Memory (32-bit): 45 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT[] ACE_TIME_PROGMEM = { @@ -11896,7 +11921,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT[] ACE_TIME_PROGMEM = "Etc/GMT"; +static const char kZoneNameEtc_GMT[] ACE_TIME_PROGMEM = "\x0a" "GMT"; const extended::ZoneInfo kZoneEtc_GMT ACE_TIME_PROGMEM = { kZoneNameEtc_GMT /*name*/, @@ -11909,9 +11934,9 @@ const extended::ZoneInfo kZoneEtc_GMT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+1 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_1[] ACE_TIME_PROGMEM = { @@ -11930,7 +11955,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_1[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_1[] ACE_TIME_PROGMEM = "Etc/GMT+1"; +static const char kZoneNameEtc_GMT_PLUS_1[] ACE_TIME_PROGMEM = "\x0a" "GMT+1"; const extended::ZoneInfo kZoneEtc_GMT_PLUS_1 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_1 /*name*/, @@ -11943,9 +11968,9 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_1 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+10 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_10[] ACE_TIME_PROGMEM = { @@ -11964,7 +11989,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_10[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_10[] ACE_TIME_PROGMEM = "Etc/GMT+10"; +static const char kZoneNameEtc_GMT_PLUS_10[] ACE_TIME_PROGMEM = "\x0a" "GMT+10"; const extended::ZoneInfo kZoneEtc_GMT_PLUS_10 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_10 /*name*/, @@ -11977,9 +12002,9 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_10 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+11 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_11[] ACE_TIME_PROGMEM = { @@ -11998,7 +12023,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_11[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_11[] ACE_TIME_PROGMEM = "Etc/GMT+11"; +static const char kZoneNameEtc_GMT_PLUS_11[] ACE_TIME_PROGMEM = "\x0a" "GMT+11"; const extended::ZoneInfo kZoneEtc_GMT_PLUS_11 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_11 /*name*/, @@ -12011,9 +12036,9 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_11 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+12 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_12[] ACE_TIME_PROGMEM = { @@ -12032,7 +12057,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_12[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_12[] ACE_TIME_PROGMEM = "Etc/GMT+12"; +static const char kZoneNameEtc_GMT_PLUS_12[] ACE_TIME_PROGMEM = "\x0a" "GMT+12"; const extended::ZoneInfo kZoneEtc_GMT_PLUS_12 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_12 /*name*/, @@ -12045,9 +12070,9 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_12 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+2 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_2[] ACE_TIME_PROGMEM = { @@ -12066,7 +12091,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_2[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_2[] ACE_TIME_PROGMEM = "Etc/GMT+2"; +static const char kZoneNameEtc_GMT_PLUS_2[] ACE_TIME_PROGMEM = "\x0a" "GMT+2"; const extended::ZoneInfo kZoneEtc_GMT_PLUS_2 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_2 /*name*/, @@ -12079,9 +12104,9 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_2 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+3 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_3[] ACE_TIME_PROGMEM = { @@ -12100,7 +12125,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_3[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_3[] ACE_TIME_PROGMEM = "Etc/GMT+3"; +static const char kZoneNameEtc_GMT_PLUS_3[] ACE_TIME_PROGMEM = "\x0a" "GMT+3"; const extended::ZoneInfo kZoneEtc_GMT_PLUS_3 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_3 /*name*/, @@ -12113,9 +12138,9 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_3 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+4 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_4[] ACE_TIME_PROGMEM = { @@ -12134,7 +12159,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_4[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_4[] ACE_TIME_PROGMEM = "Etc/GMT+4"; +static const char kZoneNameEtc_GMT_PLUS_4[] ACE_TIME_PROGMEM = "\x0a" "GMT+4"; const extended::ZoneInfo kZoneEtc_GMT_PLUS_4 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_4 /*name*/, @@ -12147,9 +12172,9 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_4 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+5 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_5[] ACE_TIME_PROGMEM = { @@ -12168,7 +12193,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_5[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_5[] ACE_TIME_PROGMEM = "Etc/GMT+5"; +static const char kZoneNameEtc_GMT_PLUS_5[] ACE_TIME_PROGMEM = "\x0a" "GMT+5"; const extended::ZoneInfo kZoneEtc_GMT_PLUS_5 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_5 /*name*/, @@ -12181,9 +12206,9 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_5 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+6 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_6[] ACE_TIME_PROGMEM = { @@ -12202,7 +12227,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_6[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_6[] ACE_TIME_PROGMEM = "Etc/GMT+6"; +static const char kZoneNameEtc_GMT_PLUS_6[] ACE_TIME_PROGMEM = "\x0a" "GMT+6"; const extended::ZoneInfo kZoneEtc_GMT_PLUS_6 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_6 /*name*/, @@ -12215,9 +12240,9 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_6 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+7 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_7[] ACE_TIME_PROGMEM = { @@ -12236,7 +12261,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_7[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_7[] ACE_TIME_PROGMEM = "Etc/GMT+7"; +static const char kZoneNameEtc_GMT_PLUS_7[] ACE_TIME_PROGMEM = "\x0a" "GMT+7"; const extended::ZoneInfo kZoneEtc_GMT_PLUS_7 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_7 /*name*/, @@ -12249,9 +12274,9 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_7 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+8 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_8[] ACE_TIME_PROGMEM = { @@ -12270,7 +12295,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_8[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_8[] ACE_TIME_PROGMEM = "Etc/GMT+8"; +static const char kZoneNameEtc_GMT_PLUS_8[] ACE_TIME_PROGMEM = "\x0a" "GMT+8"; const extended::ZoneInfo kZoneEtc_GMT_PLUS_8 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_8 /*name*/, @@ -12283,9 +12308,9 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_8 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT+9 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_9[] ACE_TIME_PROGMEM = { @@ -12304,7 +12329,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_9[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_PLUS_9[] ACE_TIME_PROGMEM = "Etc/GMT+9"; +static const char kZoneNameEtc_GMT_PLUS_9[] ACE_TIME_PROGMEM = "\x0a" "GMT+9"; const extended::ZoneInfo kZoneEtc_GMT_PLUS_9 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_9 /*name*/, @@ -12317,9 +12342,9 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_9 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-1 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_1[] ACE_TIME_PROGMEM = { @@ -12338,7 +12363,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_1[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_1[] ACE_TIME_PROGMEM = "Etc/GMT-1"; +static const char kZoneNameEtc_GMT_1[] ACE_TIME_PROGMEM = "\x0a" "GMT-1"; const extended::ZoneInfo kZoneEtc_GMT_1 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_1 /*name*/, @@ -12351,9 +12376,9 @@ const extended::ZoneInfo kZoneEtc_GMT_1 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-10 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_10[] ACE_TIME_PROGMEM = { @@ -12372,7 +12397,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_10[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_10[] ACE_TIME_PROGMEM = "Etc/GMT-10"; +static const char kZoneNameEtc_GMT_10[] ACE_TIME_PROGMEM = "\x0a" "GMT-10"; const extended::ZoneInfo kZoneEtc_GMT_10 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_10 /*name*/, @@ -12385,9 +12410,9 @@ const extended::ZoneInfo kZoneEtc_GMT_10 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-11 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_11[] ACE_TIME_PROGMEM = { @@ -12406,7 +12431,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_11[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_11[] ACE_TIME_PROGMEM = "Etc/GMT-11"; +static const char kZoneNameEtc_GMT_11[] ACE_TIME_PROGMEM = "\x0a" "GMT-11"; const extended::ZoneInfo kZoneEtc_GMT_11 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_11 /*name*/, @@ -12419,9 +12444,9 @@ const extended::ZoneInfo kZoneEtc_GMT_11 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-12 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_12[] ACE_TIME_PROGMEM = { @@ -12440,7 +12465,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_12[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_12[] ACE_TIME_PROGMEM = "Etc/GMT-12"; +static const char kZoneNameEtc_GMT_12[] ACE_TIME_PROGMEM = "\x0a" "GMT-12"; const extended::ZoneInfo kZoneEtc_GMT_12 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_12 /*name*/, @@ -12453,9 +12478,9 @@ const extended::ZoneInfo kZoneEtc_GMT_12 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-13 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_13[] ACE_TIME_PROGMEM = { @@ -12474,7 +12499,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_13[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_13[] ACE_TIME_PROGMEM = "Etc/GMT-13"; +static const char kZoneNameEtc_GMT_13[] ACE_TIME_PROGMEM = "\x0a" "GMT-13"; const extended::ZoneInfo kZoneEtc_GMT_13 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_13 /*name*/, @@ -12487,9 +12512,9 @@ const extended::ZoneInfo kZoneEtc_GMT_13 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-14 // Zone Eras: 1 -// Strings (bytes): 15 -// Memory (8-bit): 37 -// Memory (32-bit): 51 +// Strings (bytes): 12 (originally 15) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_14[] ACE_TIME_PROGMEM = { @@ -12508,7 +12533,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_14[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_14[] ACE_TIME_PROGMEM = "Etc/GMT-14"; +static const char kZoneNameEtc_GMT_14[] ACE_TIME_PROGMEM = "\x0a" "GMT-14"; const extended::ZoneInfo kZoneEtc_GMT_14 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_14 /*name*/, @@ -12521,9 +12546,9 @@ const extended::ZoneInfo kZoneEtc_GMT_14 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-2 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_2[] ACE_TIME_PROGMEM = { @@ -12542,7 +12567,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_2[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_2[] ACE_TIME_PROGMEM = "Etc/GMT-2"; +static const char kZoneNameEtc_GMT_2[] ACE_TIME_PROGMEM = "\x0a" "GMT-2"; const extended::ZoneInfo kZoneEtc_GMT_2 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_2 /*name*/, @@ -12555,9 +12580,9 @@ const extended::ZoneInfo kZoneEtc_GMT_2 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-3 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_3[] ACE_TIME_PROGMEM = { @@ -12576,7 +12601,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_3[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_3[] ACE_TIME_PROGMEM = "Etc/GMT-3"; +static const char kZoneNameEtc_GMT_3[] ACE_TIME_PROGMEM = "\x0a" "GMT-3"; const extended::ZoneInfo kZoneEtc_GMT_3 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_3 /*name*/, @@ -12589,9 +12614,9 @@ const extended::ZoneInfo kZoneEtc_GMT_3 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-4 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_4[] ACE_TIME_PROGMEM = { @@ -12610,7 +12635,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_4[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_4[] ACE_TIME_PROGMEM = "Etc/GMT-4"; +static const char kZoneNameEtc_GMT_4[] ACE_TIME_PROGMEM = "\x0a" "GMT-4"; const extended::ZoneInfo kZoneEtc_GMT_4 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_4 /*name*/, @@ -12623,9 +12648,9 @@ const extended::ZoneInfo kZoneEtc_GMT_4 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-5 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_5[] ACE_TIME_PROGMEM = { @@ -12644,7 +12669,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_5[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_5[] ACE_TIME_PROGMEM = "Etc/GMT-5"; +static const char kZoneNameEtc_GMT_5[] ACE_TIME_PROGMEM = "\x0a" "GMT-5"; const extended::ZoneInfo kZoneEtc_GMT_5 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_5 /*name*/, @@ -12657,9 +12682,9 @@ const extended::ZoneInfo kZoneEtc_GMT_5 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-6 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_6[] ACE_TIME_PROGMEM = { @@ -12678,7 +12703,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_6[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_6[] ACE_TIME_PROGMEM = "Etc/GMT-6"; +static const char kZoneNameEtc_GMT_6[] ACE_TIME_PROGMEM = "\x0a" "GMT-6"; const extended::ZoneInfo kZoneEtc_GMT_6 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_6 /*name*/, @@ -12691,9 +12716,9 @@ const extended::ZoneInfo kZoneEtc_GMT_6 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-7 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_7[] ACE_TIME_PROGMEM = { @@ -12712,7 +12737,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_7[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_7[] ACE_TIME_PROGMEM = "Etc/GMT-7"; +static const char kZoneNameEtc_GMT_7[] ACE_TIME_PROGMEM = "\x0a" "GMT-7"; const extended::ZoneInfo kZoneEtc_GMT_7 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_7 /*name*/, @@ -12725,9 +12750,9 @@ const extended::ZoneInfo kZoneEtc_GMT_7 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-8 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_8[] ACE_TIME_PROGMEM = { @@ -12746,7 +12771,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_8[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_8[] ACE_TIME_PROGMEM = "Etc/GMT-8"; +static const char kZoneNameEtc_GMT_8[] ACE_TIME_PROGMEM = "\x0a" "GMT-8"; const extended::ZoneInfo kZoneEtc_GMT_8 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_8 /*name*/, @@ -12759,9 +12784,9 @@ const extended::ZoneInfo kZoneEtc_GMT_8 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/GMT-9 // Zone Eras: 1 -// Strings (bytes): 14 -// Memory (8-bit): 36 -// Memory (32-bit): 50 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_GMT_9[] ACE_TIME_PROGMEM = { @@ -12780,7 +12805,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_9[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_GMT_9[] ACE_TIME_PROGMEM = "Etc/GMT-9"; +static const char kZoneNameEtc_GMT_9[] ACE_TIME_PROGMEM = "\x0a" "GMT-9"; const extended::ZoneInfo kZoneEtc_GMT_9 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_9 /*name*/, @@ -12793,9 +12818,9 @@ const extended::ZoneInfo kZoneEtc_GMT_9 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Etc/UTC // Zone Eras: 1 -// Strings (bytes): 12 -// Memory (8-bit): 34 -// Memory (32-bit): 48 +// Strings (bytes): 9 (originally 12) +// Memory (8-bit): 31 +// Memory (32-bit): 45 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEtc_UTC[] ACE_TIME_PROGMEM = { @@ -12814,7 +12839,7 @@ static const extended::ZoneEra kZoneEraEtc_UTC[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEtc_UTC[] ACE_TIME_PROGMEM = "Etc/UTC"; +static const char kZoneNameEtc_UTC[] ACE_TIME_PROGMEM = "\x0a" "UTC"; const extended::ZoneInfo kZoneEtc_UTC ACE_TIME_PROGMEM = { kZoneNameEtc_UTC /*name*/, @@ -12827,9 +12852,9 @@ const extended::ZoneInfo kZoneEtc_UTC ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Amsterdam // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 16 (originally 22) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Amsterdam[] ACE_TIME_PROGMEM = { @@ -12848,7 +12873,7 @@ static const extended::ZoneEra kZoneEraEurope_Amsterdam[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Amsterdam[] ACE_TIME_PROGMEM = "Europe/Amsterdam"; +static const char kZoneNameEurope_Amsterdam[] ACE_TIME_PROGMEM = "\x0b" "Amsterdam"; const extended::ZoneInfo kZoneEurope_Amsterdam ACE_TIME_PROGMEM = { kZoneNameEurope_Amsterdam /*name*/, @@ -12861,9 +12886,9 @@ const extended::ZoneInfo kZoneEurope_Amsterdam ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Andorra // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 14 (originally 20) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Andorra[] ACE_TIME_PROGMEM = { @@ -12882,7 +12907,7 @@ static const extended::ZoneEra kZoneEraEurope_Andorra[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Andorra[] ACE_TIME_PROGMEM = "Europe/Andorra"; +static const char kZoneNameEurope_Andorra[] ACE_TIME_PROGMEM = "\x0b" "Andorra"; const extended::ZoneInfo kZoneEurope_Andorra ACE_TIME_PROGMEM = { kZoneNameEurope_Andorra /*name*/, @@ -12895,9 +12920,9 @@ const extended::ZoneInfo kZoneEurope_Andorra ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Astrakhan // Zone Eras: 4 -// Strings (bytes): 37 -// Memory (8-bit): 92 -// Memory (32-bit): 121 +// Strings (bytes): 31 (originally 37) +// Memory (8-bit): 86 +// Memory (32-bit): 115 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Astrakhan[] ACE_TIME_PROGMEM = { @@ -12952,7 +12977,7 @@ static const extended::ZoneEra kZoneEraEurope_Astrakhan[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Astrakhan[] ACE_TIME_PROGMEM = "Europe/Astrakhan"; +static const char kZoneNameEurope_Astrakhan[] ACE_TIME_PROGMEM = "\x0b" "Astrakhan"; const extended::ZoneInfo kZoneEurope_Astrakhan ACE_TIME_PROGMEM = { kZoneNameEurope_Astrakhan /*name*/, @@ -12965,9 +12990,9 @@ const extended::ZoneInfo kZoneEurope_Astrakhan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Athens // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Athens[] ACE_TIME_PROGMEM = { @@ -12986,7 +13011,7 @@ static const extended::ZoneEra kZoneEraEurope_Athens[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Athens[] ACE_TIME_PROGMEM = "Europe/Athens"; +static const char kZoneNameEurope_Athens[] ACE_TIME_PROGMEM = "\x0b" "Athens"; const extended::ZoneInfo kZoneEurope_Athens ACE_TIME_PROGMEM = { kZoneNameEurope_Athens /*name*/, @@ -12999,9 +13024,9 @@ const extended::ZoneInfo kZoneEurope_Athens ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Belgrade // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Belgrade[] ACE_TIME_PROGMEM = { @@ -13020,7 +13045,7 @@ static const extended::ZoneEra kZoneEraEurope_Belgrade[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Belgrade[] ACE_TIME_PROGMEM = "Europe/Belgrade"; +static const char kZoneNameEurope_Belgrade[] ACE_TIME_PROGMEM = "\x0b" "Belgrade"; const extended::ZoneInfo kZoneEurope_Belgrade ACE_TIME_PROGMEM = { kZoneNameEurope_Belgrade /*name*/, @@ -13033,9 +13058,9 @@ const extended::ZoneInfo kZoneEurope_Belgrade ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Berlin // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Berlin[] ACE_TIME_PROGMEM = { @@ -13054,7 +13079,7 @@ static const extended::ZoneEra kZoneEraEurope_Berlin[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Berlin[] ACE_TIME_PROGMEM = "Europe/Berlin"; +static const char kZoneNameEurope_Berlin[] ACE_TIME_PROGMEM = "\x0b" "Berlin"; const extended::ZoneInfo kZoneEurope_Berlin ACE_TIME_PROGMEM = { kZoneNameEurope_Berlin /*name*/, @@ -13067,9 +13092,9 @@ const extended::ZoneInfo kZoneEurope_Berlin ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Brussels // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Brussels[] ACE_TIME_PROGMEM = { @@ -13088,7 +13113,7 @@ static const extended::ZoneEra kZoneEraEurope_Brussels[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Brussels[] ACE_TIME_PROGMEM = "Europe/Brussels"; +static const char kZoneNameEurope_Brussels[] ACE_TIME_PROGMEM = "\x0b" "Brussels"; const extended::ZoneInfo kZoneEurope_Brussels ACE_TIME_PROGMEM = { kZoneNameEurope_Brussels /*name*/, @@ -13101,9 +13126,9 @@ const extended::ZoneInfo kZoneEurope_Brussels ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Bucharest // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 16 (originally 22) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Bucharest[] ACE_TIME_PROGMEM = { @@ -13122,7 +13147,7 @@ static const extended::ZoneEra kZoneEraEurope_Bucharest[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Bucharest[] ACE_TIME_PROGMEM = "Europe/Bucharest"; +static const char kZoneNameEurope_Bucharest[] ACE_TIME_PROGMEM = "\x0b" "Bucharest"; const extended::ZoneInfo kZoneEurope_Bucharest ACE_TIME_PROGMEM = { kZoneNameEurope_Bucharest /*name*/, @@ -13135,9 +13160,9 @@ const extended::ZoneInfo kZoneEurope_Bucharest ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Budapest // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Budapest[] ACE_TIME_PROGMEM = { @@ -13156,7 +13181,7 @@ static const extended::ZoneEra kZoneEraEurope_Budapest[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Budapest[] ACE_TIME_PROGMEM = "Europe/Budapest"; +static const char kZoneNameEurope_Budapest[] ACE_TIME_PROGMEM = "\x0b" "Budapest"; const extended::ZoneInfo kZoneEurope_Budapest ACE_TIME_PROGMEM = { kZoneNameEurope_Budapest /*name*/, @@ -13169,9 +13194,9 @@ const extended::ZoneInfo kZoneEurope_Budapest ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Chisinau // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Chisinau[] ACE_TIME_PROGMEM = { @@ -13190,7 +13215,7 @@ static const extended::ZoneEra kZoneEraEurope_Chisinau[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Chisinau[] ACE_TIME_PROGMEM = "Europe/Chisinau"; +static const char kZoneNameEurope_Chisinau[] ACE_TIME_PROGMEM = "\x0b" "Chisinau"; const extended::ZoneInfo kZoneEurope_Chisinau ACE_TIME_PROGMEM = { kZoneNameEurope_Chisinau /*name*/, @@ -13203,9 +13228,9 @@ const extended::ZoneInfo kZoneEurope_Chisinau ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Copenhagen // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 17 (originally 23) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Copenhagen[] ACE_TIME_PROGMEM = { @@ -13224,7 +13249,7 @@ static const extended::ZoneEra kZoneEraEurope_Copenhagen[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Copenhagen[] ACE_TIME_PROGMEM = "Europe/Copenhagen"; +static const char kZoneNameEurope_Copenhagen[] ACE_TIME_PROGMEM = "\x0b" "Copenhagen"; const extended::ZoneInfo kZoneEurope_Copenhagen ACE_TIME_PROGMEM = { kZoneNameEurope_Copenhagen /*name*/, @@ -13237,9 +13262,9 @@ const extended::ZoneInfo kZoneEurope_Copenhagen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Dublin // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 16 (originally 22) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Dublin[] ACE_TIME_PROGMEM = { @@ -13258,7 +13283,7 @@ static const extended::ZoneEra kZoneEraEurope_Dublin[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Dublin[] ACE_TIME_PROGMEM = "Europe/Dublin"; +static const char kZoneNameEurope_Dublin[] ACE_TIME_PROGMEM = "\x0b" "Dublin"; const extended::ZoneInfo kZoneEurope_Dublin ACE_TIME_PROGMEM = { kZoneNameEurope_Dublin /*name*/, @@ -13271,9 +13296,9 @@ const extended::ZoneInfo kZoneEurope_Dublin ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Gibraltar // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 16 (originally 22) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Gibraltar[] ACE_TIME_PROGMEM = { @@ -13292,7 +13317,7 @@ static const extended::ZoneEra kZoneEraEurope_Gibraltar[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Gibraltar[] ACE_TIME_PROGMEM = "Europe/Gibraltar"; +static const char kZoneNameEurope_Gibraltar[] ACE_TIME_PROGMEM = "\x0b" "Gibraltar"; const extended::ZoneInfo kZoneEurope_Gibraltar ACE_TIME_PROGMEM = { kZoneNameEurope_Gibraltar /*name*/, @@ -13305,9 +13330,9 @@ const extended::ZoneInfo kZoneEurope_Gibraltar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Helsinki // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Helsinki[] ACE_TIME_PROGMEM = { @@ -13326,7 +13351,7 @@ static const extended::ZoneEra kZoneEraEurope_Helsinki[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Helsinki[] ACE_TIME_PROGMEM = "Europe/Helsinki"; +static const char kZoneNameEurope_Helsinki[] ACE_TIME_PROGMEM = "\x0b" "Helsinki"; const extended::ZoneInfo kZoneEurope_Helsinki ACE_TIME_PROGMEM = { kZoneNameEurope_Helsinki /*name*/, @@ -13339,9 +13364,9 @@ const extended::ZoneInfo kZoneEurope_Helsinki ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Istanbul // Zone Eras: 9 -// Strings (bytes): 58 -// Memory (8-bit): 168 -// Memory (32-bit): 222 +// Strings (bytes): 52 (originally 58) +// Memory (8-bit): 162 +// Memory (32-bit): 216 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Istanbul[] ACE_TIME_PROGMEM = { @@ -13456,7 +13481,7 @@ static const extended::ZoneEra kZoneEraEurope_Istanbul[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Istanbul[] ACE_TIME_PROGMEM = "Europe/Istanbul"; +static const char kZoneNameEurope_Istanbul[] ACE_TIME_PROGMEM = "\x0b" "Istanbul"; const extended::ZoneInfo kZoneEurope_Istanbul ACE_TIME_PROGMEM = { kZoneNameEurope_Istanbul /*name*/, @@ -13469,9 +13494,9 @@ const extended::ZoneInfo kZoneEurope_Istanbul ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Kaliningrad // Zone Eras: 3 -// Strings (bytes): 32 -// Memory (8-bit): 76 -// Memory (32-bit): 100 +// Strings (bytes): 26 (originally 32) +// Memory (8-bit): 70 +// Memory (32-bit): 94 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Kaliningrad[] ACE_TIME_PROGMEM = { @@ -13514,7 +13539,7 @@ static const extended::ZoneEra kZoneEraEurope_Kaliningrad[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Kaliningrad[] ACE_TIME_PROGMEM = "Europe/Kaliningrad"; +static const char kZoneNameEurope_Kaliningrad[] ACE_TIME_PROGMEM = "\x0b" "Kaliningrad"; const extended::ZoneInfo kZoneEurope_Kaliningrad ACE_TIME_PROGMEM = { kZoneNameEurope_Kaliningrad /*name*/, @@ -13527,9 +13552,9 @@ const extended::ZoneInfo kZoneEurope_Kaliningrad ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Kiev // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Kiev[] ACE_TIME_PROGMEM = { @@ -13548,7 +13573,7 @@ static const extended::ZoneEra kZoneEraEurope_Kiev[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Kiev[] ACE_TIME_PROGMEM = "Europe/Kiev"; +static const char kZoneNameEurope_Kiev[] ACE_TIME_PROGMEM = "\x0b" "Kiev"; const extended::ZoneInfo kZoneEurope_Kiev ACE_TIME_PROGMEM = { kZoneNameEurope_Kiev /*name*/, @@ -13561,9 +13586,9 @@ const extended::ZoneInfo kZoneEurope_Kiev ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Kirov // Zone Eras: 3 -// Strings (bytes): 29 -// Memory (8-bit): 73 -// Memory (32-bit): 97 +// Strings (bytes): 23 (originally 29) +// Memory (8-bit): 67 +// Memory (32-bit): 91 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Kirov[] ACE_TIME_PROGMEM = { @@ -13606,7 +13631,7 @@ static const extended::ZoneEra kZoneEraEurope_Kirov[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Kirov[] ACE_TIME_PROGMEM = "Europe/Kirov"; +static const char kZoneNameEurope_Kirov[] ACE_TIME_PROGMEM = "\x0b" "Kirov"; const extended::ZoneInfo kZoneEurope_Kirov ACE_TIME_PROGMEM = { kZoneNameEurope_Kirov /*name*/, @@ -13619,9 +13644,9 @@ const extended::ZoneInfo kZoneEurope_Kirov ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Lisbon // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Lisbon[] ACE_TIME_PROGMEM = { @@ -13640,7 +13665,7 @@ static const extended::ZoneEra kZoneEraEurope_Lisbon[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Lisbon[] ACE_TIME_PROGMEM = "Europe/Lisbon"; +static const char kZoneNameEurope_Lisbon[] ACE_TIME_PROGMEM = "\x0b" "Lisbon"; const extended::ZoneInfo kZoneEurope_Lisbon ACE_TIME_PROGMEM = { kZoneNameEurope_Lisbon /*name*/, @@ -13653,9 +13678,9 @@ const extended::ZoneInfo kZoneEurope_Lisbon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/London // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 16 (originally 22) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_London[] ACE_TIME_PROGMEM = { @@ -13674,7 +13699,7 @@ static const extended::ZoneEra kZoneEraEurope_London[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_London[] ACE_TIME_PROGMEM = "Europe/London"; +static const char kZoneNameEurope_London[] ACE_TIME_PROGMEM = "\x0b" "London"; const extended::ZoneInfo kZoneEurope_London ACE_TIME_PROGMEM = { kZoneNameEurope_London /*name*/, @@ -13687,9 +13712,9 @@ const extended::ZoneInfo kZoneEurope_London ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Luxembourg // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 17 (originally 23) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Luxembourg[] ACE_TIME_PROGMEM = { @@ -13708,7 +13733,7 @@ static const extended::ZoneEra kZoneEraEurope_Luxembourg[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Luxembourg[] ACE_TIME_PROGMEM = "Europe/Luxembourg"; +static const char kZoneNameEurope_Luxembourg[] ACE_TIME_PROGMEM = "\x0b" "Luxembourg"; const extended::ZoneInfo kZoneEurope_Luxembourg ACE_TIME_PROGMEM = { kZoneNameEurope_Luxembourg /*name*/, @@ -13721,9 +13746,9 @@ const extended::ZoneInfo kZoneEurope_Luxembourg ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Madrid // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Madrid[] ACE_TIME_PROGMEM = { @@ -13742,7 +13767,7 @@ static const extended::ZoneEra kZoneEraEurope_Madrid[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Madrid[] ACE_TIME_PROGMEM = "Europe/Madrid"; +static const char kZoneNameEurope_Madrid[] ACE_TIME_PROGMEM = "\x0b" "Madrid"; const extended::ZoneInfo kZoneEurope_Madrid ACE_TIME_PROGMEM = { kZoneNameEurope_Madrid /*name*/, @@ -13755,9 +13780,9 @@ const extended::ZoneInfo kZoneEurope_Madrid ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Malta // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Malta[] ACE_TIME_PROGMEM = { @@ -13776,7 +13801,7 @@ static const extended::ZoneEra kZoneEraEurope_Malta[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Malta[] ACE_TIME_PROGMEM = "Europe/Malta"; +static const char kZoneNameEurope_Malta[] ACE_TIME_PROGMEM = "\x0b" "Malta"; const extended::ZoneInfo kZoneEurope_Malta ACE_TIME_PROGMEM = { kZoneNameEurope_Malta /*name*/, @@ -13789,9 +13814,9 @@ const extended::ZoneInfo kZoneEurope_Malta ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Minsk // Zone Eras: 2 -// Strings (bytes): 22 -// Memory (8-bit): 55 -// Memory (32-bit): 74 +// Strings (bytes): 16 (originally 22) +// Memory (8-bit): 49 +// Memory (32-bit): 68 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Minsk[] ACE_TIME_PROGMEM = { @@ -13822,7 +13847,7 @@ static const extended::ZoneEra kZoneEraEurope_Minsk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Minsk[] ACE_TIME_PROGMEM = "Europe/Minsk"; +static const char kZoneNameEurope_Minsk[] ACE_TIME_PROGMEM = "\x0b" "Minsk"; const extended::ZoneInfo kZoneEurope_Minsk ACE_TIME_PROGMEM = { kZoneNameEurope_Minsk /*name*/, @@ -13835,9 +13860,9 @@ const extended::ZoneInfo kZoneEurope_Minsk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Monaco // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Monaco[] ACE_TIME_PROGMEM = { @@ -13856,7 +13881,7 @@ static const extended::ZoneEra kZoneEraEurope_Monaco[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Monaco[] ACE_TIME_PROGMEM = "Europe/Monaco"; +static const char kZoneNameEurope_Monaco[] ACE_TIME_PROGMEM = "\x0b" "Monaco"; const extended::ZoneInfo kZoneEurope_Monaco ACE_TIME_PROGMEM = { kZoneNameEurope_Monaco /*name*/, @@ -13869,9 +13894,9 @@ const extended::ZoneInfo kZoneEurope_Monaco ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Moscow // Zone Eras: 3 -// Strings (bytes): 30 -// Memory (8-bit): 74 -// Memory (32-bit): 98 +// Strings (bytes): 24 (originally 30) +// Memory (8-bit): 68 +// Memory (32-bit): 92 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Moscow[] ACE_TIME_PROGMEM = { @@ -13914,7 +13939,7 @@ static const extended::ZoneEra kZoneEraEurope_Moscow[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Moscow[] ACE_TIME_PROGMEM = "Europe/Moscow"; +static const char kZoneNameEurope_Moscow[] ACE_TIME_PROGMEM = "\x0b" "Moscow"; const extended::ZoneInfo kZoneEurope_Moscow ACE_TIME_PROGMEM = { kZoneNameEurope_Moscow /*name*/, @@ -13927,9 +13952,9 @@ const extended::ZoneInfo kZoneEurope_Moscow ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Oslo // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Oslo[] ACE_TIME_PROGMEM = { @@ -13948,7 +13973,7 @@ static const extended::ZoneEra kZoneEraEurope_Oslo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Oslo[] ACE_TIME_PROGMEM = "Europe/Oslo"; +static const char kZoneNameEurope_Oslo[] ACE_TIME_PROGMEM = "\x0b" "Oslo"; const extended::ZoneInfo kZoneEurope_Oslo ACE_TIME_PROGMEM = { kZoneNameEurope_Oslo /*name*/, @@ -13961,9 +13986,9 @@ const extended::ZoneInfo kZoneEurope_Oslo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Paris // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Paris[] ACE_TIME_PROGMEM = { @@ -13982,7 +14007,7 @@ static const extended::ZoneEra kZoneEraEurope_Paris[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Paris[] ACE_TIME_PROGMEM = "Europe/Paris"; +static const char kZoneNameEurope_Paris[] ACE_TIME_PROGMEM = "\x0b" "Paris"; const extended::ZoneInfo kZoneEurope_Paris ACE_TIME_PROGMEM = { kZoneNameEurope_Paris /*name*/, @@ -13995,9 +14020,9 @@ const extended::ZoneInfo kZoneEurope_Paris ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Prague // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Prague[] ACE_TIME_PROGMEM = { @@ -14016,7 +14041,7 @@ static const extended::ZoneEra kZoneEraEurope_Prague[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Prague[] ACE_TIME_PROGMEM = "Europe/Prague"; +static const char kZoneNameEurope_Prague[] ACE_TIME_PROGMEM = "\x0b" "Prague"; const extended::ZoneInfo kZoneEurope_Prague ACE_TIME_PROGMEM = { kZoneNameEurope_Prague /*name*/, @@ -14029,9 +14054,9 @@ const extended::ZoneInfo kZoneEurope_Prague ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Riga // Zone Eras: 3 -// Strings (bytes): 26 -// Memory (8-bit): 70 -// Memory (32-bit): 94 +// Strings (bytes): 20 (originally 26) +// Memory (8-bit): 64 +// Memory (32-bit): 88 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Riga[] ACE_TIME_PROGMEM = { @@ -14074,7 +14099,7 @@ static const extended::ZoneEra kZoneEraEurope_Riga[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Riga[] ACE_TIME_PROGMEM = "Europe/Riga"; +static const char kZoneNameEurope_Riga[] ACE_TIME_PROGMEM = "\x0b" "Riga"; const extended::ZoneInfo kZoneEurope_Riga ACE_TIME_PROGMEM = { kZoneNameEurope_Riga /*name*/, @@ -14087,9 +14112,9 @@ const extended::ZoneInfo kZoneEurope_Riga ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Rome // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Rome[] ACE_TIME_PROGMEM = { @@ -14108,7 +14133,7 @@ static const extended::ZoneEra kZoneEraEurope_Rome[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Rome[] ACE_TIME_PROGMEM = "Europe/Rome"; +static const char kZoneNameEurope_Rome[] ACE_TIME_PROGMEM = "\x0b" "Rome"; const extended::ZoneInfo kZoneEurope_Rome ACE_TIME_PROGMEM = { kZoneNameEurope_Rome /*name*/, @@ -14121,9 +14146,9 @@ const extended::ZoneInfo kZoneEurope_Rome ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Samara // Zone Eras: 3 -// Strings (bytes): 34 -// Memory (8-bit): 78 -// Memory (32-bit): 102 +// Strings (bytes): 28 (originally 34) +// Memory (8-bit): 72 +// Memory (32-bit): 96 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Samara[] ACE_TIME_PROGMEM = { @@ -14166,7 +14191,7 @@ static const extended::ZoneEra kZoneEraEurope_Samara[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Samara[] ACE_TIME_PROGMEM = "Europe/Samara"; +static const char kZoneNameEurope_Samara[] ACE_TIME_PROGMEM = "\x0b" "Samara"; const extended::ZoneInfo kZoneEurope_Samara ACE_TIME_PROGMEM = { kZoneNameEurope_Samara /*name*/, @@ -14179,9 +14204,9 @@ const extended::ZoneInfo kZoneEurope_Samara ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Saratov // Zone Eras: 4 -// Strings (bytes): 35 -// Memory (8-bit): 90 -// Memory (32-bit): 119 +// Strings (bytes): 29 (originally 35) +// Memory (8-bit): 84 +// Memory (32-bit): 113 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Saratov[] ACE_TIME_PROGMEM = { @@ -14236,7 +14261,7 @@ static const extended::ZoneEra kZoneEraEurope_Saratov[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Saratov[] ACE_TIME_PROGMEM = "Europe/Saratov"; +static const char kZoneNameEurope_Saratov[] ACE_TIME_PROGMEM = "\x0b" "Saratov"; const extended::ZoneInfo kZoneEurope_Saratov ACE_TIME_PROGMEM = { kZoneNameEurope_Saratov /*name*/, @@ -14249,9 +14274,9 @@ const extended::ZoneInfo kZoneEurope_Saratov ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Simferopol // Zone Eras: 3 -// Strings (bytes): 31 -// Memory (8-bit): 75 -// Memory (32-bit): 99 +// Strings (bytes): 25 (originally 31) +// Memory (8-bit): 69 +// Memory (32-bit): 93 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Simferopol[] ACE_TIME_PROGMEM = { @@ -14294,7 +14319,7 @@ static const extended::ZoneEra kZoneEraEurope_Simferopol[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Simferopol[] ACE_TIME_PROGMEM = "Europe/Simferopol"; +static const char kZoneNameEurope_Simferopol[] ACE_TIME_PROGMEM = "\x0b" "Simferopol"; const extended::ZoneInfo kZoneEurope_Simferopol ACE_TIME_PROGMEM = { kZoneNameEurope_Simferopol /*name*/, @@ -14307,9 +14332,9 @@ const extended::ZoneInfo kZoneEurope_Simferopol ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Sofia // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Sofia[] ACE_TIME_PROGMEM = { @@ -14328,7 +14353,7 @@ static const extended::ZoneEra kZoneEraEurope_Sofia[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Sofia[] ACE_TIME_PROGMEM = "Europe/Sofia"; +static const char kZoneNameEurope_Sofia[] ACE_TIME_PROGMEM = "\x0b" "Sofia"; const extended::ZoneInfo kZoneEurope_Sofia ACE_TIME_PROGMEM = { kZoneNameEurope_Sofia /*name*/, @@ -14341,9 +14366,9 @@ const extended::ZoneInfo kZoneEurope_Sofia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Stockholm // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 16 (originally 22) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Stockholm[] ACE_TIME_PROGMEM = { @@ -14362,7 +14387,7 @@ static const extended::ZoneEra kZoneEraEurope_Stockholm[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Stockholm[] ACE_TIME_PROGMEM = "Europe/Stockholm"; +static const char kZoneNameEurope_Stockholm[] ACE_TIME_PROGMEM = "\x0b" "Stockholm"; const extended::ZoneInfo kZoneEurope_Stockholm ACE_TIME_PROGMEM = { kZoneNameEurope_Stockholm /*name*/, @@ -14375,9 +14400,9 @@ const extended::ZoneInfo kZoneEurope_Stockholm ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Tallinn // Zone Eras: 3 -// Strings (bytes): 29 -// Memory (8-bit): 73 -// Memory (32-bit): 97 +// Strings (bytes): 23 (originally 29) +// Memory (8-bit): 67 +// Memory (32-bit): 91 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Tallinn[] ACE_TIME_PROGMEM = { @@ -14420,7 +14445,7 @@ static const extended::ZoneEra kZoneEraEurope_Tallinn[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Tallinn[] ACE_TIME_PROGMEM = "Europe/Tallinn"; +static const char kZoneNameEurope_Tallinn[] ACE_TIME_PROGMEM = "\x0b" "Tallinn"; const extended::ZoneInfo kZoneEurope_Tallinn ACE_TIME_PROGMEM = { kZoneNameEurope_Tallinn /*name*/, @@ -14433,9 +14458,9 @@ const extended::ZoneInfo kZoneEurope_Tallinn ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Tirane // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Tirane[] ACE_TIME_PROGMEM = { @@ -14454,7 +14479,7 @@ static const extended::ZoneEra kZoneEraEurope_Tirane[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Tirane[] ACE_TIME_PROGMEM = "Europe/Tirane"; +static const char kZoneNameEurope_Tirane[] ACE_TIME_PROGMEM = "\x0b" "Tirane"; const extended::ZoneInfo kZoneEurope_Tirane ACE_TIME_PROGMEM = { kZoneNameEurope_Tirane /*name*/, @@ -14467,9 +14492,9 @@ const extended::ZoneInfo kZoneEurope_Tirane ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Ulyanovsk // Zone Eras: 4 -// Strings (bytes): 37 -// Memory (8-bit): 92 -// Memory (32-bit): 121 +// Strings (bytes): 31 (originally 37) +// Memory (8-bit): 86 +// Memory (32-bit): 115 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Ulyanovsk[] ACE_TIME_PROGMEM = { @@ -14524,7 +14549,7 @@ static const extended::ZoneEra kZoneEraEurope_Ulyanovsk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Ulyanovsk[] ACE_TIME_PROGMEM = "Europe/Ulyanovsk"; +static const char kZoneNameEurope_Ulyanovsk[] ACE_TIME_PROGMEM = "\x0b" "Ulyanovsk"; const extended::ZoneInfo kZoneEurope_Ulyanovsk ACE_TIME_PROGMEM = { kZoneNameEurope_Ulyanovsk /*name*/, @@ -14537,9 +14562,9 @@ const extended::ZoneInfo kZoneEurope_Ulyanovsk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Uzhgorod // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Uzhgorod[] ACE_TIME_PROGMEM = { @@ -14558,7 +14583,7 @@ static const extended::ZoneEra kZoneEraEurope_Uzhgorod[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Uzhgorod[] ACE_TIME_PROGMEM = "Europe/Uzhgorod"; +static const char kZoneNameEurope_Uzhgorod[] ACE_TIME_PROGMEM = "\x0b" "Uzhgorod"; const extended::ZoneInfo kZoneEurope_Uzhgorod ACE_TIME_PROGMEM = { kZoneNameEurope_Uzhgorod /*name*/, @@ -14571,9 +14596,9 @@ const extended::ZoneInfo kZoneEurope_Uzhgorod ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Vienna // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Vienna[] ACE_TIME_PROGMEM = { @@ -14592,7 +14617,7 @@ static const extended::ZoneEra kZoneEraEurope_Vienna[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Vienna[] ACE_TIME_PROGMEM = "Europe/Vienna"; +static const char kZoneNameEurope_Vienna[] ACE_TIME_PROGMEM = "\x0b" "Vienna"; const extended::ZoneInfo kZoneEurope_Vienna ACE_TIME_PROGMEM = { kZoneNameEurope_Vienna /*name*/, @@ -14605,9 +14630,9 @@ const extended::ZoneInfo kZoneEurope_Vienna ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Vilnius // Zone Eras: 3 -// Strings (bytes): 29 -// Memory (8-bit): 73 -// Memory (32-bit): 97 +// Strings (bytes): 23 (originally 29) +// Memory (8-bit): 67 +// Memory (32-bit): 91 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Vilnius[] ACE_TIME_PROGMEM = { @@ -14650,7 +14675,7 @@ static const extended::ZoneEra kZoneEraEurope_Vilnius[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Vilnius[] ACE_TIME_PROGMEM = "Europe/Vilnius"; +static const char kZoneNameEurope_Vilnius[] ACE_TIME_PROGMEM = "\x0b" "Vilnius"; const extended::ZoneInfo kZoneEurope_Vilnius ACE_TIME_PROGMEM = { kZoneNameEurope_Vilnius /*name*/, @@ -14663,9 +14688,9 @@ const extended::ZoneInfo kZoneEurope_Vilnius ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Volgograd // Zone Eras: 5 -// Strings (bytes): 41 -// Memory (8-bit): 107 -// Memory (32-bit): 141 +// Strings (bytes): 35 (originally 41) +// Memory (8-bit): 101 +// Memory (32-bit): 135 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Volgograd[] ACE_TIME_PROGMEM = { @@ -14732,7 +14757,7 @@ static const extended::ZoneEra kZoneEraEurope_Volgograd[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Volgograd[] ACE_TIME_PROGMEM = "Europe/Volgograd"; +static const char kZoneNameEurope_Volgograd[] ACE_TIME_PROGMEM = "\x0b" "Volgograd"; const extended::ZoneInfo kZoneEurope_Volgograd ACE_TIME_PROGMEM = { kZoneNameEurope_Volgograd /*name*/, @@ -14745,9 +14770,9 @@ const extended::ZoneInfo kZoneEurope_Volgograd ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Warsaw // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Warsaw[] ACE_TIME_PROGMEM = { @@ -14766,7 +14791,7 @@ static const extended::ZoneEra kZoneEraEurope_Warsaw[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Warsaw[] ACE_TIME_PROGMEM = "Europe/Warsaw"; +static const char kZoneNameEurope_Warsaw[] ACE_TIME_PROGMEM = "\x0b" "Warsaw"; const extended::ZoneInfo kZoneEurope_Warsaw ACE_TIME_PROGMEM = { kZoneNameEurope_Warsaw /*name*/, @@ -14779,9 +14804,9 @@ const extended::ZoneInfo kZoneEurope_Warsaw ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Zaporozhye // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 17 (originally 23) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Zaporozhye[] ACE_TIME_PROGMEM = { @@ -14800,7 +14825,7 @@ static const extended::ZoneEra kZoneEraEurope_Zaporozhye[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Zaporozhye[] ACE_TIME_PROGMEM = "Europe/Zaporozhye"; +static const char kZoneNameEurope_Zaporozhye[] ACE_TIME_PROGMEM = "\x0b" "Zaporozhye"; const extended::ZoneInfo kZoneEurope_Zaporozhye ACE_TIME_PROGMEM = { kZoneNameEurope_Zaporozhye /*name*/, @@ -14813,9 +14838,9 @@ const extended::ZoneInfo kZoneEurope_Zaporozhye ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Europe/Zurich // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraEurope_Zurich[] ACE_TIME_PROGMEM = { @@ -14834,7 +14859,7 @@ static const extended::ZoneEra kZoneEraEurope_Zurich[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameEurope_Zurich[] ACE_TIME_PROGMEM = "Europe/Zurich"; +static const char kZoneNameEurope_Zurich[] ACE_TIME_PROGMEM = "\x0b" "Zurich"; const extended::ZoneInfo kZoneEurope_Zurich ACE_TIME_PROGMEM = { kZoneNameEurope_Zurich /*name*/, @@ -14847,7 +14872,7 @@ const extended::ZoneInfo kZoneEurope_Zurich ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: HST // Zone Eras: 1 -// Strings (bytes): 8 +// Strings (bytes): 8 (originally 8) // Memory (8-bit): 30 // Memory (32-bit): 44 //--------------------------------------------------------------------------- @@ -14881,9 +14906,9 @@ const extended::ZoneInfo kZoneHST ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Chagos // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraIndian_Chagos[] ACE_TIME_PROGMEM = { @@ -14902,7 +14927,7 @@ static const extended::ZoneEra kZoneEraIndian_Chagos[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Chagos[] ACE_TIME_PROGMEM = "Indian/Chagos"; +static const char kZoneNameIndian_Chagos[] ACE_TIME_PROGMEM = "\x0c" "Chagos"; const extended::ZoneInfo kZoneIndian_Chagos ACE_TIME_PROGMEM = { kZoneNameIndian_Chagos /*name*/, @@ -14915,9 +14940,9 @@ const extended::ZoneInfo kZoneIndian_Chagos ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Christmas // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraIndian_Christmas[] ACE_TIME_PROGMEM = { @@ -14936,7 +14961,7 @@ static const extended::ZoneEra kZoneEraIndian_Christmas[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Christmas[] ACE_TIME_PROGMEM = "Indian/Christmas"; +static const char kZoneNameIndian_Christmas[] ACE_TIME_PROGMEM = "\x0c" "Christmas"; const extended::ZoneInfo kZoneIndian_Christmas ACE_TIME_PROGMEM = { kZoneNameIndian_Christmas /*name*/, @@ -14949,9 +14974,9 @@ const extended::ZoneInfo kZoneIndian_Christmas ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Cocos // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraIndian_Cocos[] ACE_TIME_PROGMEM = { @@ -14970,7 +14995,7 @@ static const extended::ZoneEra kZoneEraIndian_Cocos[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Cocos[] ACE_TIME_PROGMEM = "Indian/Cocos"; +static const char kZoneNameIndian_Cocos[] ACE_TIME_PROGMEM = "\x0c" "Cocos"; const extended::ZoneInfo kZoneIndian_Cocos ACE_TIME_PROGMEM = { kZoneNameIndian_Cocos /*name*/, @@ -14983,9 +15008,9 @@ const extended::ZoneInfo kZoneIndian_Cocos ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Kerguelen // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraIndian_Kerguelen[] ACE_TIME_PROGMEM = { @@ -15004,7 +15029,7 @@ static const extended::ZoneEra kZoneEraIndian_Kerguelen[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Kerguelen[] ACE_TIME_PROGMEM = "Indian/Kerguelen"; +static const char kZoneNameIndian_Kerguelen[] ACE_TIME_PROGMEM = "\x0c" "Kerguelen"; const extended::ZoneInfo kZoneIndian_Kerguelen ACE_TIME_PROGMEM = { kZoneNameIndian_Kerguelen /*name*/, @@ -15017,9 +15042,9 @@ const extended::ZoneInfo kZoneIndian_Kerguelen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Mahe // Zone Eras: 1 -// Strings (bytes): 16 -// Memory (8-bit): 38 -// Memory (32-bit): 52 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 32 +// Memory (32-bit): 46 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraIndian_Mahe[] ACE_TIME_PROGMEM = { @@ -15038,7 +15063,7 @@ static const extended::ZoneEra kZoneEraIndian_Mahe[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Mahe[] ACE_TIME_PROGMEM = "Indian/Mahe"; +static const char kZoneNameIndian_Mahe[] ACE_TIME_PROGMEM = "\x0c" "Mahe"; const extended::ZoneInfo kZoneIndian_Mahe ACE_TIME_PROGMEM = { kZoneNameIndian_Mahe /*name*/, @@ -15051,9 +15076,9 @@ const extended::ZoneInfo kZoneIndian_Mahe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Maldives // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 14 (originally 20) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraIndian_Maldives[] ACE_TIME_PROGMEM = { @@ -15072,7 +15097,7 @@ static const extended::ZoneEra kZoneEraIndian_Maldives[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Maldives[] ACE_TIME_PROGMEM = "Indian/Maldives"; +static const char kZoneNameIndian_Maldives[] ACE_TIME_PROGMEM = "\x0c" "Maldives"; const extended::ZoneInfo kZoneIndian_Maldives ACE_TIME_PROGMEM = { kZoneNameIndian_Maldives /*name*/, @@ -15085,9 +15110,9 @@ const extended::ZoneInfo kZoneIndian_Maldives ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Mauritius // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 19 (originally 25) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraIndian_Mauritius[] ACE_TIME_PROGMEM = { @@ -15106,7 +15131,7 @@ static const extended::ZoneEra kZoneEraIndian_Mauritius[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Mauritius[] ACE_TIME_PROGMEM = "Indian/Mauritius"; +static const char kZoneNameIndian_Mauritius[] ACE_TIME_PROGMEM = "\x0c" "Mauritius"; const extended::ZoneInfo kZoneIndian_Mauritius ACE_TIME_PROGMEM = { kZoneNameIndian_Mauritius /*name*/, @@ -15119,9 +15144,9 @@ const extended::ZoneInfo kZoneIndian_Mauritius ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Indian/Reunion // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraIndian_Reunion[] ACE_TIME_PROGMEM = { @@ -15140,7 +15165,7 @@ static const extended::ZoneEra kZoneEraIndian_Reunion[] ACE_TIME_PROGMEM = { }; -static const char kZoneNameIndian_Reunion[] ACE_TIME_PROGMEM = "Indian/Reunion"; +static const char kZoneNameIndian_Reunion[] ACE_TIME_PROGMEM = "\x0c" "Reunion"; const extended::ZoneInfo kZoneIndian_Reunion ACE_TIME_PROGMEM = { kZoneNameIndian_Reunion /*name*/, @@ -15153,7 +15178,7 @@ const extended::ZoneInfo kZoneIndian_Reunion ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: MET // Zone Eras: 1 -// Strings (bytes): 9 +// Strings (bytes): 9 (originally 9) // Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- @@ -15187,7 +15212,7 @@ const extended::ZoneInfo kZoneMET ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: MST // Zone Eras: 1 -// Strings (bytes): 8 +// Strings (bytes): 8 (originally 8) // Memory (8-bit): 30 // Memory (32-bit): 44 //--------------------------------------------------------------------------- @@ -15221,7 +15246,7 @@ const extended::ZoneInfo kZoneMST ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: MST7MDT // Zone Eras: 1 -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -15255,7 +15280,7 @@ const extended::ZoneInfo kZoneMST7MDT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: PST8PDT // Zone Eras: 1 -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 34 // Memory (32-bit): 48 //--------------------------------------------------------------------------- @@ -15289,9 +15314,9 @@ const extended::ZoneInfo kZonePST8PDT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Apia // Zone Eras: 2 -// Strings (bytes): 29 -// Memory (8-bit): 62 -// Memory (32-bit): 81 +// Strings (bytes): 22 (originally 29) +// Memory (8-bit): 55 +// Memory (32-bit): 74 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Apia[] ACE_TIME_PROGMEM = { @@ -15322,7 +15347,7 @@ static const extended::ZoneEra kZoneEraPacific_Apia[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Apia[] ACE_TIME_PROGMEM = "Pacific/Apia"; +static const char kZoneNamePacific_Apia[] ACE_TIME_PROGMEM = "\x0e" "Apia"; const extended::ZoneInfo kZonePacific_Apia ACE_TIME_PROGMEM = { kZoneNamePacific_Apia /*name*/, @@ -15335,9 +15360,9 @@ const extended::ZoneInfo kZonePacific_Apia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Auckland // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Auckland[] ACE_TIME_PROGMEM = { @@ -15356,7 +15381,7 @@ static const extended::ZoneEra kZoneEraPacific_Auckland[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Auckland[] ACE_TIME_PROGMEM = "Pacific/Auckland"; +static const char kZoneNamePacific_Auckland[] ACE_TIME_PROGMEM = "\x0e" "Auckland"; const extended::ZoneInfo kZonePacific_Auckland ACE_TIME_PROGMEM = { kZoneNamePacific_Auckland /*name*/, @@ -15369,9 +15394,9 @@ const extended::ZoneInfo kZonePacific_Auckland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Bougainville // Zone Eras: 2 -// Strings (bytes): 29 -// Memory (8-bit): 62 -// Memory (32-bit): 81 +// Strings (bytes): 22 (originally 29) +// Memory (8-bit): 55 +// Memory (32-bit): 74 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Bougainville[] ACE_TIME_PROGMEM = { @@ -15402,7 +15427,7 @@ static const extended::ZoneEra kZoneEraPacific_Bougainville[] ACE_TIME_PROGMEM = }; -static const char kZoneNamePacific_Bougainville[] ACE_TIME_PROGMEM = "Pacific/Bougainville"; +static const char kZoneNamePacific_Bougainville[] ACE_TIME_PROGMEM = "\x0e" "Bougainville"; const extended::ZoneInfo kZonePacific_Bougainville ACE_TIME_PROGMEM = { kZoneNamePacific_Bougainville /*name*/, @@ -15415,9 +15440,9 @@ const extended::ZoneInfo kZonePacific_Bougainville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Chatham // Zone Eras: 1 -// Strings (bytes): 28 -// Memory (8-bit): 50 -// Memory (32-bit): 64 +// Strings (bytes): 21 (originally 28) +// Memory (8-bit): 43 +// Memory (32-bit): 57 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Chatham[] ACE_TIME_PROGMEM = { @@ -15436,7 +15461,7 @@ static const extended::ZoneEra kZoneEraPacific_Chatham[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Chatham[] ACE_TIME_PROGMEM = "Pacific/Chatham"; +static const char kZoneNamePacific_Chatham[] ACE_TIME_PROGMEM = "\x0e" "Chatham"; const extended::ZoneInfo kZonePacific_Chatham ACE_TIME_PROGMEM = { kZoneNamePacific_Chatham /*name*/, @@ -15449,9 +15474,9 @@ const extended::ZoneInfo kZonePacific_Chatham ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Chuuk // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Chuuk[] ACE_TIME_PROGMEM = { @@ -15470,7 +15495,7 @@ static const extended::ZoneEra kZoneEraPacific_Chuuk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Chuuk[] ACE_TIME_PROGMEM = "Pacific/Chuuk"; +static const char kZoneNamePacific_Chuuk[] ACE_TIME_PROGMEM = "\x0e" "Chuuk"; const extended::ZoneInfo kZonePacific_Chuuk ACE_TIME_PROGMEM = { kZoneNamePacific_Chuuk /*name*/, @@ -15483,9 +15508,9 @@ const extended::ZoneInfo kZonePacific_Chuuk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Easter // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Easter[] ACE_TIME_PROGMEM = { @@ -15504,7 +15529,7 @@ static const extended::ZoneEra kZoneEraPacific_Easter[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Easter[] ACE_TIME_PROGMEM = "Pacific/Easter"; +static const char kZoneNamePacific_Easter[] ACE_TIME_PROGMEM = "\x0e" "Easter"; const extended::ZoneInfo kZonePacific_Easter ACE_TIME_PROGMEM = { kZoneNamePacific_Easter /*name*/, @@ -15517,9 +15542,9 @@ const extended::ZoneInfo kZonePacific_Easter ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Efate // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Efate[] ACE_TIME_PROGMEM = { @@ -15538,7 +15563,7 @@ static const extended::ZoneEra kZoneEraPacific_Efate[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Efate[] ACE_TIME_PROGMEM = "Pacific/Efate"; +static const char kZoneNamePacific_Efate[] ACE_TIME_PROGMEM = "\x0e" "Efate"; const extended::ZoneInfo kZonePacific_Efate ACE_TIME_PROGMEM = { kZoneNamePacific_Efate /*name*/, @@ -15551,9 +15576,9 @@ const extended::ZoneInfo kZonePacific_Efate ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Enderbury // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Enderbury[] ACE_TIME_PROGMEM = { @@ -15572,7 +15597,7 @@ static const extended::ZoneEra kZoneEraPacific_Enderbury[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Enderbury[] ACE_TIME_PROGMEM = "Pacific/Enderbury"; +static const char kZoneNamePacific_Enderbury[] ACE_TIME_PROGMEM = "\x0e" "Enderbury"; const extended::ZoneInfo kZonePacific_Enderbury ACE_TIME_PROGMEM = { kZoneNamePacific_Enderbury /*name*/, @@ -15585,9 +15610,9 @@ const extended::ZoneInfo kZonePacific_Enderbury ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Fakaofo // Zone Eras: 2 -// Strings (bytes): 24 -// Memory (8-bit): 57 -// Memory (32-bit): 76 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 50 +// Memory (32-bit): 69 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Fakaofo[] ACE_TIME_PROGMEM = { @@ -15618,7 +15643,7 @@ static const extended::ZoneEra kZoneEraPacific_Fakaofo[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Fakaofo[] ACE_TIME_PROGMEM = "Pacific/Fakaofo"; +static const char kZoneNamePacific_Fakaofo[] ACE_TIME_PROGMEM = "\x0e" "Fakaofo"; const extended::ZoneInfo kZonePacific_Fakaofo ACE_TIME_PROGMEM = { kZoneNamePacific_Fakaofo /*name*/, @@ -15631,9 +15656,9 @@ const extended::ZoneInfo kZonePacific_Fakaofo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Fiji // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Fiji[] ACE_TIME_PROGMEM = { @@ -15652,7 +15677,7 @@ static const extended::ZoneEra kZoneEraPacific_Fiji[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Fiji[] ACE_TIME_PROGMEM = "Pacific/Fiji"; +static const char kZoneNamePacific_Fiji[] ACE_TIME_PROGMEM = "\x0e" "Fiji"; const extended::ZoneInfo kZonePacific_Fiji ACE_TIME_PROGMEM = { kZoneNamePacific_Fiji /*name*/, @@ -15665,9 +15690,9 @@ const extended::ZoneInfo kZonePacific_Fiji ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Funafuti // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Funafuti[] ACE_TIME_PROGMEM = { @@ -15686,7 +15711,7 @@ static const extended::ZoneEra kZoneEraPacific_Funafuti[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Funafuti[] ACE_TIME_PROGMEM = "Pacific/Funafuti"; +static const char kZoneNamePacific_Funafuti[] ACE_TIME_PROGMEM = "\x0e" "Funafuti"; const extended::ZoneInfo kZonePacific_Funafuti ACE_TIME_PROGMEM = { kZoneNamePacific_Funafuti /*name*/, @@ -15699,9 +15724,9 @@ const extended::ZoneInfo kZonePacific_Funafuti ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Galapagos // Zone Eras: 1 -// Strings (bytes): 26 -// Memory (8-bit): 48 -// Memory (32-bit): 62 +// Strings (bytes): 19 (originally 26) +// Memory (8-bit): 41 +// Memory (32-bit): 55 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Galapagos[] ACE_TIME_PROGMEM = { @@ -15720,7 +15745,7 @@ static const extended::ZoneEra kZoneEraPacific_Galapagos[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Galapagos[] ACE_TIME_PROGMEM = "Pacific/Galapagos"; +static const char kZoneNamePacific_Galapagos[] ACE_TIME_PROGMEM = "\x0e" "Galapagos"; const extended::ZoneInfo kZonePacific_Galapagos ACE_TIME_PROGMEM = { kZoneNamePacific_Galapagos /*name*/, @@ -15733,9 +15758,9 @@ const extended::ZoneInfo kZonePacific_Galapagos ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Gambier // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Gambier[] ACE_TIME_PROGMEM = { @@ -15754,7 +15779,7 @@ static const extended::ZoneEra kZoneEraPacific_Gambier[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Gambier[] ACE_TIME_PROGMEM = "Pacific/Gambier"; +static const char kZoneNamePacific_Gambier[] ACE_TIME_PROGMEM = "\x0e" "Gambier"; const extended::ZoneInfo kZonePacific_Gambier ACE_TIME_PROGMEM = { kZoneNamePacific_Gambier /*name*/, @@ -15767,9 +15792,9 @@ const extended::ZoneInfo kZonePacific_Gambier ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Guadalcanal // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Guadalcanal[] ACE_TIME_PROGMEM = { @@ -15788,7 +15813,7 @@ static const extended::ZoneEra kZoneEraPacific_Guadalcanal[] ACE_TIME_PROGMEM = }; -static const char kZoneNamePacific_Guadalcanal[] ACE_TIME_PROGMEM = "Pacific/Guadalcanal"; +static const char kZoneNamePacific_Guadalcanal[] ACE_TIME_PROGMEM = "\x0e" "Guadalcanal"; const extended::ZoneInfo kZonePacific_Guadalcanal ACE_TIME_PROGMEM = { kZoneNamePacific_Guadalcanal /*name*/, @@ -15801,9 +15826,9 @@ const extended::ZoneInfo kZonePacific_Guadalcanal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Guam // Zone Eras: 2 -// Strings (bytes): 22 -// Memory (8-bit): 55 -// Memory (32-bit): 74 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 48 +// Memory (32-bit): 67 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Guam[] ACE_TIME_PROGMEM = { @@ -15834,7 +15859,7 @@ static const extended::ZoneEra kZoneEraPacific_Guam[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Guam[] ACE_TIME_PROGMEM = "Pacific/Guam"; +static const char kZoneNamePacific_Guam[] ACE_TIME_PROGMEM = "\x0e" "Guam"; const extended::ZoneInfo kZonePacific_Guam ACE_TIME_PROGMEM = { kZoneNamePacific_Guam /*name*/, @@ -15847,9 +15872,9 @@ const extended::ZoneInfo kZonePacific_Guam ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Honolulu // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Honolulu[] ACE_TIME_PROGMEM = { @@ -15868,7 +15893,7 @@ static const extended::ZoneEra kZoneEraPacific_Honolulu[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Honolulu[] ACE_TIME_PROGMEM = "Pacific/Honolulu"; +static const char kZoneNamePacific_Honolulu[] ACE_TIME_PROGMEM = "\x0e" "Honolulu"; const extended::ZoneInfo kZonePacific_Honolulu ACE_TIME_PROGMEM = { kZoneNamePacific_Honolulu /*name*/, @@ -15881,9 +15906,9 @@ const extended::ZoneInfo kZonePacific_Honolulu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Kiritimati // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Kiritimati[] ACE_TIME_PROGMEM = { @@ -15902,7 +15927,7 @@ static const extended::ZoneEra kZoneEraPacific_Kiritimati[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Kiritimati[] ACE_TIME_PROGMEM = "Pacific/Kiritimati"; +static const char kZoneNamePacific_Kiritimati[] ACE_TIME_PROGMEM = "\x0e" "Kiritimati"; const extended::ZoneInfo kZonePacific_Kiritimati ACE_TIME_PROGMEM = { kZoneNamePacific_Kiritimati /*name*/, @@ -15915,9 +15940,9 @@ const extended::ZoneInfo kZonePacific_Kiritimati ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Kosrae // Zone Eras: 2 -// Strings (bytes): 23 -// Memory (8-bit): 56 -// Memory (32-bit): 75 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 49 +// Memory (32-bit): 68 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Kosrae[] ACE_TIME_PROGMEM = { @@ -15948,7 +15973,7 @@ static const extended::ZoneEra kZoneEraPacific_Kosrae[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Kosrae[] ACE_TIME_PROGMEM = "Pacific/Kosrae"; +static const char kZoneNamePacific_Kosrae[] ACE_TIME_PROGMEM = "\x0e" "Kosrae"; const extended::ZoneInfo kZonePacific_Kosrae ACE_TIME_PROGMEM = { kZoneNamePacific_Kosrae /*name*/, @@ -15961,9 +15986,9 @@ const extended::ZoneInfo kZonePacific_Kosrae ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Kwajalein // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Kwajalein[] ACE_TIME_PROGMEM = { @@ -15982,7 +16007,7 @@ static const extended::ZoneEra kZoneEraPacific_Kwajalein[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Kwajalein[] ACE_TIME_PROGMEM = "Pacific/Kwajalein"; +static const char kZoneNamePacific_Kwajalein[] ACE_TIME_PROGMEM = "\x0e" "Kwajalein"; const extended::ZoneInfo kZonePacific_Kwajalein ACE_TIME_PROGMEM = { kZoneNamePacific_Kwajalein /*name*/, @@ -15995,9 +16020,9 @@ const extended::ZoneInfo kZonePacific_Kwajalein ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Majuro // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Majuro[] ACE_TIME_PROGMEM = { @@ -16016,7 +16041,7 @@ static const extended::ZoneEra kZoneEraPacific_Majuro[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Majuro[] ACE_TIME_PROGMEM = "Pacific/Majuro"; +static const char kZoneNamePacific_Majuro[] ACE_TIME_PROGMEM = "\x0e" "Majuro"; const extended::ZoneInfo kZonePacific_Majuro ACE_TIME_PROGMEM = { kZoneNamePacific_Majuro /*name*/, @@ -16029,9 +16054,9 @@ const extended::ZoneInfo kZonePacific_Majuro ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Marquesas // Zone Eras: 1 -// Strings (bytes): 24 -// Memory (8-bit): 46 -// Memory (32-bit): 60 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Marquesas[] ACE_TIME_PROGMEM = { @@ -16050,7 +16075,7 @@ static const extended::ZoneEra kZoneEraPacific_Marquesas[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Marquesas[] ACE_TIME_PROGMEM = "Pacific/Marquesas"; +static const char kZoneNamePacific_Marquesas[] ACE_TIME_PROGMEM = "\x0e" "Marquesas"; const extended::ZoneInfo kZonePacific_Marquesas ACE_TIME_PROGMEM = { kZoneNamePacific_Marquesas /*name*/, @@ -16063,9 +16088,9 @@ const extended::ZoneInfo kZonePacific_Marquesas ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Nauru // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Nauru[] ACE_TIME_PROGMEM = { @@ -16084,7 +16109,7 @@ static const extended::ZoneEra kZoneEraPacific_Nauru[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Nauru[] ACE_TIME_PROGMEM = "Pacific/Nauru"; +static const char kZoneNamePacific_Nauru[] ACE_TIME_PROGMEM = "\x0e" "Nauru"; const extended::ZoneInfo kZonePacific_Nauru ACE_TIME_PROGMEM = { kZoneNamePacific_Nauru /*name*/, @@ -16097,9 +16122,9 @@ const extended::ZoneInfo kZonePacific_Nauru ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Niue // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 32 +// Memory (32-bit): 46 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Niue[] ACE_TIME_PROGMEM = { @@ -16118,7 +16143,7 @@ static const extended::ZoneEra kZoneEraPacific_Niue[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Niue[] ACE_TIME_PROGMEM = "Pacific/Niue"; +static const char kZoneNamePacific_Niue[] ACE_TIME_PROGMEM = "\x0e" "Niue"; const extended::ZoneInfo kZonePacific_Niue ACE_TIME_PROGMEM = { kZoneNamePacific_Niue /*name*/, @@ -16131,9 +16156,9 @@ const extended::ZoneInfo kZonePacific_Niue ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Norfolk // Zone Eras: 3 -// Strings (bytes): 34 -// Memory (8-bit): 78 -// Memory (32-bit): 102 +// Strings (bytes): 27 (originally 34) +// Memory (8-bit): 71 +// Memory (32-bit): 95 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Norfolk[] ACE_TIME_PROGMEM = { @@ -16176,7 +16201,7 @@ static const extended::ZoneEra kZoneEraPacific_Norfolk[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Norfolk[] ACE_TIME_PROGMEM = "Pacific/Norfolk"; +static const char kZoneNamePacific_Norfolk[] ACE_TIME_PROGMEM = "\x0e" "Norfolk"; const extended::ZoneInfo kZonePacific_Norfolk ACE_TIME_PROGMEM = { kZoneNamePacific_Norfolk /*name*/, @@ -16189,9 +16214,9 @@ const extended::ZoneInfo kZonePacific_Norfolk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Noumea // Zone Eras: 1 -// Strings (bytes): 23 -// Memory (8-bit): 45 -// Memory (32-bit): 59 +// Strings (bytes): 16 (originally 23) +// Memory (8-bit): 38 +// Memory (32-bit): 52 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Noumea[] ACE_TIME_PROGMEM = { @@ -16210,7 +16235,7 @@ static const extended::ZoneEra kZoneEraPacific_Noumea[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Noumea[] ACE_TIME_PROGMEM = "Pacific/Noumea"; +static const char kZoneNamePacific_Noumea[] ACE_TIME_PROGMEM = "\x0e" "Noumea"; const extended::ZoneInfo kZonePacific_Noumea ACE_TIME_PROGMEM = { kZoneNamePacific_Noumea /*name*/, @@ -16223,9 +16248,9 @@ const extended::ZoneInfo kZonePacific_Noumea ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Pago_Pago // Zone Eras: 1 -// Strings (bytes): 22 -// Memory (8-bit): 44 -// Memory (32-bit): 58 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 37 +// Memory (32-bit): 51 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Pago_Pago[] ACE_TIME_PROGMEM = { @@ -16244,7 +16269,7 @@ static const extended::ZoneEra kZoneEraPacific_Pago_Pago[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Pago_Pago[] ACE_TIME_PROGMEM = "Pacific/Pago_Pago"; +static const char kZoneNamePacific_Pago_Pago[] ACE_TIME_PROGMEM = "\x0e" "Pago_Pago"; const extended::ZoneInfo kZonePacific_Pago_Pago ACE_TIME_PROGMEM = { kZoneNamePacific_Pago_Pago /*name*/, @@ -16257,9 +16282,9 @@ const extended::ZoneInfo kZonePacific_Pago_Pago ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Palau // Zone Eras: 1 -// Strings (bytes): 18 -// Memory (8-bit): 40 -// Memory (32-bit): 54 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 33 +// Memory (32-bit): 47 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Palau[] ACE_TIME_PROGMEM = { @@ -16278,7 +16303,7 @@ static const extended::ZoneEra kZoneEraPacific_Palau[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Palau[] ACE_TIME_PROGMEM = "Pacific/Palau"; +static const char kZoneNamePacific_Palau[] ACE_TIME_PROGMEM = "\x0e" "Palau"; const extended::ZoneInfo kZonePacific_Palau ACE_TIME_PROGMEM = { kZoneNamePacific_Palau /*name*/, @@ -16291,9 +16316,9 @@ const extended::ZoneInfo kZonePacific_Palau ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Pitcairn // Zone Eras: 1 -// Strings (bytes): 21 -// Memory (8-bit): 43 -// Memory (32-bit): 57 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 36 +// Memory (32-bit): 50 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Pitcairn[] ACE_TIME_PROGMEM = { @@ -16312,7 +16337,7 @@ static const extended::ZoneEra kZoneEraPacific_Pitcairn[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Pitcairn[] ACE_TIME_PROGMEM = "Pacific/Pitcairn"; +static const char kZoneNamePacific_Pitcairn[] ACE_TIME_PROGMEM = "\x0e" "Pitcairn"; const extended::ZoneInfo kZonePacific_Pitcairn ACE_TIME_PROGMEM = { kZoneNamePacific_Pitcairn /*name*/, @@ -16325,9 +16350,9 @@ const extended::ZoneInfo kZonePacific_Pitcairn ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Pohnpei // Zone Eras: 1 -// Strings (bytes): 20 -// Memory (8-bit): 42 -// Memory (32-bit): 56 +// Strings (bytes): 13 (originally 20) +// Memory (8-bit): 35 +// Memory (32-bit): 49 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Pohnpei[] ACE_TIME_PROGMEM = { @@ -16346,7 +16371,7 @@ static const extended::ZoneEra kZoneEraPacific_Pohnpei[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Pohnpei[] ACE_TIME_PROGMEM = "Pacific/Pohnpei"; +static const char kZoneNamePacific_Pohnpei[] ACE_TIME_PROGMEM = "\x0e" "Pohnpei"; const extended::ZoneInfo kZonePacific_Pohnpei ACE_TIME_PROGMEM = { kZoneNamePacific_Pohnpei /*name*/, @@ -16359,9 +16384,9 @@ const extended::ZoneInfo kZonePacific_Pohnpei ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Port_Moresby // Zone Eras: 1 -// Strings (bytes): 25 -// Memory (8-bit): 47 -// Memory (32-bit): 61 +// Strings (bytes): 18 (originally 25) +// Memory (8-bit): 40 +// Memory (32-bit): 54 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Port_Moresby[] ACE_TIME_PROGMEM = { @@ -16380,7 +16405,7 @@ static const extended::ZoneEra kZoneEraPacific_Port_Moresby[] ACE_TIME_PROGMEM = }; -static const char kZoneNamePacific_Port_Moresby[] ACE_TIME_PROGMEM = "Pacific/Port_Moresby"; +static const char kZoneNamePacific_Port_Moresby[] ACE_TIME_PROGMEM = "\x0e" "Port_Moresby"; const extended::ZoneInfo kZonePacific_Port_Moresby ACE_TIME_PROGMEM = { kZoneNamePacific_Port_Moresby /*name*/, @@ -16393,9 +16418,9 @@ const extended::ZoneInfo kZonePacific_Port_Moresby ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Rarotonga // Zone Eras: 1 -// Strings (bytes): 28 -// Memory (8-bit): 50 -// Memory (32-bit): 64 +// Strings (bytes): 21 (originally 28) +// Memory (8-bit): 43 +// Memory (32-bit): 57 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Rarotonga[] ACE_TIME_PROGMEM = { @@ -16414,7 +16439,7 @@ static const extended::ZoneEra kZoneEraPacific_Rarotonga[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Rarotonga[] ACE_TIME_PROGMEM = "Pacific/Rarotonga"; +static const char kZoneNamePacific_Rarotonga[] ACE_TIME_PROGMEM = "\x0e" "Rarotonga"; const extended::ZoneInfo kZonePacific_Rarotonga ACE_TIME_PROGMEM = { kZoneNamePacific_Rarotonga /*name*/, @@ -16427,9 +16452,9 @@ const extended::ZoneInfo kZonePacific_Rarotonga ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Tahiti // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Tahiti[] ACE_TIME_PROGMEM = { @@ -16448,7 +16473,7 @@ static const extended::ZoneEra kZoneEraPacific_Tahiti[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Tahiti[] ACE_TIME_PROGMEM = "Pacific/Tahiti"; +static const char kZoneNamePacific_Tahiti[] ACE_TIME_PROGMEM = "\x0e" "Tahiti"; const extended::ZoneInfo kZonePacific_Tahiti ACE_TIME_PROGMEM = { kZoneNamePacific_Tahiti /*name*/, @@ -16461,9 +16486,9 @@ const extended::ZoneInfo kZonePacific_Tahiti ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Tarawa // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Tarawa[] ACE_TIME_PROGMEM = { @@ -16482,7 +16507,7 @@ static const extended::ZoneEra kZoneEraPacific_Tarawa[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Tarawa[] ACE_TIME_PROGMEM = "Pacific/Tarawa"; +static const char kZoneNamePacific_Tarawa[] ACE_TIME_PROGMEM = "\x0e" "Tarawa"; const extended::ZoneInfo kZonePacific_Tarawa ACE_TIME_PROGMEM = { kZoneNamePacific_Tarawa /*name*/, @@ -16495,9 +16520,9 @@ const extended::ZoneInfo kZonePacific_Tarawa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Tongatapu // Zone Eras: 2 -// Strings (bytes): 30 -// Memory (8-bit): 63 -// Memory (32-bit): 82 +// Strings (bytes): 23 (originally 30) +// Memory (8-bit): 56 +// Memory (32-bit): 75 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Tongatapu[] ACE_TIME_PROGMEM = { @@ -16528,7 +16553,7 @@ static const extended::ZoneEra kZoneEraPacific_Tongatapu[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Tongatapu[] ACE_TIME_PROGMEM = "Pacific/Tongatapu"; +static const char kZoneNamePacific_Tongatapu[] ACE_TIME_PROGMEM = "\x0e" "Tongatapu"; const extended::ZoneInfo kZonePacific_Tongatapu ACE_TIME_PROGMEM = { kZoneNamePacific_Tongatapu /*name*/, @@ -16541,9 +16566,9 @@ const extended::ZoneInfo kZonePacific_Tongatapu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Wake // Zone Eras: 1 -// Strings (bytes): 17 -// Memory (8-bit): 39 -// Memory (32-bit): 53 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 32 +// Memory (32-bit): 46 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Wake[] ACE_TIME_PROGMEM = { @@ -16562,7 +16587,7 @@ static const extended::ZoneEra kZoneEraPacific_Wake[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Wake[] ACE_TIME_PROGMEM = "Pacific/Wake"; +static const char kZoneNamePacific_Wake[] ACE_TIME_PROGMEM = "\x0e" "Wake"; const extended::ZoneInfo kZonePacific_Wake ACE_TIME_PROGMEM = { kZoneNamePacific_Wake /*name*/, @@ -16575,9 +16600,9 @@ const extended::ZoneInfo kZonePacific_Wake ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Pacific/Wallis // Zone Eras: 1 -// Strings (bytes): 19 -// Memory (8-bit): 41 -// Memory (32-bit): 55 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 34 +// Memory (32-bit): 48 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraPacific_Wallis[] ACE_TIME_PROGMEM = { @@ -16596,7 +16621,7 @@ static const extended::ZoneEra kZoneEraPacific_Wallis[] ACE_TIME_PROGMEM = { }; -static const char kZoneNamePacific_Wallis[] ACE_TIME_PROGMEM = "Pacific/Wallis"; +static const char kZoneNamePacific_Wallis[] ACE_TIME_PROGMEM = "\x0e" "Wallis"; const extended::ZoneInfo kZonePacific_Wallis ACE_TIME_PROGMEM = { kZoneNamePacific_Wallis /*name*/, @@ -16609,7 +16634,7 @@ const extended::ZoneInfo kZonePacific_Wallis ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: WET // Zone Eras: 1 -// Strings (bytes): 9 +// Strings (bytes): 9 (originally 9) // Memory (8-bit): 31 // Memory (32-bit): 45 //--------------------------------------------------------------------------- @@ -16648,8 +16673,9 @@ const extended::ZoneInfo kZoneWET ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Addis_Ababa -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Addis_Ababa[] ACE_TIME_PROGMEM = "Africa/Addis_Ababa"; @@ -16664,8 +16690,9 @@ const extended::ZoneInfo kZoneAfrica_Addis_Ababa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Asmara -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Asmara[] ACE_TIME_PROGMEM = "Africa/Asmara"; @@ -16680,8 +16707,9 @@ const extended::ZoneInfo kZoneAfrica_Asmara ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Asmera -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Asmera[] ACE_TIME_PROGMEM = "Africa/Asmera"; @@ -16696,8 +16724,9 @@ const extended::ZoneInfo kZoneAfrica_Asmera ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Bamako -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Bamako[] ACE_TIME_PROGMEM = "Africa/Bamako"; @@ -16712,8 +16741,9 @@ const extended::ZoneInfo kZoneAfrica_Bamako ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Bangui -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Bangui[] ACE_TIME_PROGMEM = "Africa/Bangui"; @@ -16728,8 +16758,9 @@ const extended::ZoneInfo kZoneAfrica_Bangui ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Banjul -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Banjul[] ACE_TIME_PROGMEM = "Africa/Banjul"; @@ -16744,8 +16775,9 @@ const extended::ZoneInfo kZoneAfrica_Banjul ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Blantyre -> Africa/Maputo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Blantyre[] ACE_TIME_PROGMEM = "Africa/Blantyre"; @@ -16760,8 +16792,9 @@ const extended::ZoneInfo kZoneAfrica_Blantyre ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Brazzaville -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Brazzaville[] ACE_TIME_PROGMEM = "Africa/Brazzaville"; @@ -16776,8 +16809,9 @@ const extended::ZoneInfo kZoneAfrica_Brazzaville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Bujumbura -> Africa/Maputo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Bujumbura[] ACE_TIME_PROGMEM = "Africa/Bujumbura"; @@ -16792,8 +16826,9 @@ const extended::ZoneInfo kZoneAfrica_Bujumbura ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Conakry -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Conakry[] ACE_TIME_PROGMEM = "Africa/Conakry"; @@ -16808,8 +16843,9 @@ const extended::ZoneInfo kZoneAfrica_Conakry ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Dakar -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 13 +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Dakar[] ACE_TIME_PROGMEM = "Africa/Dakar"; @@ -16824,8 +16860,9 @@ const extended::ZoneInfo kZoneAfrica_Dakar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Dar_es_Salaam -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 21 +// Memory (8-bit): 32 +// Memory (32-bit): 41 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Dar_es_Salaam[] ACE_TIME_PROGMEM = "Africa/Dar_es_Salaam"; @@ -16840,8 +16877,9 @@ const extended::ZoneInfo kZoneAfrica_Dar_es_Salaam ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Djibouti -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Djibouti[] ACE_TIME_PROGMEM = "Africa/Djibouti"; @@ -16856,8 +16894,9 @@ const extended::ZoneInfo kZoneAfrica_Djibouti ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Douala -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Douala[] ACE_TIME_PROGMEM = "Africa/Douala"; @@ -16872,8 +16911,9 @@ const extended::ZoneInfo kZoneAfrica_Douala ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Freetown -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Freetown[] ACE_TIME_PROGMEM = "Africa/Freetown"; @@ -16888,8 +16928,9 @@ const extended::ZoneInfo kZoneAfrica_Freetown ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Gaborone -> Africa/Maputo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Gaborone[] ACE_TIME_PROGMEM = "Africa/Gaborone"; @@ -16904,8 +16945,9 @@ const extended::ZoneInfo kZoneAfrica_Gaborone ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Harare -> Africa/Maputo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Harare[] ACE_TIME_PROGMEM = "Africa/Harare"; @@ -16920,8 +16962,9 @@ const extended::ZoneInfo kZoneAfrica_Harare ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Kampala -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Kampala[] ACE_TIME_PROGMEM = "Africa/Kampala"; @@ -16936,8 +16979,9 @@ const extended::ZoneInfo kZoneAfrica_Kampala ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Kigali -> Africa/Maputo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Kigali[] ACE_TIME_PROGMEM = "Africa/Kigali"; @@ -16952,8 +16996,9 @@ const extended::ZoneInfo kZoneAfrica_Kigali ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Kinshasa -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Kinshasa[] ACE_TIME_PROGMEM = "Africa/Kinshasa"; @@ -16968,8 +17013,9 @@ const extended::ZoneInfo kZoneAfrica_Kinshasa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Libreville -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Libreville[] ACE_TIME_PROGMEM = "Africa/Libreville"; @@ -16984,8 +17030,9 @@ const extended::ZoneInfo kZoneAfrica_Libreville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Lome -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Lome[] ACE_TIME_PROGMEM = "Africa/Lome"; @@ -17000,8 +17047,9 @@ const extended::ZoneInfo kZoneAfrica_Lome ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Luanda -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Luanda[] ACE_TIME_PROGMEM = "Africa/Luanda"; @@ -17016,8 +17064,9 @@ const extended::ZoneInfo kZoneAfrica_Luanda ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Lubumbashi -> Africa/Maputo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Lubumbashi[] ACE_TIME_PROGMEM = "Africa/Lubumbashi"; @@ -17032,8 +17081,9 @@ const extended::ZoneInfo kZoneAfrica_Lubumbashi ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Lusaka -> Africa/Maputo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Lusaka[] ACE_TIME_PROGMEM = "Africa/Lusaka"; @@ -17048,8 +17098,9 @@ const extended::ZoneInfo kZoneAfrica_Lusaka ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Malabo -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Malabo[] ACE_TIME_PROGMEM = "Africa/Malabo"; @@ -17064,8 +17115,9 @@ const extended::ZoneInfo kZoneAfrica_Malabo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Maseru -> Africa/Johannesburg -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Maseru[] ACE_TIME_PROGMEM = "Africa/Maseru"; @@ -17080,8 +17132,9 @@ const extended::ZoneInfo kZoneAfrica_Maseru ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Mbabane -> Africa/Johannesburg -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Mbabane[] ACE_TIME_PROGMEM = "Africa/Mbabane"; @@ -17096,8 +17149,9 @@ const extended::ZoneInfo kZoneAfrica_Mbabane ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Mogadishu -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Mogadishu[] ACE_TIME_PROGMEM = "Africa/Mogadishu"; @@ -17112,8 +17166,9 @@ const extended::ZoneInfo kZoneAfrica_Mogadishu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Niamey -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Niamey[] ACE_TIME_PROGMEM = "Africa/Niamey"; @@ -17128,8 +17183,9 @@ const extended::ZoneInfo kZoneAfrica_Niamey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Nouakchott -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Nouakchott[] ACE_TIME_PROGMEM = "Africa/Nouakchott"; @@ -17144,8 +17200,9 @@ const extended::ZoneInfo kZoneAfrica_Nouakchott ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Ouagadougou -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Ouagadougou[] ACE_TIME_PROGMEM = "Africa/Ouagadougou"; @@ -17160,8 +17217,9 @@ const extended::ZoneInfo kZoneAfrica_Ouagadougou ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Porto-Novo -> Africa/Lagos -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Porto_Novo[] ACE_TIME_PROGMEM = "Africa/Porto-Novo"; @@ -17176,8 +17234,9 @@ const extended::ZoneInfo kZoneAfrica_Porto_Novo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Timbuktu -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAfrica_Timbuktu[] ACE_TIME_PROGMEM = "Africa/Timbuktu"; @@ -17192,8 +17251,9 @@ const extended::ZoneInfo kZoneAfrica_Timbuktu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Anguilla -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Anguilla[] ACE_TIME_PROGMEM = "America/Anguilla"; @@ -17208,8 +17268,9 @@ const extended::ZoneInfo kZoneAmerica_Anguilla ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Antigua -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Antigua[] ACE_TIME_PROGMEM = "America/Antigua"; @@ -17224,8 +17285,9 @@ const extended::ZoneInfo kZoneAmerica_Antigua ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Argentina/ComodRivadavia -> America/Argentina/Catamarca -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 33 +// Memory (8-bit): 44 +// Memory (32-bit): 53 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Argentina_ComodRivadavia[] ACE_TIME_PROGMEM = "America/Argentina/ComodRivadavia"; @@ -17240,8 +17302,9 @@ const extended::ZoneInfo kZoneAmerica_Argentina_ComodRivadavia ACE_TIME_PROGMEM //--------------------------------------------------------------------------- // Link name: America/Aruba -> America/Curacao -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Aruba[] ACE_TIME_PROGMEM = "America/Aruba"; @@ -17256,8 +17319,9 @@ const extended::ZoneInfo kZoneAmerica_Aruba ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Atka -> America/Adak -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 13 +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Atka[] ACE_TIME_PROGMEM = "America/Atka"; @@ -17272,8 +17336,9 @@ const extended::ZoneInfo kZoneAmerica_Atka ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Buenos_Aires -> America/Argentina/Buenos_Aires -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 21 +// Memory (8-bit): 32 +// Memory (32-bit): 41 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Buenos_Aires[] ACE_TIME_PROGMEM = "America/Buenos_Aires"; @@ -17288,8 +17353,9 @@ const extended::ZoneInfo kZoneAmerica_Buenos_Aires ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Catamarca -> America/Argentina/Catamarca -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Catamarca[] ACE_TIME_PROGMEM = "America/Catamarca"; @@ -17304,8 +17370,9 @@ const extended::ZoneInfo kZoneAmerica_Catamarca ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Cayman -> America/Panama -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Cayman[] ACE_TIME_PROGMEM = "America/Cayman"; @@ -17320,8 +17387,9 @@ const extended::ZoneInfo kZoneAmerica_Cayman ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Coral_Harbour -> America/Atikokan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 22 +// Memory (8-bit): 33 +// Memory (32-bit): 42 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Coral_Harbour[] ACE_TIME_PROGMEM = "America/Coral_Harbour"; @@ -17336,8 +17404,9 @@ const extended::ZoneInfo kZoneAmerica_Coral_Harbour ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Cordoba -> America/Argentina/Cordoba -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Cordoba[] ACE_TIME_PROGMEM = "America/Cordoba"; @@ -17352,8 +17421,9 @@ const extended::ZoneInfo kZoneAmerica_Cordoba ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Dominica -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Dominica[] ACE_TIME_PROGMEM = "America/Dominica"; @@ -17368,8 +17438,9 @@ const extended::ZoneInfo kZoneAmerica_Dominica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Ensenada -> America/Tijuana -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Ensenada[] ACE_TIME_PROGMEM = "America/Ensenada"; @@ -17384,8 +17455,9 @@ const extended::ZoneInfo kZoneAmerica_Ensenada ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Fort_Wayne -> America/Indiana/Indianapolis -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Fort_Wayne[] ACE_TIME_PROGMEM = "America/Fort_Wayne"; @@ -17400,8 +17472,9 @@ const extended::ZoneInfo kZoneAmerica_Fort_Wayne ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Godthab -> America/Nuuk -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Godthab[] ACE_TIME_PROGMEM = "America/Godthab"; @@ -17416,8 +17489,9 @@ const extended::ZoneInfo kZoneAmerica_Godthab ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Grenada -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Grenada[] ACE_TIME_PROGMEM = "America/Grenada"; @@ -17432,8 +17506,9 @@ const extended::ZoneInfo kZoneAmerica_Grenada ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Guadeloupe -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Guadeloupe[] ACE_TIME_PROGMEM = "America/Guadeloupe"; @@ -17448,8 +17523,9 @@ const extended::ZoneInfo kZoneAmerica_Guadeloupe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Indianapolis -> America/Indiana/Indianapolis -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 21 +// Memory (8-bit): 32 +// Memory (32-bit): 41 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Indianapolis[] ACE_TIME_PROGMEM = "America/Indianapolis"; @@ -17464,8 +17540,9 @@ const extended::ZoneInfo kZoneAmerica_Indianapolis ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Jujuy -> America/Argentina/Jujuy -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Jujuy[] ACE_TIME_PROGMEM = "America/Jujuy"; @@ -17480,8 +17557,9 @@ const extended::ZoneInfo kZoneAmerica_Jujuy ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Knox_IN -> America/Indiana/Knox -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Knox_IN[] ACE_TIME_PROGMEM = "America/Knox_IN"; @@ -17496,8 +17574,9 @@ const extended::ZoneInfo kZoneAmerica_Knox_IN ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Kralendijk -> America/Curacao -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Kralendijk[] ACE_TIME_PROGMEM = "America/Kralendijk"; @@ -17512,8 +17591,9 @@ const extended::ZoneInfo kZoneAmerica_Kralendijk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Louisville -> America/Kentucky/Louisville -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Louisville[] ACE_TIME_PROGMEM = "America/Louisville"; @@ -17528,8 +17608,9 @@ const extended::ZoneInfo kZoneAmerica_Louisville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Lower_Princes -> America/Curacao -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 22 +// Memory (8-bit): 33 +// Memory (32-bit): 42 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Lower_Princes[] ACE_TIME_PROGMEM = "America/Lower_Princes"; @@ -17544,8 +17625,9 @@ const extended::ZoneInfo kZoneAmerica_Lower_Princes ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Marigot -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Marigot[] ACE_TIME_PROGMEM = "America/Marigot"; @@ -17560,8 +17642,9 @@ const extended::ZoneInfo kZoneAmerica_Marigot ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Mendoza -> America/Argentina/Mendoza -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Mendoza[] ACE_TIME_PROGMEM = "America/Mendoza"; @@ -17576,8 +17659,9 @@ const extended::ZoneInfo kZoneAmerica_Mendoza ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Montreal -> America/Toronto -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Montreal[] ACE_TIME_PROGMEM = "America/Montreal"; @@ -17592,8 +17676,9 @@ const extended::ZoneInfo kZoneAmerica_Montreal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Montserrat -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Montserrat[] ACE_TIME_PROGMEM = "America/Montserrat"; @@ -17608,8 +17693,9 @@ const extended::ZoneInfo kZoneAmerica_Montserrat ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Porto_Acre -> America/Rio_Branco -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Porto_Acre[] ACE_TIME_PROGMEM = "America/Porto_Acre"; @@ -17624,8 +17710,9 @@ const extended::ZoneInfo kZoneAmerica_Porto_Acre ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Rosario -> America/Argentina/Cordoba -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Rosario[] ACE_TIME_PROGMEM = "America/Rosario"; @@ -17640,8 +17727,9 @@ const extended::ZoneInfo kZoneAmerica_Rosario ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Santa_Isabel -> America/Tijuana -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 21 +// Memory (8-bit): 32 +// Memory (32-bit): 41 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Santa_Isabel[] ACE_TIME_PROGMEM = "America/Santa_Isabel"; @@ -17656,8 +17744,9 @@ const extended::ZoneInfo kZoneAmerica_Santa_Isabel ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Shiprock -> America/Denver -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Shiprock[] ACE_TIME_PROGMEM = "America/Shiprock"; @@ -17672,8 +17761,9 @@ const extended::ZoneInfo kZoneAmerica_Shiprock ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Barthelemy -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 22 +// Memory (8-bit): 33 +// Memory (32-bit): 42 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_St_Barthelemy[] ACE_TIME_PROGMEM = "America/St_Barthelemy"; @@ -17688,8 +17778,9 @@ const extended::ZoneInfo kZoneAmerica_St_Barthelemy ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Kitts -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_St_Kitts[] ACE_TIME_PROGMEM = "America/St_Kitts"; @@ -17704,8 +17795,9 @@ const extended::ZoneInfo kZoneAmerica_St_Kitts ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Lucia -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_St_Lucia[] ACE_TIME_PROGMEM = "America/St_Lucia"; @@ -17720,8 +17812,9 @@ const extended::ZoneInfo kZoneAmerica_St_Lucia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Thomas -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_St_Thomas[] ACE_TIME_PROGMEM = "America/St_Thomas"; @@ -17736,8 +17829,9 @@ const extended::ZoneInfo kZoneAmerica_St_Thomas ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Vincent -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_St_Vincent[] ACE_TIME_PROGMEM = "America/St_Vincent"; @@ -17752,8 +17846,9 @@ const extended::ZoneInfo kZoneAmerica_St_Vincent ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Tortola -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Tortola[] ACE_TIME_PROGMEM = "America/Tortola"; @@ -17768,8 +17863,9 @@ const extended::ZoneInfo kZoneAmerica_Tortola ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Virgin -> America/Port_of_Spain -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAmerica_Virgin[] ACE_TIME_PROGMEM = "America/Virgin"; @@ -17784,8 +17880,9 @@ const extended::ZoneInfo kZoneAmerica_Virgin ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Antarctica/McMurdo -> Pacific/Auckland -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAntarctica_McMurdo[] ACE_TIME_PROGMEM = "Antarctica/McMurdo"; @@ -17800,8 +17897,9 @@ const extended::ZoneInfo kZoneAntarctica_McMurdo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Antarctica/South_Pole -> Pacific/Auckland -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 22 +// Memory (8-bit): 33 +// Memory (32-bit): 42 //--------------------------------------------------------------------------- static const char kZoneNameAntarctica_South_Pole[] ACE_TIME_PROGMEM = "Antarctica/South_Pole"; @@ -17816,8 +17914,9 @@ const extended::ZoneInfo kZoneAntarctica_South_Pole ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Arctic/Longyearbyen -> Europe/Oslo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 20 +// Memory (8-bit): 31 +// Memory (32-bit): 40 //--------------------------------------------------------------------------- static const char kZoneNameArctic_Longyearbyen[] ACE_TIME_PROGMEM = "Arctic/Longyearbyen"; @@ -17832,8 +17931,9 @@ const extended::ZoneInfo kZoneArctic_Longyearbyen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Aden -> Asia/Riyadh -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Aden[] ACE_TIME_PROGMEM = "Asia/Aden"; @@ -17848,8 +17948,9 @@ const extended::ZoneInfo kZoneAsia_Aden ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Ashkhabad -> Asia/Ashgabat -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Ashkhabad[] ACE_TIME_PROGMEM = "Asia/Ashkhabad"; @@ -17864,8 +17965,9 @@ const extended::ZoneInfo kZoneAsia_Ashkhabad ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Bahrain -> Asia/Qatar -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 13 +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Bahrain[] ACE_TIME_PROGMEM = "Asia/Bahrain"; @@ -17880,8 +17982,9 @@ const extended::ZoneInfo kZoneAsia_Bahrain ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Calcutta -> Asia/Kolkata -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Calcutta[] ACE_TIME_PROGMEM = "Asia/Calcutta"; @@ -17896,8 +17999,9 @@ const extended::ZoneInfo kZoneAsia_Calcutta ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Chongqing -> Asia/Shanghai -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Chongqing[] ACE_TIME_PROGMEM = "Asia/Chongqing"; @@ -17912,8 +18016,9 @@ const extended::ZoneInfo kZoneAsia_Chongqing ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Chungking -> Asia/Shanghai -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Chungking[] ACE_TIME_PROGMEM = "Asia/Chungking"; @@ -17928,8 +18033,9 @@ const extended::ZoneInfo kZoneAsia_Chungking ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Dacca -> Asia/Dhaka -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 11 +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Dacca[] ACE_TIME_PROGMEM = "Asia/Dacca"; @@ -17944,8 +18050,9 @@ const extended::ZoneInfo kZoneAsia_Dacca ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Harbin -> Asia/Shanghai -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Harbin[] ACE_TIME_PROGMEM = "Asia/Harbin"; @@ -17960,8 +18067,9 @@ const extended::ZoneInfo kZoneAsia_Harbin ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Istanbul -> Europe/Istanbul -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Istanbul[] ACE_TIME_PROGMEM = "Asia/Istanbul"; @@ -17976,8 +18084,9 @@ const extended::ZoneInfo kZoneAsia_Istanbul ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Kashgar -> Asia/Urumqi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 13 +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Kashgar[] ACE_TIME_PROGMEM = "Asia/Kashgar"; @@ -17992,8 +18101,9 @@ const extended::ZoneInfo kZoneAsia_Kashgar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Katmandu -> Asia/Kathmandu -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Katmandu[] ACE_TIME_PROGMEM = "Asia/Katmandu"; @@ -18008,8 +18118,9 @@ const extended::ZoneInfo kZoneAsia_Katmandu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Kuwait -> Asia/Riyadh -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Kuwait[] ACE_TIME_PROGMEM = "Asia/Kuwait"; @@ -18024,8 +18135,9 @@ const extended::ZoneInfo kZoneAsia_Kuwait ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Macao -> Asia/Macau -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 11 +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Macao[] ACE_TIME_PROGMEM = "Asia/Macao"; @@ -18040,8 +18152,9 @@ const extended::ZoneInfo kZoneAsia_Macao ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Muscat -> Asia/Dubai -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Muscat[] ACE_TIME_PROGMEM = "Asia/Muscat"; @@ -18056,8 +18169,9 @@ const extended::ZoneInfo kZoneAsia_Muscat ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Phnom_Penh -> Asia/Bangkok -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Phnom_Penh[] ACE_TIME_PROGMEM = "Asia/Phnom_Penh"; @@ -18072,8 +18186,9 @@ const extended::ZoneInfo kZoneAsia_Phnom_Penh ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Rangoon -> Asia/Yangon -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 13 +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Rangoon[] ACE_TIME_PROGMEM = "Asia/Rangoon"; @@ -18088,8 +18203,9 @@ const extended::ZoneInfo kZoneAsia_Rangoon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Saigon -> Asia/Ho_Chi_Minh -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Saigon[] ACE_TIME_PROGMEM = "Asia/Saigon"; @@ -18104,8 +18220,9 @@ const extended::ZoneInfo kZoneAsia_Saigon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Tel_Aviv -> Asia/Jerusalem -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Tel_Aviv[] ACE_TIME_PROGMEM = "Asia/Tel_Aviv"; @@ -18120,8 +18237,9 @@ const extended::ZoneInfo kZoneAsia_Tel_Aviv ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Thimbu -> Asia/Thimphu -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Thimbu[] ACE_TIME_PROGMEM = "Asia/Thimbu"; @@ -18136,8 +18254,9 @@ const extended::ZoneInfo kZoneAsia_Thimbu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Ujung_Pandang -> Asia/Makassar -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Ujung_Pandang[] ACE_TIME_PROGMEM = "Asia/Ujung_Pandang"; @@ -18152,8 +18271,9 @@ const extended::ZoneInfo kZoneAsia_Ujung_Pandang ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Ulan_Bator -> Asia/Ulaanbaatar -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Ulan_Bator[] ACE_TIME_PROGMEM = "Asia/Ulan_Bator"; @@ -18168,8 +18288,9 @@ const extended::ZoneInfo kZoneAsia_Ulan_Bator ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Vientiane -> Asia/Bangkok -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAsia_Vientiane[] ACE_TIME_PROGMEM = "Asia/Vientiane"; @@ -18184,8 +18305,9 @@ const extended::ZoneInfo kZoneAsia_Vientiane ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Atlantic/Faeroe -> Atlantic/Faroe -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAtlantic_Faeroe[] ACE_TIME_PROGMEM = "Atlantic/Faeroe"; @@ -18200,8 +18322,9 @@ const extended::ZoneInfo kZoneAtlantic_Faeroe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Atlantic/Jan_Mayen -> Europe/Oslo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAtlantic_Jan_Mayen[] ACE_TIME_PROGMEM = "Atlantic/Jan_Mayen"; @@ -18216,8 +18339,9 @@ const extended::ZoneInfo kZoneAtlantic_Jan_Mayen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Atlantic/St_Helena -> Africa/Abidjan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAtlantic_St_Helena[] ACE_TIME_PROGMEM = "Atlantic/St_Helena"; @@ -18232,8 +18356,9 @@ const extended::ZoneInfo kZoneAtlantic_St_Helena ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/ACT -> Australia/Sydney -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_ACT[] ACE_TIME_PROGMEM = "Australia/ACT"; @@ -18248,8 +18373,9 @@ const extended::ZoneInfo kZoneAustralia_ACT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Canberra -> Australia/Sydney -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_Canberra[] ACE_TIME_PROGMEM = "Australia/Canberra"; @@ -18264,8 +18390,9 @@ const extended::ZoneInfo kZoneAustralia_Canberra ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Currie -> Australia/Hobart -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_Currie[] ACE_TIME_PROGMEM = "Australia/Currie"; @@ -18280,8 +18407,9 @@ const extended::ZoneInfo kZoneAustralia_Currie ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/LHI -> Australia/Lord_Howe -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_LHI[] ACE_TIME_PROGMEM = "Australia/LHI"; @@ -18296,8 +18424,9 @@ const extended::ZoneInfo kZoneAustralia_LHI ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/NSW -> Australia/Sydney -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_NSW[] ACE_TIME_PROGMEM = "Australia/NSW"; @@ -18312,8 +18441,9 @@ const extended::ZoneInfo kZoneAustralia_NSW ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/North -> Australia/Darwin -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_North[] ACE_TIME_PROGMEM = "Australia/North"; @@ -18328,8 +18458,9 @@ const extended::ZoneInfo kZoneAustralia_North ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Queensland -> Australia/Brisbane -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 21 +// Memory (8-bit): 32 +// Memory (32-bit): 41 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_Queensland[] ACE_TIME_PROGMEM = "Australia/Queensland"; @@ -18344,8 +18475,9 @@ const extended::ZoneInfo kZoneAustralia_Queensland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/South -> Australia/Adelaide -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_South[] ACE_TIME_PROGMEM = "Australia/South"; @@ -18360,8 +18492,9 @@ const extended::ZoneInfo kZoneAustralia_South ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Tasmania -> Australia/Hobart -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_Tasmania[] ACE_TIME_PROGMEM = "Australia/Tasmania"; @@ -18376,8 +18509,9 @@ const extended::ZoneInfo kZoneAustralia_Tasmania ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Victoria -> Australia/Melbourne -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_Victoria[] ACE_TIME_PROGMEM = "Australia/Victoria"; @@ -18392,8 +18526,9 @@ const extended::ZoneInfo kZoneAustralia_Victoria ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/West -> Australia/Perth -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_West[] ACE_TIME_PROGMEM = "Australia/West"; @@ -18408,8 +18543,9 @@ const extended::ZoneInfo kZoneAustralia_West ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Yancowinna -> Australia/Broken_Hill -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 21 +// Memory (8-bit): 32 +// Memory (32-bit): 41 //--------------------------------------------------------------------------- static const char kZoneNameAustralia_Yancowinna[] ACE_TIME_PROGMEM = "Australia/Yancowinna"; @@ -18424,8 +18560,9 @@ const extended::ZoneInfo kZoneAustralia_Yancowinna ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Brazil/Acre -> America/Rio_Branco -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameBrazil_Acre[] ACE_TIME_PROGMEM = "Brazil/Acre"; @@ -18440,8 +18577,9 @@ const extended::ZoneInfo kZoneBrazil_Acre ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Brazil/DeNoronha -> America/Noronha -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameBrazil_DeNoronha[] ACE_TIME_PROGMEM = "Brazil/DeNoronha"; @@ -18456,8 +18594,9 @@ const extended::ZoneInfo kZoneBrazil_DeNoronha ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Brazil/East -> America/Sao_Paulo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameBrazil_East[] ACE_TIME_PROGMEM = "Brazil/East"; @@ -18472,8 +18611,9 @@ const extended::ZoneInfo kZoneBrazil_East ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Brazil/West -> America/Manaus -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameBrazil_West[] ACE_TIME_PROGMEM = "Brazil/West"; @@ -18488,8 +18628,9 @@ const extended::ZoneInfo kZoneBrazil_West ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Atlantic -> America/Halifax -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameCanada_Atlantic[] ACE_TIME_PROGMEM = "Canada/Atlantic"; @@ -18504,8 +18645,9 @@ const extended::ZoneInfo kZoneCanada_Atlantic ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Central -> America/Winnipeg -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameCanada_Central[] ACE_TIME_PROGMEM = "Canada/Central"; @@ -18520,8 +18662,9 @@ const extended::ZoneInfo kZoneCanada_Central ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Eastern -> America/Toronto -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameCanada_Eastern[] ACE_TIME_PROGMEM = "Canada/Eastern"; @@ -18536,8 +18679,9 @@ const extended::ZoneInfo kZoneCanada_Eastern ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Mountain -> America/Edmonton -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameCanada_Mountain[] ACE_TIME_PROGMEM = "Canada/Mountain"; @@ -18552,8 +18696,9 @@ const extended::ZoneInfo kZoneCanada_Mountain ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Newfoundland -> America/St_Johns -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 20 +// Memory (8-bit): 31 +// Memory (32-bit): 40 //--------------------------------------------------------------------------- static const char kZoneNameCanada_Newfoundland[] ACE_TIME_PROGMEM = "Canada/Newfoundland"; @@ -18568,8 +18713,9 @@ const extended::ZoneInfo kZoneCanada_Newfoundland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Pacific -> America/Vancouver -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameCanada_Pacific[] ACE_TIME_PROGMEM = "Canada/Pacific"; @@ -18584,8 +18730,9 @@ const extended::ZoneInfo kZoneCanada_Pacific ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Saskatchewan -> America/Regina -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 20 +// Memory (8-bit): 31 +// Memory (32-bit): 40 //--------------------------------------------------------------------------- static const char kZoneNameCanada_Saskatchewan[] ACE_TIME_PROGMEM = "Canada/Saskatchewan"; @@ -18600,8 +18747,9 @@ const extended::ZoneInfo kZoneCanada_Saskatchewan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Yukon -> America/Whitehorse -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 13 +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- static const char kZoneNameCanada_Yukon[] ACE_TIME_PROGMEM = "Canada/Yukon"; @@ -18616,8 +18764,9 @@ const extended::ZoneInfo kZoneCanada_Yukon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Chile/Continental -> America/Santiago -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameChile_Continental[] ACE_TIME_PROGMEM = "Chile/Continental"; @@ -18632,8 +18781,9 @@ const extended::ZoneInfo kZoneChile_Continental ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Chile/EasterIsland -> Pacific/Easter -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameChile_EasterIsland[] ACE_TIME_PROGMEM = "Chile/EasterIsland"; @@ -18648,8 +18798,9 @@ const extended::ZoneInfo kZoneChile_EasterIsland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Cuba -> America/Havana -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 5 +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- static const char kZoneNameCuba[] ACE_TIME_PROGMEM = "Cuba"; @@ -18664,8 +18815,9 @@ const extended::ZoneInfo kZoneCuba ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Egypt -> Africa/Cairo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 6 +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- static const char kZoneNameEgypt[] ACE_TIME_PROGMEM = "Egypt"; @@ -18680,8 +18832,9 @@ const extended::ZoneInfo kZoneEgypt ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Eire -> Europe/Dublin -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 5 +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- static const char kZoneNameEire[] ACE_TIME_PROGMEM = "Eire"; @@ -18696,8 +18849,9 @@ const extended::ZoneInfo kZoneEire ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/GMT+0 -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameEtc_GMT_PLUS_0[] ACE_TIME_PROGMEM = "Etc/GMT+0"; @@ -18712,8 +18866,9 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/GMT-0 -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameEtc_GMT_0[] ACE_TIME_PROGMEM = "Etc/GMT-0"; @@ -18728,8 +18883,9 @@ const extended::ZoneInfo kZoneEtc_GMT_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/GMT0 -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 9 +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- static const char kZoneNameEtc_GMT0[] ACE_TIME_PROGMEM = "Etc/GMT0"; @@ -18744,8 +18900,9 @@ const extended::ZoneInfo kZoneEtc_GMT0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/Greenwich -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameEtc_Greenwich[] ACE_TIME_PROGMEM = "Etc/Greenwich"; @@ -18760,8 +18917,9 @@ const extended::ZoneInfo kZoneEtc_Greenwich ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/UCT -> Etc/UTC -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 8 +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- static const char kZoneNameEtc_UCT[] ACE_TIME_PROGMEM = "Etc/UCT"; @@ -18776,8 +18934,9 @@ const extended::ZoneInfo kZoneEtc_UCT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/Universal -> Etc/UTC -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameEtc_Universal[] ACE_TIME_PROGMEM = "Etc/Universal"; @@ -18792,8 +18951,9 @@ const extended::ZoneInfo kZoneEtc_Universal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/Zulu -> Etc/UTC -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 9 +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- static const char kZoneNameEtc_Zulu[] ACE_TIME_PROGMEM = "Etc/Zulu"; @@ -18808,8 +18968,9 @@ const extended::ZoneInfo kZoneEtc_Zulu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Belfast -> Europe/London -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Belfast[] ACE_TIME_PROGMEM = "Europe/Belfast"; @@ -18824,8 +18985,9 @@ const extended::ZoneInfo kZoneEurope_Belfast ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Bratislava -> Europe/Prague -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Bratislava[] ACE_TIME_PROGMEM = "Europe/Bratislava"; @@ -18840,8 +19002,9 @@ const extended::ZoneInfo kZoneEurope_Bratislava ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Busingen -> Europe/Zurich -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Busingen[] ACE_TIME_PROGMEM = "Europe/Busingen"; @@ -18856,8 +19019,9 @@ const extended::ZoneInfo kZoneEurope_Busingen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Guernsey -> Europe/London -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Guernsey[] ACE_TIME_PROGMEM = "Europe/Guernsey"; @@ -18872,8 +19036,9 @@ const extended::ZoneInfo kZoneEurope_Guernsey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Isle_of_Man -> Europe/London -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 19 +// Memory (8-bit): 30 +// Memory (32-bit): 39 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Isle_of_Man[] ACE_TIME_PROGMEM = "Europe/Isle_of_Man"; @@ -18888,8 +19053,9 @@ const extended::ZoneInfo kZoneEurope_Isle_of_Man ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Jersey -> Europe/London -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Jersey[] ACE_TIME_PROGMEM = "Europe/Jersey"; @@ -18904,8 +19070,9 @@ const extended::ZoneInfo kZoneEurope_Jersey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Ljubljana -> Europe/Belgrade -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Ljubljana[] ACE_TIME_PROGMEM = "Europe/Ljubljana"; @@ -18920,8 +19087,9 @@ const extended::ZoneInfo kZoneEurope_Ljubljana ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Mariehamn -> Europe/Helsinki -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Mariehamn[] ACE_TIME_PROGMEM = "Europe/Mariehamn"; @@ -18936,8 +19104,9 @@ const extended::ZoneInfo kZoneEurope_Mariehamn ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Nicosia -> Asia/Nicosia -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Nicosia[] ACE_TIME_PROGMEM = "Europe/Nicosia"; @@ -18952,8 +19121,9 @@ const extended::ZoneInfo kZoneEurope_Nicosia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Podgorica -> Europe/Belgrade -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Podgorica[] ACE_TIME_PROGMEM = "Europe/Podgorica"; @@ -18968,8 +19138,9 @@ const extended::ZoneInfo kZoneEurope_Podgorica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/San_Marino -> Europe/Rome -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameEurope_San_Marino[] ACE_TIME_PROGMEM = "Europe/San_Marino"; @@ -18984,8 +19155,9 @@ const extended::ZoneInfo kZoneEurope_San_Marino ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Sarajevo -> Europe/Belgrade -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Sarajevo[] ACE_TIME_PROGMEM = "Europe/Sarajevo"; @@ -19000,8 +19172,9 @@ const extended::ZoneInfo kZoneEurope_Sarajevo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Skopje -> Europe/Belgrade -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Skopje[] ACE_TIME_PROGMEM = "Europe/Skopje"; @@ -19016,8 +19189,9 @@ const extended::ZoneInfo kZoneEurope_Skopje ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Tiraspol -> Europe/Chisinau -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Tiraspol[] ACE_TIME_PROGMEM = "Europe/Tiraspol"; @@ -19032,8 +19206,9 @@ const extended::ZoneInfo kZoneEurope_Tiraspol ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Vaduz -> Europe/Zurich -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 13 +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Vaduz[] ACE_TIME_PROGMEM = "Europe/Vaduz"; @@ -19048,8 +19223,9 @@ const extended::ZoneInfo kZoneEurope_Vaduz ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Vatican -> Europe/Rome -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Vatican[] ACE_TIME_PROGMEM = "Europe/Vatican"; @@ -19064,8 +19240,9 @@ const extended::ZoneInfo kZoneEurope_Vatican ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Zagreb -> Europe/Belgrade -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameEurope_Zagreb[] ACE_TIME_PROGMEM = "Europe/Zagreb"; @@ -19080,8 +19257,9 @@ const extended::ZoneInfo kZoneEurope_Zagreb ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GB -> Europe/London -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 3 +// Memory (8-bit): 14 +// Memory (32-bit): 23 //--------------------------------------------------------------------------- static const char kZoneNameGB[] ACE_TIME_PROGMEM = "GB"; @@ -19096,8 +19274,9 @@ const extended::ZoneInfo kZoneGB ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GB-Eire -> Europe/London -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 8 +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- static const char kZoneNameGB_Eire[] ACE_TIME_PROGMEM = "GB-Eire"; @@ -19112,8 +19291,9 @@ const extended::ZoneInfo kZoneGB_Eire ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 4 +// Memory (8-bit): 15 +// Memory (32-bit): 24 //--------------------------------------------------------------------------- static const char kZoneNameGMT[] ACE_TIME_PROGMEM = "GMT"; @@ -19128,8 +19308,9 @@ const extended::ZoneInfo kZoneGMT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT+0 -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 6 +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- static const char kZoneNameGMT_PLUS_0[] ACE_TIME_PROGMEM = "GMT+0"; @@ -19144,8 +19325,9 @@ const extended::ZoneInfo kZoneGMT_PLUS_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT-0 -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 6 +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- static const char kZoneNameGMT_0[] ACE_TIME_PROGMEM = "GMT-0"; @@ -19160,8 +19342,9 @@ const extended::ZoneInfo kZoneGMT_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT0 -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 5 +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- static const char kZoneNameGMT0[] ACE_TIME_PROGMEM = "GMT0"; @@ -19176,8 +19359,9 @@ const extended::ZoneInfo kZoneGMT0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Greenwich -> Etc/GMT -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameGreenwich[] ACE_TIME_PROGMEM = "Greenwich"; @@ -19192,8 +19376,9 @@ const extended::ZoneInfo kZoneGreenwich ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Hongkong -> Asia/Hong_Kong -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 9 +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- static const char kZoneNameHongkong[] ACE_TIME_PROGMEM = "Hongkong"; @@ -19208,8 +19393,9 @@ const extended::ZoneInfo kZoneHongkong ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Iceland -> Atlantic/Reykjavik -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 8 +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- static const char kZoneNameIceland[] ACE_TIME_PROGMEM = "Iceland"; @@ -19224,8 +19410,9 @@ const extended::ZoneInfo kZoneIceland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Indian/Antananarivo -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 20 +// Memory (8-bit): 31 +// Memory (32-bit): 40 //--------------------------------------------------------------------------- static const char kZoneNameIndian_Antananarivo[] ACE_TIME_PROGMEM = "Indian/Antananarivo"; @@ -19240,8 +19427,9 @@ const extended::ZoneInfo kZoneIndian_Antananarivo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Indian/Comoro -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNameIndian_Comoro[] ACE_TIME_PROGMEM = "Indian/Comoro"; @@ -19256,8 +19444,9 @@ const extended::ZoneInfo kZoneIndian_Comoro ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Indian/Mayotte -> Africa/Nairobi -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameIndian_Mayotte[] ACE_TIME_PROGMEM = "Indian/Mayotte"; @@ -19272,8 +19461,9 @@ const extended::ZoneInfo kZoneIndian_Mayotte ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Iran -> Asia/Tehran -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 5 +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- static const char kZoneNameIran[] ACE_TIME_PROGMEM = "Iran"; @@ -19288,8 +19478,9 @@ const extended::ZoneInfo kZoneIran ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Israel -> Asia/Jerusalem -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 7 +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- static const char kZoneNameIsrael[] ACE_TIME_PROGMEM = "Israel"; @@ -19304,8 +19495,9 @@ const extended::ZoneInfo kZoneIsrael ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Jamaica -> America/Jamaica -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 8 +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- static const char kZoneNameJamaica[] ACE_TIME_PROGMEM = "Jamaica"; @@ -19320,8 +19512,9 @@ const extended::ZoneInfo kZoneJamaica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Japan -> Asia/Tokyo -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 6 +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- static const char kZoneNameJapan[] ACE_TIME_PROGMEM = "Japan"; @@ -19336,8 +19529,9 @@ const extended::ZoneInfo kZoneJapan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Kwajalein -> Pacific/Kwajalein -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameKwajalein[] ACE_TIME_PROGMEM = "Kwajalein"; @@ -19352,8 +19546,9 @@ const extended::ZoneInfo kZoneKwajalein ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Libya -> Africa/Tripoli -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 6 +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- static const char kZoneNameLibya[] ACE_TIME_PROGMEM = "Libya"; @@ -19368,8 +19563,9 @@ const extended::ZoneInfo kZoneLibya ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Mexico/BajaNorte -> America/Tijuana -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNameMexico_BajaNorte[] ACE_TIME_PROGMEM = "Mexico/BajaNorte"; @@ -19384,8 +19580,9 @@ const extended::ZoneInfo kZoneMexico_BajaNorte ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Mexico/BajaSur -> America/Mazatlan -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameMexico_BajaSur[] ACE_TIME_PROGMEM = "Mexico/BajaSur"; @@ -19400,8 +19597,9 @@ const extended::ZoneInfo kZoneMexico_BajaSur ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Mexico/General -> America/Mexico_City -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNameMexico_General[] ACE_TIME_PROGMEM = "Mexico/General"; @@ -19416,8 +19614,9 @@ const extended::ZoneInfo kZoneMexico_General ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: NZ -> Pacific/Auckland -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 3 +// Memory (8-bit): 14 +// Memory (32-bit): 23 //--------------------------------------------------------------------------- static const char kZoneNameNZ[] ACE_TIME_PROGMEM = "NZ"; @@ -19432,8 +19631,9 @@ const extended::ZoneInfo kZoneNZ ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: NZ-CHAT -> Pacific/Chatham -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 8 +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- static const char kZoneNameNZ_CHAT[] ACE_TIME_PROGMEM = "NZ-CHAT"; @@ -19448,8 +19648,9 @@ const extended::ZoneInfo kZoneNZ_CHAT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Navajo -> America/Denver -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 7 +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- static const char kZoneNameNavajo[] ACE_TIME_PROGMEM = "Navajo"; @@ -19464,8 +19665,9 @@ const extended::ZoneInfo kZoneNavajo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: PRC -> Asia/Shanghai -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 4 +// Memory (8-bit): 15 +// Memory (32-bit): 24 //--------------------------------------------------------------------------- static const char kZoneNamePRC[] ACE_TIME_PROGMEM = "PRC"; @@ -19480,8 +19682,9 @@ const extended::ZoneInfo kZonePRC ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Johnston -> Pacific/Honolulu -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 17 +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- static const char kZoneNamePacific_Johnston[] ACE_TIME_PROGMEM = "Pacific/Johnston"; @@ -19496,8 +19699,9 @@ const extended::ZoneInfo kZonePacific_Johnston ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Midway -> Pacific/Pago_Pago -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNamePacific_Midway[] ACE_TIME_PROGMEM = "Pacific/Midway"; @@ -19512,8 +19716,9 @@ const extended::ZoneInfo kZonePacific_Midway ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Ponape -> Pacific/Pohnpei -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNamePacific_Ponape[] ACE_TIME_PROGMEM = "Pacific/Ponape"; @@ -19528,8 +19733,9 @@ const extended::ZoneInfo kZonePacific_Ponape ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Saipan -> Pacific/Guam -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 15 +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- static const char kZoneNamePacific_Saipan[] ACE_TIME_PROGMEM = "Pacific/Saipan"; @@ -19544,8 +19750,9 @@ const extended::ZoneInfo kZonePacific_Saipan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Samoa -> Pacific/Pago_Pago -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 14 +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- static const char kZoneNamePacific_Samoa[] ACE_TIME_PROGMEM = "Pacific/Samoa"; @@ -19560,8 +19767,9 @@ const extended::ZoneInfo kZonePacific_Samoa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Truk -> Pacific/Chuuk -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 13 +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- static const char kZoneNamePacific_Truk[] ACE_TIME_PROGMEM = "Pacific/Truk"; @@ -19576,8 +19784,9 @@ const extended::ZoneInfo kZonePacific_Truk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Yap -> Pacific/Chuuk -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNamePacific_Yap[] ACE_TIME_PROGMEM = "Pacific/Yap"; @@ -19592,8 +19801,9 @@ const extended::ZoneInfo kZonePacific_Yap ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Poland -> Europe/Warsaw -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 7 +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- static const char kZoneNamePoland[] ACE_TIME_PROGMEM = "Poland"; @@ -19608,8 +19818,9 @@ const extended::ZoneInfo kZonePoland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Portugal -> Europe/Lisbon -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 9 +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- static const char kZoneNamePortugal[] ACE_TIME_PROGMEM = "Portugal"; @@ -19624,8 +19835,9 @@ const extended::ZoneInfo kZonePortugal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: ROC -> Asia/Taipei -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 4 +// Memory (8-bit): 15 +// Memory (32-bit): 24 //--------------------------------------------------------------------------- static const char kZoneNameROC[] ACE_TIME_PROGMEM = "ROC"; @@ -19640,8 +19852,9 @@ const extended::ZoneInfo kZoneROC ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: ROK -> Asia/Seoul -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 4 +// Memory (8-bit): 15 +// Memory (32-bit): 24 //--------------------------------------------------------------------------- static const char kZoneNameROK[] ACE_TIME_PROGMEM = "ROK"; @@ -19656,8 +19869,9 @@ const extended::ZoneInfo kZoneROK ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Singapore -> Asia/Singapore -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameSingapore[] ACE_TIME_PROGMEM = "Singapore"; @@ -19672,8 +19886,9 @@ const extended::ZoneInfo kZoneSingapore ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Turkey -> Europe/Istanbul -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 7 +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- static const char kZoneNameTurkey[] ACE_TIME_PROGMEM = "Turkey"; @@ -19688,8 +19903,9 @@ const extended::ZoneInfo kZoneTurkey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: UCT -> Etc/UTC -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 4 +// Memory (8-bit): 15 +// Memory (32-bit): 24 //--------------------------------------------------------------------------- static const char kZoneNameUCT[] ACE_TIME_PROGMEM = "UCT"; @@ -19704,8 +19920,9 @@ const extended::ZoneInfo kZoneUCT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Alaska -> America/Anchorage -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameUS_Alaska[] ACE_TIME_PROGMEM = "US/Alaska"; @@ -19720,8 +19937,9 @@ const extended::ZoneInfo kZoneUS_Alaska ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Aleutian -> America/Adak -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameUS_Aleutian[] ACE_TIME_PROGMEM = "US/Aleutian"; @@ -19736,8 +19954,9 @@ const extended::ZoneInfo kZoneUS_Aleutian ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Arizona -> America/Phoenix -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 11 +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- static const char kZoneNameUS_Arizona[] ACE_TIME_PROGMEM = "US/Arizona"; @@ -19752,8 +19971,9 @@ const extended::ZoneInfo kZoneUS_Arizona ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Central -> America/Chicago -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 11 +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- static const char kZoneNameUS_Central[] ACE_TIME_PROGMEM = "US/Central"; @@ -19768,8 +19988,9 @@ const extended::ZoneInfo kZoneUS_Central ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/East-Indiana -> America/Indiana/Indianapolis -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 16 +// Memory (8-bit): 27 +// Memory (32-bit): 36 //--------------------------------------------------------------------------- static const char kZoneNameUS_East_Indiana[] ACE_TIME_PROGMEM = "US/East-Indiana"; @@ -19784,8 +20005,9 @@ const extended::ZoneInfo kZoneUS_East_Indiana ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Eastern -> America/New_York -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 11 +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- static const char kZoneNameUS_Eastern[] ACE_TIME_PROGMEM = "US/Eastern"; @@ -19800,8 +20022,9 @@ const extended::ZoneInfo kZoneUS_Eastern ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Hawaii -> Pacific/Honolulu -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameUS_Hawaii[] ACE_TIME_PROGMEM = "US/Hawaii"; @@ -19816,8 +20039,9 @@ const extended::ZoneInfo kZoneUS_Hawaii ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Indiana-Starke -> America/Indiana/Knox -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 18 +// Memory (8-bit): 29 +// Memory (32-bit): 38 //--------------------------------------------------------------------------- static const char kZoneNameUS_Indiana_Starke[] ACE_TIME_PROGMEM = "US/Indiana-Starke"; @@ -19832,8 +20056,9 @@ const extended::ZoneInfo kZoneUS_Indiana_Starke ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Michigan -> America/Detroit -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameUS_Michigan[] ACE_TIME_PROGMEM = "US/Michigan"; @@ -19848,8 +20073,9 @@ const extended::ZoneInfo kZoneUS_Michigan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Mountain -> America/Denver -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 12 +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- static const char kZoneNameUS_Mountain[] ACE_TIME_PROGMEM = "US/Mountain"; @@ -19864,8 +20090,9 @@ const extended::ZoneInfo kZoneUS_Mountain ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Pacific -> America/Los_Angeles -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 11 +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- static const char kZoneNameUS_Pacific[] ACE_TIME_PROGMEM = "US/Pacific"; @@ -19880,8 +20107,9 @@ const extended::ZoneInfo kZoneUS_Pacific ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Samoa -> Pacific/Pago_Pago -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 9 +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- static const char kZoneNameUS_Samoa[] ACE_TIME_PROGMEM = "US/Samoa"; @@ -19896,8 +20124,9 @@ const extended::ZoneInfo kZoneUS_Samoa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: UTC -> Etc/UTC -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 4 +// Memory (8-bit): 15 +// Memory (32-bit): 24 //--------------------------------------------------------------------------- static const char kZoneNameUTC[] ACE_TIME_PROGMEM = "UTC"; @@ -19912,8 +20141,9 @@ const extended::ZoneInfo kZoneUTC ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Universal -> Etc/UTC -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 10 +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- static const char kZoneNameUniversal[] ACE_TIME_PROGMEM = "Universal"; @@ -19928,8 +20158,9 @@ const extended::ZoneInfo kZoneUniversal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: W-SU -> Europe/Moscow -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 5 +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- static const char kZoneNameW_SU[] ACE_TIME_PROGMEM = "W-SU"; @@ -19944,8 +20175,9 @@ const extended::ZoneInfo kZoneW_SU ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Zulu -> Etc/UTC -// Memory (8-bit): 11 -// Memory (32-bit): 20 +// Strings (bytes): 5 +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- static const char kZoneNameZulu[] ACE_TIME_PROGMEM = "Zulu"; diff --git a/src/ace_time/zonedbx/zone_policies.cpp b/src/ace_time/zonedbx/zone_policies.cpp index 941bb8331..86a505962 100644 --- a/src/ace_time/zonedbx/zone_policies.cpp +++ b/src/ace_time/zonedbx/zone_policies.cpp @@ -26,8 +26,9 @@ // // Policies: 84 // Rules: 551 -// Memory (8-bit): 5504 -// Memory (32-bit): 7707 +// Letter Size (bytes): 27 +// Total Memory 8-bit (bytes): 5504 +// Total Memory 32-bit (bytes): 7707 // // DO NOT EDIT From 65de4b04a8136ba271dd37ee55660c0ad01fe067 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 11:57:13 -0800 Subject: [PATCH 39/74] src/ZoneRegistrar.h: Simplify by removing unused STRCMP_P and STRCMP_PP template parameters --- src/ace_time/ZoneRegistrar.h | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/src/ace_time/ZoneRegistrar.h b/src/ace_time/ZoneRegistrar.h index 40a00c594..bcb28fa91 100644 --- a/src/ace_time/ZoneRegistrar.h +++ b/src/ace_time/ZoneRegistrar.h @@ -7,7 +7,6 @@ #define ACE_TIME_ZONE_REGISTRAR_H #include -#include // strcmp(), strcmp_P() #include // KString #include "common/compat.h" // ACE_TIME_USE_PROGMEM #include "internal/ZoneInfo.h" @@ -29,9 +28,6 @@ class __FlashStringHelper; namespace ace_time { -/** Typedef for functions that work like a strcmp(). */ -typedef int (*strcmp_t)(const char*, const char*); - /** * Class that allows looking up the ZoneInfo (ZI) from its TZDB identifier * (e.g. "America/Los_Angeles"), zoneId (hash from its name), or the index in @@ -40,13 +36,8 @@ typedef int (*strcmp_t)(const char*, const char*); * @tparam ZI ZoneInfo type (e.g. basic::ZoneInfo) * @tparam ZRB ZoneRegistryBroker type (e.g. basic::ZoneRegistryBroker) * @tparam ZIB ZoneInfoBroker type (e.g. basic::ZoneInfoBroker) - * @tparam STRCMP_P a function that compares a normal string to flash string - * (e.g strcmp_P()) - * @tparam STRCMP_PP a function that compares 2 flash strings (must be custom - * written) */ -template +template class ZoneRegistrar { public: /** Invalid index to indicate error or not found. */ @@ -230,27 +221,23 @@ class ZoneRegistrar { * Concrete template instantiation of ZoneRegistrar for basic::ZoneInfo, which * can be used with BasicZoneProcessor. */ -#if ACE_TIME_USE_PROGMEM -typedef ZoneRegistrar +typedef ZoneRegistrar< + basic::ZoneInfo, + basic::ZoneRegistryBroker, + basic::ZoneInfoBroker + > BasicZoneRegistrar; -#else -typedef ZoneRegistrar BasicZoneRegistrar; -#endif /** * Concrete template instantiation of ZoneRegistrar for extended::ZoneInfo, * which can be used with ExtendedZoneProcessor. */ -#if ACE_TIME_USE_PROGMEM -typedef ZoneRegistrar +typedef ZoneRegistrar< + extended::ZoneInfo, + extended::ZoneRegistryBroker, + extended::ZoneInfoBroker + > ExtendedZoneRegistrar; -#else -typedef ZoneRegistrar ExtendedZoneRegistrar; -#endif } From 3f236b3cabb9a778de8a7d763beb8cb4103d9570 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 12:05:55 -0800 Subject: [PATCH 40/74] src/compat.h: Remove obsolete strcmp_P, strcmp_PP, acetime_strcmp_P, strchr_P, strrchr_P --- src/ace_time/common/compat.h | 39 +----------------------------------- 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/src/ace_time/common/compat.h b/src/ace_time/common/compat.h index 4f078c447..e8735a0f8 100644 --- a/src/ace_time/common/compat.h +++ b/src/ace_time/common/compat.h @@ -26,22 +26,15 @@ #define ACE_TIME_PROGMEM #endif -// Include the correct pgmspace.h depending on architecture. Define a -// consistent acetime_strcmp_P() which can be passed as a function pointer -// into the ZoneManager template class. +// Include the correct pgmspace.h depending on architecture. #if defined(ARDUINO_ARCH_AVR) #include #define FPSTR(p) (reinterpret_cast(p)) - #define acetime_strcmp_P strcmp_P #elif defined(ARDUINO_ARCH_SAMD) #include #define FPSTR(p) (reinterpret_cast(p)) - // strcmp_P(a,b) is defined to be strcmp(a,b), but we need a function - // pointer, so map it directly to strcmp() - #define acetime_strcmp_P strcmp - // Set this to 1 to clobber SERIAL_PORT_MONITOR to SerialUSB on // an original Arduino Zero when using the Native port. See USER_GUIDE.md for // more info. @@ -55,33 +48,11 @@ #include #define FPSTR(p) (reinterpret_cast(p)) - // Teensyduino defines strcmp_P(a, b) as strcmp(a,b), which cannot be - // passed as a function pointer, so we have to use strcmp() directly. - #define acetime_strcmp_P strcmp - #elif defined(ESP8266) #include - #include - - // ESP8266 2.5.2 defines strcmp_P() as a macro function, but we need a real - // function. - inline int acetime_strcmp_P(const char* str1, const char* str2P) { - return strcmp_P((str1), (str2P)); - } - - // ESP8266 2.5.2 doesn't have these so use versions from AceCommon - using ace_common::strchr_P; - using ace_common::strrchr_P; #elif defined(ESP32) #include - #include - - #define acetime_strcmp_P strcmp_P - - // ESP32 1.0.4 doesn't have these so use versions from AceCommon - using ace_common::strchr_P; - using ace_common::strrchr_P; // ESP32 does not define SERIAL_PORT_MONITOR. Define it unless another // library has already defined it. @@ -91,22 +62,14 @@ #elif defined(UNIX_HOST_DUINO) #include - #define acetime_strcmp_P strcmp_P - - #elif defined(ARDUINO_ARCH_STM32) #include #define FPSTR(p) (reinterpret_cast(p)) - // strcmp_P(a,b) is defined to be strcmp(a,b), but we need a function - // pointer, so map it directly to strcmp() - #define acetime_strcmp_P strcmp - #undef SERIAL_PORT_MONITOR #define SERIAL_PORT_MONITOR Serial - #else #error Unsupported platform #endif From 55a816636ea31678ae29c498088e5a9b99af782a Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 12:37:45 -0800 Subject: [PATCH 41/74] src/Brokers.h: Reformat and clarify comments, no code change --- src/ace_time/internal/Brokers.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ace_time/internal/Brokers.h b/src/ace_time/internal/Brokers.h index ee6698014..e6ba9dc6d 100644 --- a/src/ace_time/internal/Brokers.h +++ b/src/ace_time/internal/Brokers.h @@ -11,25 +11,25 @@ * * The classes provide a thin layer of indirection for accessing the * zoneinfo files stored in the zonedb/ and zonedbx/ directories. When - * ACE_TIME_USE_PROGMEM or ACE_TIME_USE_PROGMEM are enabled, the - * zoneinfo files are stored in flash memory (using the PROGMEM keyword), and - * cannot be accessed directly on microcontrollers using the Harvard - * architecture (e.g. AVR) where data and program live in 2 different address - * spaces. The data in flash memory must be accessed using helper routines in - * . These classes abstract away this difference so that the code - * BasicZoneProcessor and ExtendedZoneProcessor can be written to be (mostly) - * agnostic to how the zoneinfo files are stored. + * ACE_TIME_USE_PROGMEM is enabled, the zoneinfo files are stored in flash + * memory (using the PROGMEM keyword), and cannot be accessed directly on + * microcontrollers using the Harvard architecture (e.g. AVR) where data and + * program live in 2 different address spaces. The data in flash memory must be + * accessed using helper routines in . These classes abstract away + * this difference so that the code BasicZoneProcessor and + * ExtendedZoneProcessor can be written to be (mostly) agnostic to how the + * zoneinfo files are stored. * - * When ACE_TIME_USE_PROGMEM are disabled, the compiler will optimize away this + * When ACE_TIME_USE_PROGMEM is disabled, the compiler will optimize away this * entire abstraction layer, so the resulting machine code is no bigger than - * (and in most cases, identifical to) accessing the zoneinfo files directly. + * (and in most cases, identical to) accessing the zoneinfo files directly. * * The abstraction layer is thin enough that the code in BasicZoneProcessor and * ExtendedZoneProcessor did not change very much. It was mostly a mechanical * source code replacement of direct zoneinfo access to using these data * brokers. * - * The helper functions live in the internal:: namespace. The classes are + * The helper functions live in the `internal::` namespace. The classes are * somewhat duplicated between the 'basic' and 'extended' namespaces. They used * to be identical so that they could be templatized. But supporting one-minute * resolution for 'extended' meant that the implementations diverged, so I had From 45927534f4e4c681e3bf8b8d41640a918e7a3533 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 14:26:16 -0800 Subject: [PATCH 42/74] CHANGELOG.md: Add info about zoneName compression, and API changes to BasicZone, ExtendedZone --- CHANGELOG.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3eeb5ddc..361dc0434 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ final verification against the exact `zoneName` is performed to make sure that there was no hash collision. Updated `AutoBenchmark.ino` to determine that a binary search on the 386 zones in `zonedbx/zone_registry.cpp` is - 10X faster (on average) than a linear search through the same list. + 9-10X faster (on average) than a linear search through the same list. (Linear search takes ~190 iterations; binary search takes ~9 iterations.) * Remove `transitionBufSize` from `ZoneInfo` struct, and migrate to `kZoneBufSize{xxx}` constants in the `zone_infos.h` files. This was used @@ -21,6 +21,19 @@ `Extended{xxx}` tests. Saves 1 byte per Zone on 8-bit processors, but none on 32-bit processors due to 4-byte alignment. This has no impact on client code since this field was used only for validation testing. + * Implement zoneName compression using `ace_common::KString`. Saves about + 1500 bytes for basic `zonedb` info files, and 2500 bytes for extended + `zonedbx` info files. + * **Breaking Change**: Replace `BasicZone::name()` and `shortName() + with `printNameTo()` and `printShortNameTo()`. Same with + `ExtendedZone::name()` and `shortName()`, replaced with `printNameTo()` + and `printShortNameTo()`. After implementing zoneName compression, it was + no longer possible to return a simple pointer to the `name` and + `shortName` without using static memory buffers. I expect almost no one to + be using the `BasicZone` and `ExtendedZone` classes, since they are mostly + useful for internal algorithms. Client code that needs the old + functionality can print to a `ace_common::PrintStr<>` object, then extract + the c-string using `PrintStr::getCstr()`. * 1.4.1 (2020-12-30, TZDB version 2020f for real) * Actually update `src/ace_time/zonedb` and `src/ace_time/zonedbx` zone info files to 2020f. Oops. From dfef29ec4f38f23d91144a5afff354e5d6b9430d Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 17:34:46 -0800 Subject: [PATCH 43/74] MemoryBenchmark: zoneName compression increases flash/ram (~250/12) for small number of zones, but decreases by 1200-2400 bytes when all zones are loaded --- examples/MemoryBenchmark/README.md | 135 ++++++++++---------- examples/MemoryBenchmark/esp32.txt | 28 ++-- examples/MemoryBenchmark/esp8266.txt | 20 +-- examples/MemoryBenchmark/generate_readme.py | 5 + examples/MemoryBenchmark/micro.txt | 20 +-- examples/MemoryBenchmark/nano.txt | 20 +-- examples/MemoryBenchmark/samd.txt | 20 +-- examples/MemoryBenchmark/teensy32.txt | 20 +-- 8 files changed, 139 insertions(+), 129 deletions(-) diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index 1827bdf5a..77fb479d8 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -52,6 +52,11 @@ processors due to 4-byte alignment). We save 266 bytes for `BasicZoneManager` and 386 bytes for `ExtendedZoneManager` when all the zones are loaded into the zone registry. +Also for v1.4.1+, incorporating zoneName compression causes flash/ram usage to +increase by ~250/120 bytes when using only 1-2 zones, but *decreases* flash +consumption by 1200-2400 bytes when all the zones are loaded into the +`ZoneManager`. + ## Arduino Nano * Arduino IDE 1.8.13 @@ -66,18 +71,18 @@ zone registry. | LocalDateTime | 1648/ 123 | 1200/ 113 | | ZonedDateTime | 2440/ 123 | 1992/ 113 | | Manual ZoneManager | 2684/ 123 | 2236/ 113 | -| Basic TimeZone (1 zone) | 6910/ 187 | 6462/ 177 | -| Basic TimeZone (2 zones) | 7486/ 193 | 7038/ 183 | -| Basic ZoneManager (1 zone) | 8428/ 213 | 7980/ 203 | -| Basic ZoneManager (all) | 22940/ 591 | 22492/ 581 | -| Extended TimeZone (1 zone) | 9688/ 187 | 9240/ 177 | -| Extended TimeZone (2 zones) | 10164/ 193 | 9716/ 183 | -| Extended ZoneManager (1 zone) | 11366/ 213 | 10918/ 203 | -| Extended ZoneManager (all) | 35846/ 697 | 35398/ 687 | +| Basic TimeZone (1 zone) | 7168/ 309 | 6720/ 299 | +| Basic TimeZone (2 zones) | 7736/ 313 | 7288/ 303 | +| Basic ZoneManager (1 zone) | 8816/ 335 | 8368/ 325 | +| Basic ZoneManager (all) | 21800/ 711 | 21352/ 701 | +| Extended TimeZone (1 zone) | 9982/ 343 | 9534/ 333 | +| Extended TimeZone (2 zones) | 10450/ 347 | 10002/ 337 | +| Extended ZoneManager (1 zone) | 11790/ 369 | 11342/ 359 | +| Extended ZoneManager (all) | 33844/ 853 | 33396/ 843 | |---------------------------------+--------------+-------------| | SystemClock | 5662/ 282 | 5214/ 272 | -| SystemClock+Basic TimeZone | 9990/ 334 | 9542/ 324 | -| SystemClock+Extended TimeZone | 12994/ 334 | 12546/ 324 | +| SystemClock+Basic TimeZone | 10248/ 456 | 9800/ 446 | +| SystemClock+Extended TimeZone | 13288/ 490 | 12840/ 480 | +--------------------------------------------------------------+ ``` @@ -96,18 +101,18 @@ zone registry. | LocalDateTime | 4772/ 263 | 1308/ 113 | | ZonedDateTime | 5564/ 263 | 2100/ 113 | | Manual ZoneManager | 5808/ 263 | 2344/ 113 | -| Basic TimeZone (1 zone) | 10012/ 327 | 6548/ 177 | -| Basic TimeZone (2 zones) | 10586/ 331 | 7122/ 181 | -| Basic ZoneManager (1 zone) | 11530/ 353 | 8066/ 203 | -| Basic ZoneManager (all) | 26040/ 729 | 22576/ 579 | -| Extended TimeZone (1 zone) | 12790/ 327 | 9326/ 177 | -| Extended TimeZone (2 zones) | 13264/ 331 | 9800/ 181 | -| Extended ZoneManager (1 zone) | 14468/ 353 | 11004/ 203 | -| Extended ZoneManager (all) | 38948/ 837 | 35484/ 687 | +| Basic TimeZone (1 zone) | 10268/ 447 | 6804/ 297 | +| Basic TimeZone (2 zones) | 10838/ 453 | 7374/ 303 | +| Basic ZoneManager (1 zone) | 11916/ 473 | 8452/ 323 | +| Basic ZoneManager (all) | 24902/ 851 | 21438/ 701 | +| Extended TimeZone (1 zone) | 13082/ 481 | 9618/ 331 | +| Extended TimeZone (2 zones) | 13552/ 487 | 10088/ 337 | +| Extended ZoneManager (1 zone) | 14890/ 507 | 11426/ 357 | +| Extended ZoneManager (all) | 36944/ 991 | 33480/ 841 | |---------------------------------+--------------+-------------| | SystemClock | 8646/ 422 | 5182/ 272 | -| SystemClock+Basic TimeZone | 12974/ 474 | 9510/ 324 | -| SystemClock+Extended TimeZone | 15978/ 474 | 12514/ 324 | +| SystemClock+Basic TimeZone | 13230/ 594 | 9766/ 444 | +| SystemClock+Extended TimeZone | 16270/ 628 | 12806/ 478 | +--------------------------------------------------------------+ ``` @@ -126,18 +131,18 @@ zone registry. | LocalDateTime | 10920/ 0 | 856/ 0 | | ZonedDateTime | 11160/ 0 | 1096/ 0 | | Manual ZoneManager | 11184/ 0 | 1120/ 0 | -| Basic TimeZone (1 zone) | 15044/ 0 | 4980/ 0 | -| Basic TimeZone (2 zones) | 15436/ 0 | 5372/ 0 | -| Basic ZoneManager (1 zone) | 15972/ 0 | 5908/ 0 | -| Basic ZoneManager (all) | 35004/ 0 | 24940/ 0 | -| Extended TimeZone (1 zone) | 16820/ 0 | 6756/ 0 | -| Extended TimeZone (2 zones) | 17244/ 0 | 7180/ 0 | -| Extended ZoneManager (1 zone) | 17748/ 0 | 7684/ 0 | -| Extended ZoneManager (all) | 50196/ 0 | 40132/ 0 | +| Basic TimeZone (1 zone) | 15300/ 0 | 5236/ 0 | +| Basic TimeZone (2 zones) | 15684/ 0 | 5620/ 0 | +| Basic ZoneManager (1 zone) | 16332/ 0 | 6268/ 0 | +| Basic ZoneManager (all) | 33844/ 0 | 23780/ 0 | +| Extended TimeZone (1 zone) | 17108/ 0 | 7044/ 0 | +| Extended TimeZone (2 zones) | 17532/ 0 | 7468/ 0 | +| Extended ZoneManager (1 zone) | 18140/ 0 | 8076/ 0 | +| Extended ZoneManager (all) | 48164/ 0 | 38100/ 0 | |---------------------------------+--------------+-------------| | SystemClock | 13264/ 0 | 3200/ 0 | -| SystemClock+Basic TimeZone | 16684/ 0 | 6620/ 0 | -| SystemClock+Extended TimeZone | 18644/ 0 | 8580/ 0 | +| SystemClock+Basic TimeZone | 16940/ 0 | 6876/ 0 | +| SystemClock+Extended TimeZone | 18932/ 0 | 8868/ 0 | +--------------------------------------------------------------+ ``` @@ -158,18 +163,18 @@ zone registry. | LocalDateTime | 258820/27264 | 2120/ 488 | | ZonedDateTime | 259492/27264 | 2792/ 488 | | Manual ZoneManager | 259540/27264 | 2840/ 488 | -| Basic TimeZone (1 zone) | 264792/27676 | 8092/ 900 | -| Basic TimeZone (2 zones) | 265016/27676 | 8316/ 900 | -| Basic ZoneManager (1 zone) | 265768/27676 | 9068/ 900 | -| Basic ZoneManager (all) | 284952/27676 | 28252/ 900 | -| Extended TimeZone (1 zone) | 266800/27788 | 10100/ 1012 | -| Extended TimeZone (2 zones) | 267120/27788 | 10420/ 1012 | -| Extended ZoneManager (1 zone) | 267792/27788 | 11092/ 1012 | -| Extended ZoneManager (all) | 300468/27792 | 43768/ 1016 | +| Basic TimeZone (1 zone) | 265228/27824 | 8528/ 1048 | +| Basic TimeZone (2 zones) | 265452/27824 | 8752/ 1048 | +| Basic ZoneManager (1 zone) | 266348/27824 | 9648/ 1048 | +| Basic ZoneManager (all) | 283980/27824 | 27280/ 1048 | +| Extended TimeZone (1 zone) | 267292/27968 | 10592/ 1192 | +| Extended TimeZone (2 zones) | 267580/27968 | 10880/ 1192 | +| Extended ZoneManager (1 zone) | 268412/27968 | 11712/ 1192 | +| Extended ZoneManager (all) | 298608/27980 | 41908/ 1204 | |---------------------------------+--------------+-------------| | SystemClock | 262268/27276 | 5568/ 500 | -| SystemClock+Basic TimeZone | 267188/27676 | 10488/ 900 | -| SystemClock+Extended TimeZone | 269452/27788 | 12752/ 1012 | +| SystemClock+Basic TimeZone | 267624/27824 | 10924/ 1048 | +| SystemClock+Extended TimeZone | 269944/27968 | 13244/ 1192 | +--------------------------------------------------------------+ ``` @@ -185,21 +190,21 @@ zone registry. |---------------------------------+--------------+-------------| | Baseline | 206435/14564 | 0/ 0 | |---------------------------------+--------------+-------------| -| LocalDateTime | 218233/16100 | 11798/ 1536 | -| ZonedDateTime | 219037/16100 | 12602/ 1536 | -| Manual ZoneManager | 219069/16100 | 12634/ 1536 | -| Basic TimeZone (1 zone) | 222729/16100 | 16294/ 1536 | -| Basic TimeZone (2 zones) | 222981/16100 | 16546/ 1536 | -| Basic ZoneManager (1 zone) | 223461/16100 | 17026/ 1536 | -| Basic ZoneManager (all) | 242749/16100 | 36314/ 1536 | -| Extended TimeZone (1 zone) | 224617/16100 | 18182/ 1536 | -| Extended TimeZone (2 zones) | 224893/16100 | 18458/ 1536 | -| Extended ZoneManager (1 zone) | 225445/16100 | 19010/ 1536 | -| Extended ZoneManager (all) | 258213/16100 | 51778/ 1536 | -|---------------------------------+--------------+-------------| -| SystemClock | 225821/16204 | 19386/ 1640 | -| SystemClock+Basic TimeZone | 229413/16204 | 22978/ 1640 | -| SystemClock+Extended TimeZone | 231365/16204 | 24930/ 1640 | +| LocalDateTime | 218425/16116 | 11990/ 1552 | +| ZonedDateTime | 219229/16116 | 12794/ 1552 | +| Manual ZoneManager | 219261/16116 | 12826/ 1552 | +| Basic TimeZone (1 zone) | 223225/16116 | 16790/ 1552 | +| Basic TimeZone (2 zones) | 223469/16116 | 17034/ 1552 | +| Basic ZoneManager (1 zone) | 224085/16116 | 17650/ 1552 | +| Basic ZoneManager (all) | 241797/16116 | 35362/ 1552 | +| Extended TimeZone (1 zone) | 225153/16116 | 18718/ 1552 | +| Extended TimeZone (2 zones) | 225421/16116 | 18986/ 1552 | +| Extended ZoneManager (1 zone) | 226109/16116 | 19674/ 1552 | +| Extended ZoneManager (all) | 256393/16116 | 49958/ 1552 | +|---------------------------------+--------------+-------------| +| SystemClock | 226013/16220 | 19578/ 1656 | +| SystemClock+Basic TimeZone | 229909/16220 | 23474/ 1656 | +| SystemClock+Extended TimeZone | 231901/16220 | 25466/ 1656 | +--------------------------------------------------------------+ ``` @@ -222,18 +227,18 @@ usage by objects. | LocalDateTime | 13268/ 4812 | 5644/ 1764 | | ZonedDateTime | 13268/ 4812 | 5644/ 1764 | | Manual ZoneManager | 13268/ 4812 | 5644/ 1764 | -| Basic TimeZone (1 zone) | 22012/ 4812 | 14388/ 1764 | -| Basic TimeZone (2 zones) | 22684/ 4812 | 15060/ 1764 | -| Basic ZoneManager (1 zone) | 23860/ 4812 | 16236/ 1764 | -| Basic ZoneManager (all) | 43116/ 4812 | 35492/ 1764 | -| Extended TimeZone (1 zone) | 24204/ 4812 | 16580/ 1764 | -| Extended TimeZone (2 zones) | 24940/ 4812 | 17316/ 1764 | -| Extended ZoneManager (1 zone) | 26052/ 4812 | 18428/ 1764 | -| Extended ZoneManager (all) | 58880/ 4812 | 51256/ 1764 | +| Basic TimeZone (1 zone) | 22264/ 4812 | 14640/ 1764 | +| Basic TimeZone (2 zones) | 22992/ 4812 | 15368/ 1764 | +| Basic ZoneManager (1 zone) | 23536/ 4812 | 15912/ 1764 | +| Basic ZoneManager (all) | 41280/ 4812 | 33656/ 1764 | +| Extended TimeZone (1 zone) | 24564/ 4812 | 16940/ 1764 | +| Extended TimeZone (2 zones) | 25228/ 4812 | 17604/ 1764 | +| Extended ZoneManager (1 zone) | 25836/ 4812 | 18212/ 1764 | +| Extended ZoneManager (all) | 56116/ 4812 | 48492/ 1764 | |---------------------------------+--------------+-------------| | SystemClock | 16192/ 4812 | 8568/ 1764 | -| SystemClock+Basic TimeZone | 25120/ 4812 | 17496/ 1764 | -| SystemClock+Extended TimeZone | 27312/ 4812 | 19688/ 1764 | +| SystemClock+Basic TimeZone | 25372/ 4812 | 17748/ 1764 | +| SystemClock+Extended TimeZone | 27672/ 4812 | 20048/ 1764 | +--------------------------------------------------------------+ ``` diff --git a/examples/MemoryBenchmark/esp32.txt b/examples/MemoryBenchmark/esp32.txt index bf9d99a69..03aa2e548 100644 --- a/examples/MemoryBenchmark/esp32.txt +++ b/examples/MemoryBenchmark/esp32.txt @@ -1,15 +1,15 @@ 0 206435 1310720 14564 327680 -1 218233 1310720 16100 327680 -2 219037 1310720 16100 327680 -3 219069 1310720 16100 327680 -4 222729 1310720 16100 327680 -5 222981 1310720 16100 327680 -6 223461 1310720 16100 327680 -7 242749 1310720 16100 327680 -8 224617 1310720 16100 327680 -9 224893 1310720 16100 327680 -10 225445 1310720 16100 327680 -11 258213 1310720 16100 327680 -12 225821 1310720 16204 327680 -13 229413 1310720 16204 327680 -14 231365 1310720 16204 327680 +1 218425 1310720 16116 327680 +2 219229 1310720 16116 327680 +3 219261 1310720 16116 327680 +4 223225 1310720 16116 327680 +5 223469 1310720 16116 327680 +6 224085 1310720 16116 327680 +7 241797 1310720 16116 327680 +8 225153 1310720 16116 327680 +9 225421 1310720 16116 327680 +10 226109 1310720 16116 327680 +11 256393 1310720 16116 327680 +12 226013 1310720 16220 327680 +13 229909 1310720 16220 327680 +14 231901 1310720 16220 327680 diff --git a/examples/MemoryBenchmark/esp8266.txt b/examples/MemoryBenchmark/esp8266.txt index b8967b524..e99402294 100644 --- a/examples/MemoryBenchmark/esp8266.txt +++ b/examples/MemoryBenchmark/esp8266.txt @@ -2,14 +2,14 @@ 1 258820 1044464 27264 81920 2 259492 1044464 27264 81920 3 259540 1044464 27264 81920 -4 264792 1044464 27676 81920 -5 265016 1044464 27676 81920 -6 265768 1044464 27676 81920 -7 284952 1044464 27676 81920 -8 266800 1044464 27788 81920 -9 267120 1044464 27788 81920 -10 267792 1044464 27788 81920 -11 300468 1044464 27792 81920 +4 265228 1044464 27824 81920 +5 265452 1044464 27824 81920 +6 266348 1044464 27824 81920 +7 283980 1044464 27824 81920 +8 267292 1044464 27968 81920 +9 267580 1044464 27968 81920 +10 268412 1044464 27968 81920 +11 298608 1044464 27980 81920 12 262268 1044464 27276 81920 -13 267188 1044464 27676 81920 -14 269452 1044464 27788 81920 +13 267624 1044464 27824 81920 +14 269944 1044464 27968 81920 diff --git a/examples/MemoryBenchmark/generate_readme.py b/examples/MemoryBenchmark/generate_readme.py index f7eb60af3..45c26c3b5 100755 --- a/examples/MemoryBenchmark/generate_readme.py +++ b/examples/MemoryBenchmark/generate_readme.py @@ -74,6 +74,11 @@ and 386 bytes for `ExtendedZoneManager` when all the zones are loaded into the zone registry. +Also for v1.4.1+, incorporating zoneName compression causes flash/ram usage to +increase by ~250/120 bytes when using only 1-2 zones, but *decreases* flash +consumption by 1200-2400 bytes when all the zones are loaded into the +`ZoneManager`. + ## Arduino Nano * Arduino IDE 1.8.13 diff --git a/examples/MemoryBenchmark/micro.txt b/examples/MemoryBenchmark/micro.txt index 30fda2373..62e43f79b 100644 --- a/examples/MemoryBenchmark/micro.txt +++ b/examples/MemoryBenchmark/micro.txt @@ -2,14 +2,14 @@ 1 4772 28672 263 2560 2 5564 28672 263 2560 3 5808 28672 263 2560 -4 10012 28672 327 2560 -5 10586 28672 331 2560 -6 11530 28672 353 2560 -7 26040 28672 729 2560 -8 12790 28672 327 2560 -9 13264 28672 331 2560 -10 14468 28672 353 2560 -11 38948 28672 837 2560 +4 10268 28672 447 2560 +5 10838 28672 453 2560 +6 11916 28672 473 2560 +7 24902 28672 851 2560 +8 13082 28672 481 2560 +9 13552 28672 487 2560 +10 14890 28672 507 2560 +11 36944 28672 991 2560 12 8646 28672 422 2560 -13 12974 28672 474 2560 -14 15978 28672 474 2560 +13 13230 28672 594 2560 +14 16270 28672 628 2560 diff --git a/examples/MemoryBenchmark/nano.txt b/examples/MemoryBenchmark/nano.txt index 7b066f453..4e024584b 100644 --- a/examples/MemoryBenchmark/nano.txt +++ b/examples/MemoryBenchmark/nano.txt @@ -2,14 +2,14 @@ 1 1648 30720 123 2048 2 2440 30720 123 2048 3 2684 30720 123 2048 -4 6910 30720 187 2048 -5 7486 30720 193 2048 -6 8428 30720 213 2048 -7 22940 30720 591 2048 -8 9688 30720 187 2048 -9 10164 30720 193 2048 -10 11366 30720 213 2048 -11 35846 30720 697 2048 +4 7168 30720 309 2048 +5 7736 30720 313 2048 +6 8816 30720 335 2048 +7 21800 30720 711 2048 +8 9982 30720 343 2048 +9 10450 30720 347 2048 +10 11790 30720 369 2048 +11 33844 30720 853 2048 12 5662 30720 282 2048 -13 9990 30720 334 2048 -14 12994 30720 334 2048 +13 10248 30720 456 2048 +14 13288 30720 490 2048 diff --git a/examples/MemoryBenchmark/samd.txt b/examples/MemoryBenchmark/samd.txt index 68cb1d751..b49a36d0d 100644 --- a/examples/MemoryBenchmark/samd.txt +++ b/examples/MemoryBenchmark/samd.txt @@ -2,14 +2,14 @@ 1 10920 262144 2 11160 262144 3 11184 262144 -4 15044 262144 -5 15436 262144 -6 15972 262144 -7 35004 262144 -8 16820 262144 -9 17244 262144 -10 17748 262144 -11 50196 262144 +4 15300 262144 +5 15684 262144 +6 16332 262144 +7 33844 262144 +8 17108 262144 +9 17532 262144 +10 18140 262144 +11 48164 262144 12 13264 262144 -13 16684 262144 -14 18644 262144 +13 16940 262144 +14 18932 262144 diff --git a/examples/MemoryBenchmark/teensy32.txt b/examples/MemoryBenchmark/teensy32.txt index 8fc9761f7..be203c8f0 100644 --- a/examples/MemoryBenchmark/teensy32.txt +++ b/examples/MemoryBenchmark/teensy32.txt @@ -2,14 +2,14 @@ 1 13268 262144 4812 65536 2 13268 262144 4812 65536 3 13268 262144 4812 65536 -4 22012 262144 4812 65536 -5 22684 262144 4812 65536 -6 23860 262144 4812 65536 -7 43116 262144 4812 65536 -8 24204 262144 4812 65536 -9 24940 262144 4812 65536 -10 26052 262144 4812 65536 -11 58880 262144 4812 65536 +4 22264 262144 4812 65536 +5 22992 262144 4812 65536 +6 23536 262144 4812 65536 +7 41280 262144 4812 65536 +8 24564 262144 4812 65536 +9 25228 262144 4812 65536 +10 25836 262144 4812 65536 +11 56116 262144 4812 65536 12 16192 262144 4812 65536 -13 25120 262144 4812 65536 -14 27312 262144 4812 65536 +13 25372 262144 4812 65536 +14 27672 262144 4812 65536 From 1725a25276deae41cb2c52f840b77c29ef71837c Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 6 Jan 2021 20:05:47 -0800 Subject: [PATCH 44/74] tools/argenerator.py: Perform linkName compression properly --- tools/generator/argenerator.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index aedf9ffef..fa17c3082 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -1031,12 +1031,13 @@ def _generate_link_item( ZONE_INFOS_CPP_LINK_ITEM = """\ //--------------------------------------------------------------------------- // Link name: {linkFullName} -> {zoneFullName} -// Strings (bytes): {stringSize} +// Strings (bytes): {stringSize} (originally {originalSize}) // Memory (8-bit): {memory8} // Memory (32-bit): {memory32} //--------------------------------------------------------------------------- -static const char kZoneName{linkNormalizedName}[] {progmem} = "{linkFullName}"; +static const char kZoneName{linkNormalizedName}[] {progmem} = \ +{compressedName}; const {scope}::ZoneInfo kZone{linkNormalizedName} {progmem} = {{ kZoneName{linkNormalizedName} /*name*/, @@ -1047,17 +1048,23 @@ def _generate_link_item( }}; """ - link_name_size = len(link_name) + 1 + compressed_name = self.compressed_names[link_name] + rendered_name = _compressed_name_to_c_string(compressed_name) + + link_name_size = len(compressed_name) + 1 + original_size = len(link_name) + 1 memory8 = link_name_size + self.SIZEOF_ZONE_INFO_8 memory32 = link_name_size + self.SIZEOF_ZONE_INFO_32 link_item = ZONE_INFOS_CPP_LINK_ITEM.format( scope=self.scope, linkFullName=link_name, linkNormalizedName=normalize_name(link_name), + compressedName=rendered_name, linkId=self.link_ids[link_name], zoneFullName=zone_name, zoneNormalizedName=normalize_name(zone_name), stringSize=link_name_size, + originalSize=original_size, memory8=memory8, memory32=memory32, numEras=len(self.zones_map[zone_name]), From 9e184bdd1b4707f82093619374d27b8611572930 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 7 Jan 2021 14:13:30 -0800 Subject: [PATCH 45/74] src/zonedb,zonedbx: Generate Link entries with compressed names --- src/ace_time/zonedb/zone_infos.cpp | 1188 +++++++++++------------ src/ace_time/zonedbx/zone_infos.cpp | 1350 +++++++++++++-------------- 2 files changed, 1269 insertions(+), 1269 deletions(-) diff --git a/src/ace_time/zonedb/zone_infos.cpp b/src/ace_time/zonedb/zone_infos.cpp index a25cb8bba..b7366ba13 100644 --- a/src/ace_time/zonedb/zone_infos.cpp +++ b/src/ace_time/zonedb/zone_infos.cpp @@ -9290,12 +9290,12 @@ const basic::ZoneInfo kZoneWET ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Addis_Ababa -> Africa/Nairobi -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Addis_Ababa[] ACE_TIME_PROGMEM = "Africa/Addis_Ababa"; +static const char kZoneNameAfrica_Addis_Ababa[] ACE_TIME_PROGMEM = "\x01" "Addis_Ababa"; const basic::ZoneInfo kZoneAfrica_Addis_Ababa ACE_TIME_PROGMEM = { kZoneNameAfrica_Addis_Ababa /*name*/, @@ -9307,12 +9307,12 @@ const basic::ZoneInfo kZoneAfrica_Addis_Ababa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Asmara -> Africa/Nairobi -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Asmara[] ACE_TIME_PROGMEM = "Africa/Asmara"; +static const char kZoneNameAfrica_Asmara[] ACE_TIME_PROGMEM = "\x01" "Asmara"; const basic::ZoneInfo kZoneAfrica_Asmara ACE_TIME_PROGMEM = { kZoneNameAfrica_Asmara /*name*/, @@ -9324,12 +9324,12 @@ const basic::ZoneInfo kZoneAfrica_Asmara ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Asmera -> Africa/Nairobi -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Asmera[] ACE_TIME_PROGMEM = "Africa/Asmera"; +static const char kZoneNameAfrica_Asmera[] ACE_TIME_PROGMEM = "\x01" "Asmera"; const basic::ZoneInfo kZoneAfrica_Asmera ACE_TIME_PROGMEM = { kZoneNameAfrica_Asmera /*name*/, @@ -9341,12 +9341,12 @@ const basic::ZoneInfo kZoneAfrica_Asmera ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Bamako -> Africa/Abidjan -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Bamako[] ACE_TIME_PROGMEM = "Africa/Bamako"; +static const char kZoneNameAfrica_Bamako[] ACE_TIME_PROGMEM = "\x01" "Bamako"; const basic::ZoneInfo kZoneAfrica_Bamako ACE_TIME_PROGMEM = { kZoneNameAfrica_Bamako /*name*/, @@ -9358,12 +9358,12 @@ const basic::ZoneInfo kZoneAfrica_Bamako ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Bangui -> Africa/Lagos -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Bangui[] ACE_TIME_PROGMEM = "Africa/Bangui"; +static const char kZoneNameAfrica_Bangui[] ACE_TIME_PROGMEM = "\x01" "Bangui"; const basic::ZoneInfo kZoneAfrica_Bangui ACE_TIME_PROGMEM = { kZoneNameAfrica_Bangui /*name*/, @@ -9375,12 +9375,12 @@ const basic::ZoneInfo kZoneAfrica_Bangui ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Banjul -> Africa/Abidjan -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Banjul[] ACE_TIME_PROGMEM = "Africa/Banjul"; +static const char kZoneNameAfrica_Banjul[] ACE_TIME_PROGMEM = "\x01" "Banjul"; const basic::ZoneInfo kZoneAfrica_Banjul ACE_TIME_PROGMEM = { kZoneNameAfrica_Banjul /*name*/, @@ -9392,12 +9392,12 @@ const basic::ZoneInfo kZoneAfrica_Banjul ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Blantyre -> Africa/Maputo -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Blantyre[] ACE_TIME_PROGMEM = "Africa/Blantyre"; +static const char kZoneNameAfrica_Blantyre[] ACE_TIME_PROGMEM = "\x01" "Blantyre"; const basic::ZoneInfo kZoneAfrica_Blantyre ACE_TIME_PROGMEM = { kZoneNameAfrica_Blantyre /*name*/, @@ -9409,12 +9409,12 @@ const basic::ZoneInfo kZoneAfrica_Blantyre ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Brazzaville -> Africa/Lagos -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Brazzaville[] ACE_TIME_PROGMEM = "Africa/Brazzaville"; +static const char kZoneNameAfrica_Brazzaville[] ACE_TIME_PROGMEM = "\x01" "Brazzaville"; const basic::ZoneInfo kZoneAfrica_Brazzaville ACE_TIME_PROGMEM = { kZoneNameAfrica_Brazzaville /*name*/, @@ -9426,12 +9426,12 @@ const basic::ZoneInfo kZoneAfrica_Brazzaville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Bujumbura -> Africa/Maputo -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Bujumbura[] ACE_TIME_PROGMEM = "Africa/Bujumbura"; +static const char kZoneNameAfrica_Bujumbura[] ACE_TIME_PROGMEM = "\x01" "Bujumbura"; const basic::ZoneInfo kZoneAfrica_Bujumbura ACE_TIME_PROGMEM = { kZoneNameAfrica_Bujumbura /*name*/, @@ -9443,12 +9443,12 @@ const basic::ZoneInfo kZoneAfrica_Bujumbura ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Conakry -> Africa/Abidjan -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Conakry[] ACE_TIME_PROGMEM = "Africa/Conakry"; +static const char kZoneNameAfrica_Conakry[] ACE_TIME_PROGMEM = "\x01" "Conakry"; const basic::ZoneInfo kZoneAfrica_Conakry ACE_TIME_PROGMEM = { kZoneNameAfrica_Conakry /*name*/, @@ -9460,12 +9460,12 @@ const basic::ZoneInfo kZoneAfrica_Conakry ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Dakar -> Africa/Abidjan -// Strings (bytes): 13 -// Memory (8-bit): 24 -// Memory (32-bit): 33 +// Strings (bytes): 7 (originally 13) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Dakar[] ACE_TIME_PROGMEM = "Africa/Dakar"; +static const char kZoneNameAfrica_Dakar[] ACE_TIME_PROGMEM = "\x01" "Dakar"; const basic::ZoneInfo kZoneAfrica_Dakar ACE_TIME_PROGMEM = { kZoneNameAfrica_Dakar /*name*/, @@ -9477,12 +9477,12 @@ const basic::ZoneInfo kZoneAfrica_Dakar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Dar_es_Salaam -> Africa/Nairobi -// Strings (bytes): 21 -// Memory (8-bit): 32 -// Memory (32-bit): 41 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Dar_es_Salaam[] ACE_TIME_PROGMEM = "Africa/Dar_es_Salaam"; +static const char kZoneNameAfrica_Dar_es_Salaam[] ACE_TIME_PROGMEM = "\x01" "Dar_es_Salaam"; const basic::ZoneInfo kZoneAfrica_Dar_es_Salaam ACE_TIME_PROGMEM = { kZoneNameAfrica_Dar_es_Salaam /*name*/, @@ -9494,12 +9494,12 @@ const basic::ZoneInfo kZoneAfrica_Dar_es_Salaam ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Djibouti -> Africa/Nairobi -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Djibouti[] ACE_TIME_PROGMEM = "Africa/Djibouti"; +static const char kZoneNameAfrica_Djibouti[] ACE_TIME_PROGMEM = "\x01" "Djibouti"; const basic::ZoneInfo kZoneAfrica_Djibouti ACE_TIME_PROGMEM = { kZoneNameAfrica_Djibouti /*name*/, @@ -9511,12 +9511,12 @@ const basic::ZoneInfo kZoneAfrica_Djibouti ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Douala -> Africa/Lagos -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Douala[] ACE_TIME_PROGMEM = "Africa/Douala"; +static const char kZoneNameAfrica_Douala[] ACE_TIME_PROGMEM = "\x01" "Douala"; const basic::ZoneInfo kZoneAfrica_Douala ACE_TIME_PROGMEM = { kZoneNameAfrica_Douala /*name*/, @@ -9528,12 +9528,12 @@ const basic::ZoneInfo kZoneAfrica_Douala ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Freetown -> Africa/Abidjan -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Freetown[] ACE_TIME_PROGMEM = "Africa/Freetown"; +static const char kZoneNameAfrica_Freetown[] ACE_TIME_PROGMEM = "\x01" "Freetown"; const basic::ZoneInfo kZoneAfrica_Freetown ACE_TIME_PROGMEM = { kZoneNameAfrica_Freetown /*name*/, @@ -9545,12 +9545,12 @@ const basic::ZoneInfo kZoneAfrica_Freetown ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Gaborone -> Africa/Maputo -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Gaborone[] ACE_TIME_PROGMEM = "Africa/Gaborone"; +static const char kZoneNameAfrica_Gaborone[] ACE_TIME_PROGMEM = "\x01" "Gaborone"; const basic::ZoneInfo kZoneAfrica_Gaborone ACE_TIME_PROGMEM = { kZoneNameAfrica_Gaborone /*name*/, @@ -9562,12 +9562,12 @@ const basic::ZoneInfo kZoneAfrica_Gaborone ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Harare -> Africa/Maputo -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Harare[] ACE_TIME_PROGMEM = "Africa/Harare"; +static const char kZoneNameAfrica_Harare[] ACE_TIME_PROGMEM = "\x01" "Harare"; const basic::ZoneInfo kZoneAfrica_Harare ACE_TIME_PROGMEM = { kZoneNameAfrica_Harare /*name*/, @@ -9579,12 +9579,12 @@ const basic::ZoneInfo kZoneAfrica_Harare ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Kampala -> Africa/Nairobi -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Kampala[] ACE_TIME_PROGMEM = "Africa/Kampala"; +static const char kZoneNameAfrica_Kampala[] ACE_TIME_PROGMEM = "\x01" "Kampala"; const basic::ZoneInfo kZoneAfrica_Kampala ACE_TIME_PROGMEM = { kZoneNameAfrica_Kampala /*name*/, @@ -9596,12 +9596,12 @@ const basic::ZoneInfo kZoneAfrica_Kampala ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Kigali -> Africa/Maputo -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Kigali[] ACE_TIME_PROGMEM = "Africa/Kigali"; +static const char kZoneNameAfrica_Kigali[] ACE_TIME_PROGMEM = "\x01" "Kigali"; const basic::ZoneInfo kZoneAfrica_Kigali ACE_TIME_PROGMEM = { kZoneNameAfrica_Kigali /*name*/, @@ -9613,12 +9613,12 @@ const basic::ZoneInfo kZoneAfrica_Kigali ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Kinshasa -> Africa/Lagos -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Kinshasa[] ACE_TIME_PROGMEM = "Africa/Kinshasa"; +static const char kZoneNameAfrica_Kinshasa[] ACE_TIME_PROGMEM = "\x01" "Kinshasa"; const basic::ZoneInfo kZoneAfrica_Kinshasa ACE_TIME_PROGMEM = { kZoneNameAfrica_Kinshasa /*name*/, @@ -9630,12 +9630,12 @@ const basic::ZoneInfo kZoneAfrica_Kinshasa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Libreville -> Africa/Lagos -// Strings (bytes): 18 -// Memory (8-bit): 29 -// Memory (32-bit): 38 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Libreville[] ACE_TIME_PROGMEM = "Africa/Libreville"; +static const char kZoneNameAfrica_Libreville[] ACE_TIME_PROGMEM = "\x01" "Libreville"; const basic::ZoneInfo kZoneAfrica_Libreville ACE_TIME_PROGMEM = { kZoneNameAfrica_Libreville /*name*/, @@ -9647,12 +9647,12 @@ const basic::ZoneInfo kZoneAfrica_Libreville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Lome -> Africa/Abidjan -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 6 (originally 12) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Lome[] ACE_TIME_PROGMEM = "Africa/Lome"; +static const char kZoneNameAfrica_Lome[] ACE_TIME_PROGMEM = "\x01" "Lome"; const basic::ZoneInfo kZoneAfrica_Lome ACE_TIME_PROGMEM = { kZoneNameAfrica_Lome /*name*/, @@ -9664,12 +9664,12 @@ const basic::ZoneInfo kZoneAfrica_Lome ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Luanda -> Africa/Lagos -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Luanda[] ACE_TIME_PROGMEM = "Africa/Luanda"; +static const char kZoneNameAfrica_Luanda[] ACE_TIME_PROGMEM = "\x01" "Luanda"; const basic::ZoneInfo kZoneAfrica_Luanda ACE_TIME_PROGMEM = { kZoneNameAfrica_Luanda /*name*/, @@ -9681,12 +9681,12 @@ const basic::ZoneInfo kZoneAfrica_Luanda ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Lubumbashi -> Africa/Maputo -// Strings (bytes): 18 -// Memory (8-bit): 29 -// Memory (32-bit): 38 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Lubumbashi[] ACE_TIME_PROGMEM = "Africa/Lubumbashi"; +static const char kZoneNameAfrica_Lubumbashi[] ACE_TIME_PROGMEM = "\x01" "Lubumbashi"; const basic::ZoneInfo kZoneAfrica_Lubumbashi ACE_TIME_PROGMEM = { kZoneNameAfrica_Lubumbashi /*name*/, @@ -9698,12 +9698,12 @@ const basic::ZoneInfo kZoneAfrica_Lubumbashi ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Lusaka -> Africa/Maputo -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Lusaka[] ACE_TIME_PROGMEM = "Africa/Lusaka"; +static const char kZoneNameAfrica_Lusaka[] ACE_TIME_PROGMEM = "\x01" "Lusaka"; const basic::ZoneInfo kZoneAfrica_Lusaka ACE_TIME_PROGMEM = { kZoneNameAfrica_Lusaka /*name*/, @@ -9715,12 +9715,12 @@ const basic::ZoneInfo kZoneAfrica_Lusaka ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Malabo -> Africa/Lagos -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Malabo[] ACE_TIME_PROGMEM = "Africa/Malabo"; +static const char kZoneNameAfrica_Malabo[] ACE_TIME_PROGMEM = "\x01" "Malabo"; const basic::ZoneInfo kZoneAfrica_Malabo ACE_TIME_PROGMEM = { kZoneNameAfrica_Malabo /*name*/, @@ -9732,12 +9732,12 @@ const basic::ZoneInfo kZoneAfrica_Malabo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Maseru -> Africa/Johannesburg -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Maseru[] ACE_TIME_PROGMEM = "Africa/Maseru"; +static const char kZoneNameAfrica_Maseru[] ACE_TIME_PROGMEM = "\x01" "Maseru"; const basic::ZoneInfo kZoneAfrica_Maseru ACE_TIME_PROGMEM = { kZoneNameAfrica_Maseru /*name*/, @@ -9749,12 +9749,12 @@ const basic::ZoneInfo kZoneAfrica_Maseru ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Mbabane -> Africa/Johannesburg -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Mbabane[] ACE_TIME_PROGMEM = "Africa/Mbabane"; +static const char kZoneNameAfrica_Mbabane[] ACE_TIME_PROGMEM = "\x01" "Mbabane"; const basic::ZoneInfo kZoneAfrica_Mbabane ACE_TIME_PROGMEM = { kZoneNameAfrica_Mbabane /*name*/, @@ -9766,12 +9766,12 @@ const basic::ZoneInfo kZoneAfrica_Mbabane ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Mogadishu -> Africa/Nairobi -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Mogadishu[] ACE_TIME_PROGMEM = "Africa/Mogadishu"; +static const char kZoneNameAfrica_Mogadishu[] ACE_TIME_PROGMEM = "\x01" "Mogadishu"; const basic::ZoneInfo kZoneAfrica_Mogadishu ACE_TIME_PROGMEM = { kZoneNameAfrica_Mogadishu /*name*/, @@ -9783,12 +9783,12 @@ const basic::ZoneInfo kZoneAfrica_Mogadishu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Niamey -> Africa/Lagos -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Niamey[] ACE_TIME_PROGMEM = "Africa/Niamey"; +static const char kZoneNameAfrica_Niamey[] ACE_TIME_PROGMEM = "\x01" "Niamey"; const basic::ZoneInfo kZoneAfrica_Niamey ACE_TIME_PROGMEM = { kZoneNameAfrica_Niamey /*name*/, @@ -9800,12 +9800,12 @@ const basic::ZoneInfo kZoneAfrica_Niamey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Nouakchott -> Africa/Abidjan -// Strings (bytes): 18 -// Memory (8-bit): 29 -// Memory (32-bit): 38 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Nouakchott[] ACE_TIME_PROGMEM = "Africa/Nouakchott"; +static const char kZoneNameAfrica_Nouakchott[] ACE_TIME_PROGMEM = "\x01" "Nouakchott"; const basic::ZoneInfo kZoneAfrica_Nouakchott ACE_TIME_PROGMEM = { kZoneNameAfrica_Nouakchott /*name*/, @@ -9817,12 +9817,12 @@ const basic::ZoneInfo kZoneAfrica_Nouakchott ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Ouagadougou -> Africa/Abidjan -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Ouagadougou[] ACE_TIME_PROGMEM = "Africa/Ouagadougou"; +static const char kZoneNameAfrica_Ouagadougou[] ACE_TIME_PROGMEM = "\x01" "Ouagadougou"; const basic::ZoneInfo kZoneAfrica_Ouagadougou ACE_TIME_PROGMEM = { kZoneNameAfrica_Ouagadougou /*name*/, @@ -9834,12 +9834,12 @@ const basic::ZoneInfo kZoneAfrica_Ouagadougou ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Porto-Novo -> Africa/Lagos -// Strings (bytes): 18 -// Memory (8-bit): 29 -// Memory (32-bit): 38 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Porto_Novo[] ACE_TIME_PROGMEM = "Africa/Porto-Novo"; +static const char kZoneNameAfrica_Porto_Novo[] ACE_TIME_PROGMEM = "\x01" "Porto-Novo"; const basic::ZoneInfo kZoneAfrica_Porto_Novo ACE_TIME_PROGMEM = { kZoneNameAfrica_Porto_Novo /*name*/, @@ -9851,12 +9851,12 @@ const basic::ZoneInfo kZoneAfrica_Porto_Novo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Timbuktu -> Africa/Abidjan -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Timbuktu[] ACE_TIME_PROGMEM = "Africa/Timbuktu"; +static const char kZoneNameAfrica_Timbuktu[] ACE_TIME_PROGMEM = "\x01" "Timbuktu"; const basic::ZoneInfo kZoneAfrica_Timbuktu ACE_TIME_PROGMEM = { kZoneNameAfrica_Timbuktu /*name*/, @@ -9868,12 +9868,12 @@ const basic::ZoneInfo kZoneAfrica_Timbuktu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Anguilla -> America/Port_of_Spain -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Anguilla[] ACE_TIME_PROGMEM = "America/Anguilla"; +static const char kZoneNameAmerica_Anguilla[] ACE_TIME_PROGMEM = "\x02" "Anguilla"; const basic::ZoneInfo kZoneAmerica_Anguilla ACE_TIME_PROGMEM = { kZoneNameAmerica_Anguilla /*name*/, @@ -9885,12 +9885,12 @@ const basic::ZoneInfo kZoneAmerica_Anguilla ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Antigua -> America/Port_of_Spain -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 9 (originally 16) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Antigua[] ACE_TIME_PROGMEM = "America/Antigua"; +static const char kZoneNameAmerica_Antigua[] ACE_TIME_PROGMEM = "\x02" "Antigua"; const basic::ZoneInfo kZoneAmerica_Antigua ACE_TIME_PROGMEM = { kZoneNameAmerica_Antigua /*name*/, @@ -9902,12 +9902,12 @@ const basic::ZoneInfo kZoneAmerica_Antigua ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Aruba -> America/Curacao -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 7 (originally 14) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Aruba[] ACE_TIME_PROGMEM = "America/Aruba"; +static const char kZoneNameAmerica_Aruba[] ACE_TIME_PROGMEM = "\x02" "Aruba"; const basic::ZoneInfo kZoneAmerica_Aruba ACE_TIME_PROGMEM = { kZoneNameAmerica_Aruba /*name*/, @@ -9919,12 +9919,12 @@ const basic::ZoneInfo kZoneAmerica_Aruba ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Atka -> America/Adak -// Strings (bytes): 13 -// Memory (8-bit): 24 -// Memory (32-bit): 33 +// Strings (bytes): 6 (originally 13) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Atka[] ACE_TIME_PROGMEM = "America/Atka"; +static const char kZoneNameAmerica_Atka[] ACE_TIME_PROGMEM = "\x02" "Atka"; const basic::ZoneInfo kZoneAmerica_Atka ACE_TIME_PROGMEM = { kZoneNameAmerica_Atka /*name*/, @@ -9936,12 +9936,12 @@ const basic::ZoneInfo kZoneAmerica_Atka ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Cayman -> America/Panama -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 8 (originally 15) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Cayman[] ACE_TIME_PROGMEM = "America/Cayman"; +static const char kZoneNameAmerica_Cayman[] ACE_TIME_PROGMEM = "\x02" "Cayman"; const basic::ZoneInfo kZoneAmerica_Cayman ACE_TIME_PROGMEM = { kZoneNameAmerica_Cayman /*name*/, @@ -9953,12 +9953,12 @@ const basic::ZoneInfo kZoneAmerica_Cayman ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Coral_Harbour -> America/Atikokan -// Strings (bytes): 22 -// Memory (8-bit): 33 -// Memory (32-bit): 42 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Coral_Harbour[] ACE_TIME_PROGMEM = "America/Coral_Harbour"; +static const char kZoneNameAmerica_Coral_Harbour[] ACE_TIME_PROGMEM = "\x02" "Coral_Harbour"; const basic::ZoneInfo kZoneAmerica_Coral_Harbour ACE_TIME_PROGMEM = { kZoneNameAmerica_Coral_Harbour /*name*/, @@ -9970,12 +9970,12 @@ const basic::ZoneInfo kZoneAmerica_Coral_Harbour ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Dominica -> America/Port_of_Spain -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Dominica[] ACE_TIME_PROGMEM = "America/Dominica"; +static const char kZoneNameAmerica_Dominica[] ACE_TIME_PROGMEM = "\x02" "Dominica"; const basic::ZoneInfo kZoneAmerica_Dominica ACE_TIME_PROGMEM = { kZoneNameAmerica_Dominica /*name*/, @@ -9987,12 +9987,12 @@ const basic::ZoneInfo kZoneAmerica_Dominica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Fort_Wayne -> America/Indiana/Indianapolis -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Fort_Wayne[] ACE_TIME_PROGMEM = "America/Fort_Wayne"; +static const char kZoneNameAmerica_Fort_Wayne[] ACE_TIME_PROGMEM = "\x02" "Fort_Wayne"; const basic::ZoneInfo kZoneAmerica_Fort_Wayne ACE_TIME_PROGMEM = { kZoneNameAmerica_Fort_Wayne /*name*/, @@ -10004,12 +10004,12 @@ const basic::ZoneInfo kZoneAmerica_Fort_Wayne ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Godthab -> America/Nuuk -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 9 (originally 16) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Godthab[] ACE_TIME_PROGMEM = "America/Godthab"; +static const char kZoneNameAmerica_Godthab[] ACE_TIME_PROGMEM = "\x02" "Godthab"; const basic::ZoneInfo kZoneAmerica_Godthab ACE_TIME_PROGMEM = { kZoneNameAmerica_Godthab /*name*/, @@ -10021,12 +10021,12 @@ const basic::ZoneInfo kZoneAmerica_Godthab ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Grenada -> America/Port_of_Spain -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 9 (originally 16) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Grenada[] ACE_TIME_PROGMEM = "America/Grenada"; +static const char kZoneNameAmerica_Grenada[] ACE_TIME_PROGMEM = "\x02" "Grenada"; const basic::ZoneInfo kZoneAmerica_Grenada ACE_TIME_PROGMEM = { kZoneNameAmerica_Grenada /*name*/, @@ -10038,12 +10038,12 @@ const basic::ZoneInfo kZoneAmerica_Grenada ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Guadeloupe -> America/Port_of_Spain -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Guadeloupe[] ACE_TIME_PROGMEM = "America/Guadeloupe"; +static const char kZoneNameAmerica_Guadeloupe[] ACE_TIME_PROGMEM = "\x02" "Guadeloupe"; const basic::ZoneInfo kZoneAmerica_Guadeloupe ACE_TIME_PROGMEM = { kZoneNameAmerica_Guadeloupe /*name*/, @@ -10055,12 +10055,12 @@ const basic::ZoneInfo kZoneAmerica_Guadeloupe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Indianapolis -> America/Indiana/Indianapolis -// Strings (bytes): 21 -// Memory (8-bit): 32 -// Memory (32-bit): 41 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Indianapolis[] ACE_TIME_PROGMEM = "America/Indianapolis"; +static const char kZoneNameAmerica_Indianapolis[] ACE_TIME_PROGMEM = "\x02" "Indianapolis"; const basic::ZoneInfo kZoneAmerica_Indianapolis ACE_TIME_PROGMEM = { kZoneNameAmerica_Indianapolis /*name*/, @@ -10072,12 +10072,12 @@ const basic::ZoneInfo kZoneAmerica_Indianapolis ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Kralendijk -> America/Curacao -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Kralendijk[] ACE_TIME_PROGMEM = "America/Kralendijk"; +static const char kZoneNameAmerica_Kralendijk[] ACE_TIME_PROGMEM = "\x02" "Kralendijk"; const basic::ZoneInfo kZoneAmerica_Kralendijk ACE_TIME_PROGMEM = { kZoneNameAmerica_Kralendijk /*name*/, @@ -10089,12 +10089,12 @@ const basic::ZoneInfo kZoneAmerica_Kralendijk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Louisville -> America/Kentucky/Louisville -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Louisville[] ACE_TIME_PROGMEM = "America/Louisville"; +static const char kZoneNameAmerica_Louisville[] ACE_TIME_PROGMEM = "\x02" "Louisville"; const basic::ZoneInfo kZoneAmerica_Louisville ACE_TIME_PROGMEM = { kZoneNameAmerica_Louisville /*name*/, @@ -10106,12 +10106,12 @@ const basic::ZoneInfo kZoneAmerica_Louisville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Lower_Princes -> America/Curacao -// Strings (bytes): 22 -// Memory (8-bit): 33 -// Memory (32-bit): 42 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Lower_Princes[] ACE_TIME_PROGMEM = "America/Lower_Princes"; +static const char kZoneNameAmerica_Lower_Princes[] ACE_TIME_PROGMEM = "\x02" "Lower_Princes"; const basic::ZoneInfo kZoneAmerica_Lower_Princes ACE_TIME_PROGMEM = { kZoneNameAmerica_Lower_Princes /*name*/, @@ -10123,12 +10123,12 @@ const basic::ZoneInfo kZoneAmerica_Lower_Princes ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Marigot -> America/Port_of_Spain -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 9 (originally 16) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Marigot[] ACE_TIME_PROGMEM = "America/Marigot"; +static const char kZoneNameAmerica_Marigot[] ACE_TIME_PROGMEM = "\x02" "Marigot"; const basic::ZoneInfo kZoneAmerica_Marigot ACE_TIME_PROGMEM = { kZoneNameAmerica_Marigot /*name*/, @@ -10140,12 +10140,12 @@ const basic::ZoneInfo kZoneAmerica_Marigot ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Montreal -> America/Toronto -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Montreal[] ACE_TIME_PROGMEM = "America/Montreal"; +static const char kZoneNameAmerica_Montreal[] ACE_TIME_PROGMEM = "\x02" "Montreal"; const basic::ZoneInfo kZoneAmerica_Montreal ACE_TIME_PROGMEM = { kZoneNameAmerica_Montreal /*name*/, @@ -10157,12 +10157,12 @@ const basic::ZoneInfo kZoneAmerica_Montreal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Montserrat -> America/Port_of_Spain -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Montserrat[] ACE_TIME_PROGMEM = "America/Montserrat"; +static const char kZoneNameAmerica_Montserrat[] ACE_TIME_PROGMEM = "\x02" "Montserrat"; const basic::ZoneInfo kZoneAmerica_Montserrat ACE_TIME_PROGMEM = { kZoneNameAmerica_Montserrat /*name*/, @@ -10174,12 +10174,12 @@ const basic::ZoneInfo kZoneAmerica_Montserrat ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Shiprock -> America/Denver -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Shiprock[] ACE_TIME_PROGMEM = "America/Shiprock"; +static const char kZoneNameAmerica_Shiprock[] ACE_TIME_PROGMEM = "\x02" "Shiprock"; const basic::ZoneInfo kZoneAmerica_Shiprock ACE_TIME_PROGMEM = { kZoneNameAmerica_Shiprock /*name*/, @@ -10191,12 +10191,12 @@ const basic::ZoneInfo kZoneAmerica_Shiprock ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Barthelemy -> America/Port_of_Spain -// Strings (bytes): 22 -// Memory (8-bit): 33 -// Memory (32-bit): 42 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_St_Barthelemy[] ACE_TIME_PROGMEM = "America/St_Barthelemy"; +static const char kZoneNameAmerica_St_Barthelemy[] ACE_TIME_PROGMEM = "\x02" "St_Barthelemy"; const basic::ZoneInfo kZoneAmerica_St_Barthelemy ACE_TIME_PROGMEM = { kZoneNameAmerica_St_Barthelemy /*name*/, @@ -10208,12 +10208,12 @@ const basic::ZoneInfo kZoneAmerica_St_Barthelemy ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Kitts -> America/Port_of_Spain -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_St_Kitts[] ACE_TIME_PROGMEM = "America/St_Kitts"; +static const char kZoneNameAmerica_St_Kitts[] ACE_TIME_PROGMEM = "\x02" "St_Kitts"; const basic::ZoneInfo kZoneAmerica_St_Kitts ACE_TIME_PROGMEM = { kZoneNameAmerica_St_Kitts /*name*/, @@ -10225,12 +10225,12 @@ const basic::ZoneInfo kZoneAmerica_St_Kitts ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Lucia -> America/Port_of_Spain -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_St_Lucia[] ACE_TIME_PROGMEM = "America/St_Lucia"; +static const char kZoneNameAmerica_St_Lucia[] ACE_TIME_PROGMEM = "\x02" "St_Lucia"; const basic::ZoneInfo kZoneAmerica_St_Lucia ACE_TIME_PROGMEM = { kZoneNameAmerica_St_Lucia /*name*/, @@ -10242,12 +10242,12 @@ const basic::ZoneInfo kZoneAmerica_St_Lucia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Thomas -> America/Port_of_Spain -// Strings (bytes): 18 -// Memory (8-bit): 29 -// Memory (32-bit): 38 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_St_Thomas[] ACE_TIME_PROGMEM = "America/St_Thomas"; +static const char kZoneNameAmerica_St_Thomas[] ACE_TIME_PROGMEM = "\x02" "St_Thomas"; const basic::ZoneInfo kZoneAmerica_St_Thomas ACE_TIME_PROGMEM = { kZoneNameAmerica_St_Thomas /*name*/, @@ -10259,12 +10259,12 @@ const basic::ZoneInfo kZoneAmerica_St_Thomas ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Vincent -> America/Port_of_Spain -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_St_Vincent[] ACE_TIME_PROGMEM = "America/St_Vincent"; +static const char kZoneNameAmerica_St_Vincent[] ACE_TIME_PROGMEM = "\x02" "St_Vincent"; const basic::ZoneInfo kZoneAmerica_St_Vincent ACE_TIME_PROGMEM = { kZoneNameAmerica_St_Vincent /*name*/, @@ -10276,12 +10276,12 @@ const basic::ZoneInfo kZoneAmerica_St_Vincent ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Tortola -> America/Port_of_Spain -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 9 (originally 16) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Tortola[] ACE_TIME_PROGMEM = "America/Tortola"; +static const char kZoneNameAmerica_Tortola[] ACE_TIME_PROGMEM = "\x02" "Tortola"; const basic::ZoneInfo kZoneAmerica_Tortola ACE_TIME_PROGMEM = { kZoneNameAmerica_Tortola /*name*/, @@ -10293,12 +10293,12 @@ const basic::ZoneInfo kZoneAmerica_Tortola ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Virgin -> America/Port_of_Spain -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 8 (originally 15) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Virgin[] ACE_TIME_PROGMEM = "America/Virgin"; +static const char kZoneNameAmerica_Virgin[] ACE_TIME_PROGMEM = "\x02" "Virgin"; const basic::ZoneInfo kZoneAmerica_Virgin ACE_TIME_PROGMEM = { kZoneNameAmerica_Virgin /*name*/, @@ -10310,12 +10310,12 @@ const basic::ZoneInfo kZoneAmerica_Virgin ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Antarctica/McMurdo -> Pacific/Auckland -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 9 (originally 19) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAntarctica_McMurdo[] ACE_TIME_PROGMEM = "Antarctica/McMurdo"; +static const char kZoneNameAntarctica_McMurdo[] ACE_TIME_PROGMEM = "\x03" "McMurdo"; const basic::ZoneInfo kZoneAntarctica_McMurdo ACE_TIME_PROGMEM = { kZoneNameAntarctica_McMurdo /*name*/, @@ -10327,12 +10327,12 @@ const basic::ZoneInfo kZoneAntarctica_McMurdo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Antarctica/South_Pole -> Pacific/Auckland -// Strings (bytes): 22 -// Memory (8-bit): 33 -// Memory (32-bit): 42 +// Strings (bytes): 12 (originally 22) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAntarctica_South_Pole[] ACE_TIME_PROGMEM = "Antarctica/South_Pole"; +static const char kZoneNameAntarctica_South_Pole[] ACE_TIME_PROGMEM = "\x03" "South_Pole"; const basic::ZoneInfo kZoneAntarctica_South_Pole ACE_TIME_PROGMEM = { kZoneNameAntarctica_South_Pole /*name*/, @@ -10344,7 +10344,7 @@ const basic::ZoneInfo kZoneAntarctica_South_Pole ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Arctic/Longyearbyen -> Europe/Oslo -// Strings (bytes): 20 +// Strings (bytes): 20 (originally 20) // Memory (8-bit): 31 // Memory (32-bit): 40 //--------------------------------------------------------------------------- @@ -10361,12 +10361,12 @@ const basic::ZoneInfo kZoneArctic_Longyearbyen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Aden -> Asia/Riyadh -// Strings (bytes): 10 -// Memory (8-bit): 21 -// Memory (32-bit): 30 +// Strings (bytes): 6 (originally 10) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Aden[] ACE_TIME_PROGMEM = "Asia/Aden"; +static const char kZoneNameAsia_Aden[] ACE_TIME_PROGMEM = "\x04" "Aden"; const basic::ZoneInfo kZoneAsia_Aden ACE_TIME_PROGMEM = { kZoneNameAsia_Aden /*name*/, @@ -10378,12 +10378,12 @@ const basic::ZoneInfo kZoneAsia_Aden ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Ashkhabad -> Asia/Ashgabat -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Ashkhabad[] ACE_TIME_PROGMEM = "Asia/Ashkhabad"; +static const char kZoneNameAsia_Ashkhabad[] ACE_TIME_PROGMEM = "\x04" "Ashkhabad"; const basic::ZoneInfo kZoneAsia_Ashkhabad ACE_TIME_PROGMEM = { kZoneNameAsia_Ashkhabad /*name*/, @@ -10395,12 +10395,12 @@ const basic::ZoneInfo kZoneAsia_Ashkhabad ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Bahrain -> Asia/Qatar -// Strings (bytes): 13 -// Memory (8-bit): 24 -// Memory (32-bit): 33 +// Strings (bytes): 9 (originally 13) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Bahrain[] ACE_TIME_PROGMEM = "Asia/Bahrain"; +static const char kZoneNameAsia_Bahrain[] ACE_TIME_PROGMEM = "\x04" "Bahrain"; const basic::ZoneInfo kZoneAsia_Bahrain ACE_TIME_PROGMEM = { kZoneNameAsia_Bahrain /*name*/, @@ -10412,12 +10412,12 @@ const basic::ZoneInfo kZoneAsia_Bahrain ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Calcutta -> Asia/Kolkata -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 10 (originally 14) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Calcutta[] ACE_TIME_PROGMEM = "Asia/Calcutta"; +static const char kZoneNameAsia_Calcutta[] ACE_TIME_PROGMEM = "\x04" "Calcutta"; const basic::ZoneInfo kZoneAsia_Calcutta ACE_TIME_PROGMEM = { kZoneNameAsia_Calcutta /*name*/, @@ -10429,12 +10429,12 @@ const basic::ZoneInfo kZoneAsia_Calcutta ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Chongqing -> Asia/Shanghai -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Chongqing[] ACE_TIME_PROGMEM = "Asia/Chongqing"; +static const char kZoneNameAsia_Chongqing[] ACE_TIME_PROGMEM = "\x04" "Chongqing"; const basic::ZoneInfo kZoneAsia_Chongqing ACE_TIME_PROGMEM = { kZoneNameAsia_Chongqing /*name*/, @@ -10446,12 +10446,12 @@ const basic::ZoneInfo kZoneAsia_Chongqing ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Chungking -> Asia/Shanghai -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Chungking[] ACE_TIME_PROGMEM = "Asia/Chungking"; +static const char kZoneNameAsia_Chungking[] ACE_TIME_PROGMEM = "\x04" "Chungking"; const basic::ZoneInfo kZoneAsia_Chungking ACE_TIME_PROGMEM = { kZoneNameAsia_Chungking /*name*/, @@ -10463,12 +10463,12 @@ const basic::ZoneInfo kZoneAsia_Chungking ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Dacca -> Asia/Dhaka -// Strings (bytes): 11 -// Memory (8-bit): 22 -// Memory (32-bit): 31 +// Strings (bytes): 7 (originally 11) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Dacca[] ACE_TIME_PROGMEM = "Asia/Dacca"; +static const char kZoneNameAsia_Dacca[] ACE_TIME_PROGMEM = "\x04" "Dacca"; const basic::ZoneInfo kZoneAsia_Dacca ACE_TIME_PROGMEM = { kZoneNameAsia_Dacca /*name*/, @@ -10480,12 +10480,12 @@ const basic::ZoneInfo kZoneAsia_Dacca ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Harbin -> Asia/Shanghai -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 8 (originally 12) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Harbin[] ACE_TIME_PROGMEM = "Asia/Harbin"; +static const char kZoneNameAsia_Harbin[] ACE_TIME_PROGMEM = "\x04" "Harbin"; const basic::ZoneInfo kZoneAsia_Harbin ACE_TIME_PROGMEM = { kZoneNameAsia_Harbin /*name*/, @@ -10497,12 +10497,12 @@ const basic::ZoneInfo kZoneAsia_Harbin ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Kashgar -> Asia/Urumqi -// Strings (bytes): 13 -// Memory (8-bit): 24 -// Memory (32-bit): 33 +// Strings (bytes): 9 (originally 13) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Kashgar[] ACE_TIME_PROGMEM = "Asia/Kashgar"; +static const char kZoneNameAsia_Kashgar[] ACE_TIME_PROGMEM = "\x04" "Kashgar"; const basic::ZoneInfo kZoneAsia_Kashgar ACE_TIME_PROGMEM = { kZoneNameAsia_Kashgar /*name*/, @@ -10514,12 +10514,12 @@ const basic::ZoneInfo kZoneAsia_Kashgar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Katmandu -> Asia/Kathmandu -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 10 (originally 14) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Katmandu[] ACE_TIME_PROGMEM = "Asia/Katmandu"; +static const char kZoneNameAsia_Katmandu[] ACE_TIME_PROGMEM = "\x04" "Katmandu"; const basic::ZoneInfo kZoneAsia_Katmandu ACE_TIME_PROGMEM = { kZoneNameAsia_Katmandu /*name*/, @@ -10531,12 +10531,12 @@ const basic::ZoneInfo kZoneAsia_Katmandu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Kuwait -> Asia/Riyadh -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 8 (originally 12) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Kuwait[] ACE_TIME_PROGMEM = "Asia/Kuwait"; +static const char kZoneNameAsia_Kuwait[] ACE_TIME_PROGMEM = "\x04" "Kuwait"; const basic::ZoneInfo kZoneAsia_Kuwait ACE_TIME_PROGMEM = { kZoneNameAsia_Kuwait /*name*/, @@ -10548,12 +10548,12 @@ const basic::ZoneInfo kZoneAsia_Kuwait ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Macao -> Asia/Macau -// Strings (bytes): 11 -// Memory (8-bit): 22 -// Memory (32-bit): 31 +// Strings (bytes): 7 (originally 11) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Macao[] ACE_TIME_PROGMEM = "Asia/Macao"; +static const char kZoneNameAsia_Macao[] ACE_TIME_PROGMEM = "\x04" "Macao"; const basic::ZoneInfo kZoneAsia_Macao ACE_TIME_PROGMEM = { kZoneNameAsia_Macao /*name*/, @@ -10565,12 +10565,12 @@ const basic::ZoneInfo kZoneAsia_Macao ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Muscat -> Asia/Dubai -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 8 (originally 12) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Muscat[] ACE_TIME_PROGMEM = "Asia/Muscat"; +static const char kZoneNameAsia_Muscat[] ACE_TIME_PROGMEM = "\x04" "Muscat"; const basic::ZoneInfo kZoneAsia_Muscat ACE_TIME_PROGMEM = { kZoneNameAsia_Muscat /*name*/, @@ -10582,12 +10582,12 @@ const basic::ZoneInfo kZoneAsia_Muscat ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Phnom_Penh -> Asia/Bangkok -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Phnom_Penh[] ACE_TIME_PROGMEM = "Asia/Phnom_Penh"; +static const char kZoneNameAsia_Phnom_Penh[] ACE_TIME_PROGMEM = "\x04" "Phnom_Penh"; const basic::ZoneInfo kZoneAsia_Phnom_Penh ACE_TIME_PROGMEM = { kZoneNameAsia_Phnom_Penh /*name*/, @@ -10599,12 +10599,12 @@ const basic::ZoneInfo kZoneAsia_Phnom_Penh ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Rangoon -> Asia/Yangon -// Strings (bytes): 13 -// Memory (8-bit): 24 -// Memory (32-bit): 33 +// Strings (bytes): 9 (originally 13) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Rangoon[] ACE_TIME_PROGMEM = "Asia/Rangoon"; +static const char kZoneNameAsia_Rangoon[] ACE_TIME_PROGMEM = "\x04" "Rangoon"; const basic::ZoneInfo kZoneAsia_Rangoon ACE_TIME_PROGMEM = { kZoneNameAsia_Rangoon /*name*/, @@ -10616,12 +10616,12 @@ const basic::ZoneInfo kZoneAsia_Rangoon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Saigon -> Asia/Ho_Chi_Minh -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 8 (originally 12) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Saigon[] ACE_TIME_PROGMEM = "Asia/Saigon"; +static const char kZoneNameAsia_Saigon[] ACE_TIME_PROGMEM = "\x04" "Saigon"; const basic::ZoneInfo kZoneAsia_Saigon ACE_TIME_PROGMEM = { kZoneNameAsia_Saigon /*name*/, @@ -10633,12 +10633,12 @@ const basic::ZoneInfo kZoneAsia_Saigon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Tel_Aviv -> Asia/Jerusalem -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 10 (originally 14) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Tel_Aviv[] ACE_TIME_PROGMEM = "Asia/Tel_Aviv"; +static const char kZoneNameAsia_Tel_Aviv[] ACE_TIME_PROGMEM = "\x04" "Tel_Aviv"; const basic::ZoneInfo kZoneAsia_Tel_Aviv ACE_TIME_PROGMEM = { kZoneNameAsia_Tel_Aviv /*name*/, @@ -10650,12 +10650,12 @@ const basic::ZoneInfo kZoneAsia_Tel_Aviv ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Thimbu -> Asia/Thimphu -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 8 (originally 12) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Thimbu[] ACE_TIME_PROGMEM = "Asia/Thimbu"; +static const char kZoneNameAsia_Thimbu[] ACE_TIME_PROGMEM = "\x04" "Thimbu"; const basic::ZoneInfo kZoneAsia_Thimbu ACE_TIME_PROGMEM = { kZoneNameAsia_Thimbu /*name*/, @@ -10667,12 +10667,12 @@ const basic::ZoneInfo kZoneAsia_Thimbu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Ujung_Pandang -> Asia/Makassar -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 15 (originally 19) +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Ujung_Pandang[] ACE_TIME_PROGMEM = "Asia/Ujung_Pandang"; +static const char kZoneNameAsia_Ujung_Pandang[] ACE_TIME_PROGMEM = "\x04" "Ujung_Pandang"; const basic::ZoneInfo kZoneAsia_Ujung_Pandang ACE_TIME_PROGMEM = { kZoneNameAsia_Ujung_Pandang /*name*/, @@ -10684,12 +10684,12 @@ const basic::ZoneInfo kZoneAsia_Ujung_Pandang ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Ulan_Bator -> Asia/Ulaanbaatar -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Ulan_Bator[] ACE_TIME_PROGMEM = "Asia/Ulan_Bator"; +static const char kZoneNameAsia_Ulan_Bator[] ACE_TIME_PROGMEM = "\x04" "Ulan_Bator"; const basic::ZoneInfo kZoneAsia_Ulan_Bator ACE_TIME_PROGMEM = { kZoneNameAsia_Ulan_Bator /*name*/, @@ -10701,12 +10701,12 @@ const basic::ZoneInfo kZoneAsia_Ulan_Bator ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Vientiane -> Asia/Bangkok -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Vientiane[] ACE_TIME_PROGMEM = "Asia/Vientiane"; +static const char kZoneNameAsia_Vientiane[] ACE_TIME_PROGMEM = "\x04" "Vientiane"; const basic::ZoneInfo kZoneAsia_Vientiane ACE_TIME_PROGMEM = { kZoneNameAsia_Vientiane /*name*/, @@ -10718,12 +10718,12 @@ const basic::ZoneInfo kZoneAsia_Vientiane ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Atlantic/Faeroe -> Atlantic/Faroe -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 8 (originally 16) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAtlantic_Faeroe[] ACE_TIME_PROGMEM = "Atlantic/Faeroe"; +static const char kZoneNameAtlantic_Faeroe[] ACE_TIME_PROGMEM = "\x05" "Faeroe"; const basic::ZoneInfo kZoneAtlantic_Faeroe ACE_TIME_PROGMEM = { kZoneNameAtlantic_Faeroe /*name*/, @@ -10735,12 +10735,12 @@ const basic::ZoneInfo kZoneAtlantic_Faeroe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Atlantic/Jan_Mayen -> Europe/Oslo -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 11 (originally 19) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAtlantic_Jan_Mayen[] ACE_TIME_PROGMEM = "Atlantic/Jan_Mayen"; +static const char kZoneNameAtlantic_Jan_Mayen[] ACE_TIME_PROGMEM = "\x05" "Jan_Mayen"; const basic::ZoneInfo kZoneAtlantic_Jan_Mayen ACE_TIME_PROGMEM = { kZoneNameAtlantic_Jan_Mayen /*name*/, @@ -10752,12 +10752,12 @@ const basic::ZoneInfo kZoneAtlantic_Jan_Mayen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Atlantic/St_Helena -> Africa/Abidjan -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 11 (originally 19) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAtlantic_St_Helena[] ACE_TIME_PROGMEM = "Atlantic/St_Helena"; +static const char kZoneNameAtlantic_St_Helena[] ACE_TIME_PROGMEM = "\x05" "St_Helena"; const basic::ZoneInfo kZoneAtlantic_St_Helena ACE_TIME_PROGMEM = { kZoneNameAtlantic_St_Helena /*name*/, @@ -10769,12 +10769,12 @@ const basic::ZoneInfo kZoneAtlantic_St_Helena ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/ACT -> Australia/Sydney -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 5 (originally 14) +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_ACT[] ACE_TIME_PROGMEM = "Australia/ACT"; +static const char kZoneNameAustralia_ACT[] ACE_TIME_PROGMEM = "\x06" "ACT"; const basic::ZoneInfo kZoneAustralia_ACT ACE_TIME_PROGMEM = { kZoneNameAustralia_ACT /*name*/, @@ -10786,12 +10786,12 @@ const basic::ZoneInfo kZoneAustralia_ACT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Canberra -> Australia/Sydney -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 10 (originally 19) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_Canberra[] ACE_TIME_PROGMEM = "Australia/Canberra"; +static const char kZoneNameAustralia_Canberra[] ACE_TIME_PROGMEM = "\x06" "Canberra"; const basic::ZoneInfo kZoneAustralia_Canberra ACE_TIME_PROGMEM = { kZoneNameAustralia_Canberra /*name*/, @@ -10803,12 +10803,12 @@ const basic::ZoneInfo kZoneAustralia_Canberra ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Currie -> Australia/Hobart -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 8 (originally 17) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_Currie[] ACE_TIME_PROGMEM = "Australia/Currie"; +static const char kZoneNameAustralia_Currie[] ACE_TIME_PROGMEM = "\x06" "Currie"; const basic::ZoneInfo kZoneAustralia_Currie ACE_TIME_PROGMEM = { kZoneNameAustralia_Currie /*name*/, @@ -10820,12 +10820,12 @@ const basic::ZoneInfo kZoneAustralia_Currie ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/LHI -> Australia/Lord_Howe -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 5 (originally 14) +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_LHI[] ACE_TIME_PROGMEM = "Australia/LHI"; +static const char kZoneNameAustralia_LHI[] ACE_TIME_PROGMEM = "\x06" "LHI"; const basic::ZoneInfo kZoneAustralia_LHI ACE_TIME_PROGMEM = { kZoneNameAustralia_LHI /*name*/, @@ -10837,12 +10837,12 @@ const basic::ZoneInfo kZoneAustralia_LHI ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/NSW -> Australia/Sydney -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 5 (originally 14) +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_NSW[] ACE_TIME_PROGMEM = "Australia/NSW"; +static const char kZoneNameAustralia_NSW[] ACE_TIME_PROGMEM = "\x06" "NSW"; const basic::ZoneInfo kZoneAustralia_NSW ACE_TIME_PROGMEM = { kZoneNameAustralia_NSW /*name*/, @@ -10854,12 +10854,12 @@ const basic::ZoneInfo kZoneAustralia_NSW ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/North -> Australia/Darwin -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 7 (originally 16) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_North[] ACE_TIME_PROGMEM = "Australia/North"; +static const char kZoneNameAustralia_North[] ACE_TIME_PROGMEM = "\x06" "North"; const basic::ZoneInfo kZoneAustralia_North ACE_TIME_PROGMEM = { kZoneNameAustralia_North /*name*/, @@ -10871,12 +10871,12 @@ const basic::ZoneInfo kZoneAustralia_North ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Queensland -> Australia/Brisbane -// Strings (bytes): 21 -// Memory (8-bit): 32 -// Memory (32-bit): 41 +// Strings (bytes): 12 (originally 21) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_Queensland[] ACE_TIME_PROGMEM = "Australia/Queensland"; +static const char kZoneNameAustralia_Queensland[] ACE_TIME_PROGMEM = "\x06" "Queensland"; const basic::ZoneInfo kZoneAustralia_Queensland ACE_TIME_PROGMEM = { kZoneNameAustralia_Queensland /*name*/, @@ -10888,12 +10888,12 @@ const basic::ZoneInfo kZoneAustralia_Queensland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/South -> Australia/Adelaide -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 7 (originally 16) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_South[] ACE_TIME_PROGMEM = "Australia/South"; +static const char kZoneNameAustralia_South[] ACE_TIME_PROGMEM = "\x06" "South"; const basic::ZoneInfo kZoneAustralia_South ACE_TIME_PROGMEM = { kZoneNameAustralia_South /*name*/, @@ -10905,12 +10905,12 @@ const basic::ZoneInfo kZoneAustralia_South ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Tasmania -> Australia/Hobart -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 10 (originally 19) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_Tasmania[] ACE_TIME_PROGMEM = "Australia/Tasmania"; +static const char kZoneNameAustralia_Tasmania[] ACE_TIME_PROGMEM = "\x06" "Tasmania"; const basic::ZoneInfo kZoneAustralia_Tasmania ACE_TIME_PROGMEM = { kZoneNameAustralia_Tasmania /*name*/, @@ -10922,12 +10922,12 @@ const basic::ZoneInfo kZoneAustralia_Tasmania ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Victoria -> Australia/Melbourne -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 10 (originally 19) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_Victoria[] ACE_TIME_PROGMEM = "Australia/Victoria"; +static const char kZoneNameAustralia_Victoria[] ACE_TIME_PROGMEM = "\x06" "Victoria"; const basic::ZoneInfo kZoneAustralia_Victoria ACE_TIME_PROGMEM = { kZoneNameAustralia_Victoria /*name*/, @@ -10939,12 +10939,12 @@ const basic::ZoneInfo kZoneAustralia_Victoria ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/West -> Australia/Perth -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 6 (originally 15) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_West[] ACE_TIME_PROGMEM = "Australia/West"; +static const char kZoneNameAustralia_West[] ACE_TIME_PROGMEM = "\x06" "West"; const basic::ZoneInfo kZoneAustralia_West ACE_TIME_PROGMEM = { kZoneNameAustralia_West /*name*/, @@ -10956,12 +10956,12 @@ const basic::ZoneInfo kZoneAustralia_West ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Yancowinna -> Australia/Broken_Hill -// Strings (bytes): 21 -// Memory (8-bit): 32 -// Memory (32-bit): 41 +// Strings (bytes): 12 (originally 21) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_Yancowinna[] ACE_TIME_PROGMEM = "Australia/Yancowinna"; +static const char kZoneNameAustralia_Yancowinna[] ACE_TIME_PROGMEM = "\x06" "Yancowinna"; const basic::ZoneInfo kZoneAustralia_Yancowinna ACE_TIME_PROGMEM = { kZoneNameAustralia_Yancowinna /*name*/, @@ -10973,7 +10973,7 @@ const basic::ZoneInfo kZoneAustralia_Yancowinna ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Brazil/East -> America/Sao_Paulo -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 23 // Memory (32-bit): 32 //--------------------------------------------------------------------------- @@ -10990,7 +10990,7 @@ const basic::ZoneInfo kZoneBrazil_East ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Brazil/West -> America/Manaus -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 23 // Memory (32-bit): 32 //--------------------------------------------------------------------------- @@ -11007,12 +11007,12 @@ const basic::ZoneInfo kZoneBrazil_West ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Atlantic -> America/Halifax -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameCanada_Atlantic[] ACE_TIME_PROGMEM = "Canada/Atlantic"; +static const char kZoneNameCanada_Atlantic[] ACE_TIME_PROGMEM = "\x07" "Atlantic"; const basic::ZoneInfo kZoneCanada_Atlantic ACE_TIME_PROGMEM = { kZoneNameCanada_Atlantic /*name*/, @@ -11024,12 +11024,12 @@ const basic::ZoneInfo kZoneCanada_Atlantic ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Central -> America/Winnipeg -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameCanada_Central[] ACE_TIME_PROGMEM = "Canada/Central"; +static const char kZoneNameCanada_Central[] ACE_TIME_PROGMEM = "\x07" "Central"; const basic::ZoneInfo kZoneCanada_Central ACE_TIME_PROGMEM = { kZoneNameCanada_Central /*name*/, @@ -11041,12 +11041,12 @@ const basic::ZoneInfo kZoneCanada_Central ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Eastern -> America/Toronto -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameCanada_Eastern[] ACE_TIME_PROGMEM = "Canada/Eastern"; +static const char kZoneNameCanada_Eastern[] ACE_TIME_PROGMEM = "\x07" "Eastern"; const basic::ZoneInfo kZoneCanada_Eastern ACE_TIME_PROGMEM = { kZoneNameCanada_Eastern /*name*/, @@ -11058,12 +11058,12 @@ const basic::ZoneInfo kZoneCanada_Eastern ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Mountain -> America/Edmonton -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameCanada_Mountain[] ACE_TIME_PROGMEM = "Canada/Mountain"; +static const char kZoneNameCanada_Mountain[] ACE_TIME_PROGMEM = "\x07" "Mountain"; const basic::ZoneInfo kZoneCanada_Mountain ACE_TIME_PROGMEM = { kZoneNameCanada_Mountain /*name*/, @@ -11075,12 +11075,12 @@ const basic::ZoneInfo kZoneCanada_Mountain ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Pacific -> America/Vancouver -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameCanada_Pacific[] ACE_TIME_PROGMEM = "Canada/Pacific"; +static const char kZoneNameCanada_Pacific[] ACE_TIME_PROGMEM = "\x07" "Pacific"; const basic::ZoneInfo kZoneCanada_Pacific ACE_TIME_PROGMEM = { kZoneNameCanada_Pacific /*name*/, @@ -11092,12 +11092,12 @@ const basic::ZoneInfo kZoneCanada_Pacific ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Saskatchewan -> America/Regina -// Strings (bytes): 20 -// Memory (8-bit): 31 -// Memory (32-bit): 40 +// Strings (bytes): 14 (originally 20) +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- -static const char kZoneNameCanada_Saskatchewan[] ACE_TIME_PROGMEM = "Canada/Saskatchewan"; +static const char kZoneNameCanada_Saskatchewan[] ACE_TIME_PROGMEM = "\x07" "Saskatchewan"; const basic::ZoneInfo kZoneCanada_Saskatchewan ACE_TIME_PROGMEM = { kZoneNameCanada_Saskatchewan /*name*/, @@ -11109,7 +11109,7 @@ const basic::ZoneInfo kZoneCanada_Saskatchewan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Chile/Continental -> America/Santiago -// Strings (bytes): 18 +// Strings (bytes): 18 (originally 18) // Memory (8-bit): 29 // Memory (32-bit): 38 //--------------------------------------------------------------------------- @@ -11126,7 +11126,7 @@ const basic::ZoneInfo kZoneChile_Continental ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Chile/EasterIsland -> Pacific/Easter -// Strings (bytes): 19 +// Strings (bytes): 19 (originally 19) // Memory (8-bit): 30 // Memory (32-bit): 39 //--------------------------------------------------------------------------- @@ -11143,7 +11143,7 @@ const basic::ZoneInfo kZoneChile_EasterIsland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Cuba -> America/Havana -// Strings (bytes): 5 +// Strings (bytes): 5 (originally 5) // Memory (8-bit): 16 // Memory (32-bit): 25 //--------------------------------------------------------------------------- @@ -11160,7 +11160,7 @@ const basic::ZoneInfo kZoneCuba ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Eire -> Europe/Dublin -// Strings (bytes): 5 +// Strings (bytes): 5 (originally 5) // Memory (8-bit): 16 // Memory (32-bit): 25 //--------------------------------------------------------------------------- @@ -11177,12 +11177,12 @@ const basic::ZoneInfo kZoneEire ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/GMT+0 -> Etc/GMT -// Strings (bytes): 10 -// Memory (8-bit): 21 -// Memory (32-bit): 30 +// Strings (bytes): 7 (originally 10) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameEtc_GMT_PLUS_0[] ACE_TIME_PROGMEM = "Etc/GMT+0"; +static const char kZoneNameEtc_GMT_PLUS_0[] ACE_TIME_PROGMEM = "\x08" "GMT+0"; const basic::ZoneInfo kZoneEtc_GMT_PLUS_0 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_0 /*name*/, @@ -11194,12 +11194,12 @@ const basic::ZoneInfo kZoneEtc_GMT_PLUS_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/GMT-0 -> Etc/GMT -// Strings (bytes): 10 -// Memory (8-bit): 21 -// Memory (32-bit): 30 +// Strings (bytes): 7 (originally 10) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameEtc_GMT_0[] ACE_TIME_PROGMEM = "Etc/GMT-0"; +static const char kZoneNameEtc_GMT_0[] ACE_TIME_PROGMEM = "\x08" "GMT-0"; const basic::ZoneInfo kZoneEtc_GMT_0 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_0 /*name*/, @@ -11211,12 +11211,12 @@ const basic::ZoneInfo kZoneEtc_GMT_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/GMT0 -> Etc/GMT -// Strings (bytes): 9 -// Memory (8-bit): 20 -// Memory (32-bit): 29 +// Strings (bytes): 6 (originally 9) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNameEtc_GMT0[] ACE_TIME_PROGMEM = "Etc/GMT0"; +static const char kZoneNameEtc_GMT0[] ACE_TIME_PROGMEM = "\x08" "GMT0"; const basic::ZoneInfo kZoneEtc_GMT0 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT0 /*name*/, @@ -11228,12 +11228,12 @@ const basic::ZoneInfo kZoneEtc_GMT0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/Greenwich -> Etc/GMT -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameEtc_Greenwich[] ACE_TIME_PROGMEM = "Etc/Greenwich"; +static const char kZoneNameEtc_Greenwich[] ACE_TIME_PROGMEM = "\x08" "Greenwich"; const basic::ZoneInfo kZoneEtc_Greenwich ACE_TIME_PROGMEM = { kZoneNameEtc_Greenwich /*name*/, @@ -11245,12 +11245,12 @@ const basic::ZoneInfo kZoneEtc_Greenwich ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/UCT -> Etc/UTC -// Strings (bytes): 8 -// Memory (8-bit): 19 -// Memory (32-bit): 28 +// Strings (bytes): 5 (originally 8) +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- -static const char kZoneNameEtc_UCT[] ACE_TIME_PROGMEM = "Etc/UCT"; +static const char kZoneNameEtc_UCT[] ACE_TIME_PROGMEM = "\x08" "UCT"; const basic::ZoneInfo kZoneEtc_UCT ACE_TIME_PROGMEM = { kZoneNameEtc_UCT /*name*/, @@ -11262,12 +11262,12 @@ const basic::ZoneInfo kZoneEtc_UCT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/Universal -> Etc/UTC -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameEtc_Universal[] ACE_TIME_PROGMEM = "Etc/Universal"; +static const char kZoneNameEtc_Universal[] ACE_TIME_PROGMEM = "\x08" "Universal"; const basic::ZoneInfo kZoneEtc_Universal ACE_TIME_PROGMEM = { kZoneNameEtc_Universal /*name*/, @@ -11279,12 +11279,12 @@ const basic::ZoneInfo kZoneEtc_Universal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/Zulu -> Etc/UTC -// Strings (bytes): 9 -// Memory (8-bit): 20 -// Memory (32-bit): 29 +// Strings (bytes): 6 (originally 9) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNameEtc_Zulu[] ACE_TIME_PROGMEM = "Etc/Zulu"; +static const char kZoneNameEtc_Zulu[] ACE_TIME_PROGMEM = "\x08" "Zulu"; const basic::ZoneInfo kZoneEtc_Zulu ACE_TIME_PROGMEM = { kZoneNameEtc_Zulu /*name*/, @@ -11296,12 +11296,12 @@ const basic::ZoneInfo kZoneEtc_Zulu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Belfast -> Europe/London -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Belfast[] ACE_TIME_PROGMEM = "Europe/Belfast"; +static const char kZoneNameEurope_Belfast[] ACE_TIME_PROGMEM = "\x09" "Belfast"; const basic::ZoneInfo kZoneEurope_Belfast ACE_TIME_PROGMEM = { kZoneNameEurope_Belfast /*name*/, @@ -11313,12 +11313,12 @@ const basic::ZoneInfo kZoneEurope_Belfast ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Bratislava -> Europe/Prague -// Strings (bytes): 18 -// Memory (8-bit): 29 -// Memory (32-bit): 38 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Bratislava[] ACE_TIME_PROGMEM = "Europe/Bratislava"; +static const char kZoneNameEurope_Bratislava[] ACE_TIME_PROGMEM = "\x09" "Bratislava"; const basic::ZoneInfo kZoneEurope_Bratislava ACE_TIME_PROGMEM = { kZoneNameEurope_Bratislava /*name*/, @@ -11330,12 +11330,12 @@ const basic::ZoneInfo kZoneEurope_Bratislava ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Busingen -> Europe/Zurich -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Busingen[] ACE_TIME_PROGMEM = "Europe/Busingen"; +static const char kZoneNameEurope_Busingen[] ACE_TIME_PROGMEM = "\x09" "Busingen"; const basic::ZoneInfo kZoneEurope_Busingen ACE_TIME_PROGMEM = { kZoneNameEurope_Busingen /*name*/, @@ -11347,12 +11347,12 @@ const basic::ZoneInfo kZoneEurope_Busingen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Guernsey -> Europe/London -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Guernsey[] ACE_TIME_PROGMEM = "Europe/Guernsey"; +static const char kZoneNameEurope_Guernsey[] ACE_TIME_PROGMEM = "\x09" "Guernsey"; const basic::ZoneInfo kZoneEurope_Guernsey ACE_TIME_PROGMEM = { kZoneNameEurope_Guernsey /*name*/, @@ -11364,12 +11364,12 @@ const basic::ZoneInfo kZoneEurope_Guernsey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Isle_of_Man -> Europe/London -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Isle_of_Man[] ACE_TIME_PROGMEM = "Europe/Isle_of_Man"; +static const char kZoneNameEurope_Isle_of_Man[] ACE_TIME_PROGMEM = "\x09" "Isle_of_Man"; const basic::ZoneInfo kZoneEurope_Isle_of_Man ACE_TIME_PROGMEM = { kZoneNameEurope_Isle_of_Man /*name*/, @@ -11381,12 +11381,12 @@ const basic::ZoneInfo kZoneEurope_Isle_of_Man ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Jersey -> Europe/London -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Jersey[] ACE_TIME_PROGMEM = "Europe/Jersey"; +static const char kZoneNameEurope_Jersey[] ACE_TIME_PROGMEM = "\x09" "Jersey"; const basic::ZoneInfo kZoneEurope_Jersey ACE_TIME_PROGMEM = { kZoneNameEurope_Jersey /*name*/, @@ -11398,12 +11398,12 @@ const basic::ZoneInfo kZoneEurope_Jersey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Ljubljana -> Europe/Belgrade -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Ljubljana[] ACE_TIME_PROGMEM = "Europe/Ljubljana"; +static const char kZoneNameEurope_Ljubljana[] ACE_TIME_PROGMEM = "\x09" "Ljubljana"; const basic::ZoneInfo kZoneEurope_Ljubljana ACE_TIME_PROGMEM = { kZoneNameEurope_Ljubljana /*name*/, @@ -11415,12 +11415,12 @@ const basic::ZoneInfo kZoneEurope_Ljubljana ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Mariehamn -> Europe/Helsinki -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Mariehamn[] ACE_TIME_PROGMEM = "Europe/Mariehamn"; +static const char kZoneNameEurope_Mariehamn[] ACE_TIME_PROGMEM = "\x09" "Mariehamn"; const basic::ZoneInfo kZoneEurope_Mariehamn ACE_TIME_PROGMEM = { kZoneNameEurope_Mariehamn /*name*/, @@ -11432,12 +11432,12 @@ const basic::ZoneInfo kZoneEurope_Mariehamn ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Nicosia -> Asia/Nicosia -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Nicosia[] ACE_TIME_PROGMEM = "Europe/Nicosia"; +static const char kZoneNameEurope_Nicosia[] ACE_TIME_PROGMEM = "\x09" "Nicosia"; const basic::ZoneInfo kZoneEurope_Nicosia ACE_TIME_PROGMEM = { kZoneNameEurope_Nicosia /*name*/, @@ -11449,12 +11449,12 @@ const basic::ZoneInfo kZoneEurope_Nicosia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Podgorica -> Europe/Belgrade -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Podgorica[] ACE_TIME_PROGMEM = "Europe/Podgorica"; +static const char kZoneNameEurope_Podgorica[] ACE_TIME_PROGMEM = "\x09" "Podgorica"; const basic::ZoneInfo kZoneEurope_Podgorica ACE_TIME_PROGMEM = { kZoneNameEurope_Podgorica /*name*/, @@ -11466,12 +11466,12 @@ const basic::ZoneInfo kZoneEurope_Podgorica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/San_Marino -> Europe/Rome -// Strings (bytes): 18 -// Memory (8-bit): 29 -// Memory (32-bit): 38 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_San_Marino[] ACE_TIME_PROGMEM = "Europe/San_Marino"; +static const char kZoneNameEurope_San_Marino[] ACE_TIME_PROGMEM = "\x09" "San_Marino"; const basic::ZoneInfo kZoneEurope_San_Marino ACE_TIME_PROGMEM = { kZoneNameEurope_San_Marino /*name*/, @@ -11483,12 +11483,12 @@ const basic::ZoneInfo kZoneEurope_San_Marino ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Sarajevo -> Europe/Belgrade -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Sarajevo[] ACE_TIME_PROGMEM = "Europe/Sarajevo"; +static const char kZoneNameEurope_Sarajevo[] ACE_TIME_PROGMEM = "\x09" "Sarajevo"; const basic::ZoneInfo kZoneEurope_Sarajevo ACE_TIME_PROGMEM = { kZoneNameEurope_Sarajevo /*name*/, @@ -11500,12 +11500,12 @@ const basic::ZoneInfo kZoneEurope_Sarajevo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Skopje -> Europe/Belgrade -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Skopje[] ACE_TIME_PROGMEM = "Europe/Skopje"; +static const char kZoneNameEurope_Skopje[] ACE_TIME_PROGMEM = "\x09" "Skopje"; const basic::ZoneInfo kZoneEurope_Skopje ACE_TIME_PROGMEM = { kZoneNameEurope_Skopje /*name*/, @@ -11517,12 +11517,12 @@ const basic::ZoneInfo kZoneEurope_Skopje ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Tiraspol -> Europe/Chisinau -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Tiraspol[] ACE_TIME_PROGMEM = "Europe/Tiraspol"; +static const char kZoneNameEurope_Tiraspol[] ACE_TIME_PROGMEM = "\x09" "Tiraspol"; const basic::ZoneInfo kZoneEurope_Tiraspol ACE_TIME_PROGMEM = { kZoneNameEurope_Tiraspol /*name*/, @@ -11534,12 +11534,12 @@ const basic::ZoneInfo kZoneEurope_Tiraspol ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Vaduz -> Europe/Zurich -// Strings (bytes): 13 -// Memory (8-bit): 24 -// Memory (32-bit): 33 +// Strings (bytes): 7 (originally 13) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Vaduz[] ACE_TIME_PROGMEM = "Europe/Vaduz"; +static const char kZoneNameEurope_Vaduz[] ACE_TIME_PROGMEM = "\x09" "Vaduz"; const basic::ZoneInfo kZoneEurope_Vaduz ACE_TIME_PROGMEM = { kZoneNameEurope_Vaduz /*name*/, @@ -11551,12 +11551,12 @@ const basic::ZoneInfo kZoneEurope_Vaduz ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Vatican -> Europe/Rome -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Vatican[] ACE_TIME_PROGMEM = "Europe/Vatican"; +static const char kZoneNameEurope_Vatican[] ACE_TIME_PROGMEM = "\x09" "Vatican"; const basic::ZoneInfo kZoneEurope_Vatican ACE_TIME_PROGMEM = { kZoneNameEurope_Vatican /*name*/, @@ -11568,12 +11568,12 @@ const basic::ZoneInfo kZoneEurope_Vatican ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Zagreb -> Europe/Belgrade -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Zagreb[] ACE_TIME_PROGMEM = "Europe/Zagreb"; +static const char kZoneNameEurope_Zagreb[] ACE_TIME_PROGMEM = "\x09" "Zagreb"; const basic::ZoneInfo kZoneEurope_Zagreb ACE_TIME_PROGMEM = { kZoneNameEurope_Zagreb /*name*/, @@ -11585,7 +11585,7 @@ const basic::ZoneInfo kZoneEurope_Zagreb ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GB -> Europe/London -// Strings (bytes): 3 +// Strings (bytes): 3 (originally 3) // Memory (8-bit): 14 // Memory (32-bit): 23 //--------------------------------------------------------------------------- @@ -11602,7 +11602,7 @@ const basic::ZoneInfo kZoneGB ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GB-Eire -> Europe/London -// Strings (bytes): 8 +// Strings (bytes): 8 (originally 8) // Memory (8-bit): 19 // Memory (32-bit): 28 //--------------------------------------------------------------------------- @@ -11619,7 +11619,7 @@ const basic::ZoneInfo kZoneGB_Eire ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT -> Etc/GMT -// Strings (bytes): 4 +// Strings (bytes): 4 (originally 4) // Memory (8-bit): 15 // Memory (32-bit): 24 //--------------------------------------------------------------------------- @@ -11636,7 +11636,7 @@ const basic::ZoneInfo kZoneGMT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT+0 -> Etc/GMT -// Strings (bytes): 6 +// Strings (bytes): 6 (originally 6) // Memory (8-bit): 17 // Memory (32-bit): 26 //--------------------------------------------------------------------------- @@ -11653,7 +11653,7 @@ const basic::ZoneInfo kZoneGMT_PLUS_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT-0 -> Etc/GMT -// Strings (bytes): 6 +// Strings (bytes): 6 (originally 6) // Memory (8-bit): 17 // Memory (32-bit): 26 //--------------------------------------------------------------------------- @@ -11670,7 +11670,7 @@ const basic::ZoneInfo kZoneGMT_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT0 -> Etc/GMT -// Strings (bytes): 5 +// Strings (bytes): 5 (originally 5) // Memory (8-bit): 16 // Memory (32-bit): 25 //--------------------------------------------------------------------------- @@ -11687,7 +11687,7 @@ const basic::ZoneInfo kZoneGMT0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Greenwich -> Etc/GMT -// Strings (bytes): 10 +// Strings (bytes): 10 (originally 10) // Memory (8-bit): 21 // Memory (32-bit): 30 //--------------------------------------------------------------------------- @@ -11704,7 +11704,7 @@ const basic::ZoneInfo kZoneGreenwich ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Hongkong -> Asia/Hong_Kong -// Strings (bytes): 9 +// Strings (bytes): 9 (originally 9) // Memory (8-bit): 20 // Memory (32-bit): 29 //--------------------------------------------------------------------------- @@ -11721,7 +11721,7 @@ const basic::ZoneInfo kZoneHongkong ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Iceland -> Atlantic/Reykjavik -// Strings (bytes): 8 +// Strings (bytes): 8 (originally 8) // Memory (8-bit): 19 // Memory (32-bit): 28 //--------------------------------------------------------------------------- @@ -11738,12 +11738,12 @@ const basic::ZoneInfo kZoneIceland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Indian/Antananarivo -> Africa/Nairobi -// Strings (bytes): 20 -// Memory (8-bit): 31 -// Memory (32-bit): 40 +// Strings (bytes): 14 (originally 20) +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- -static const char kZoneNameIndian_Antananarivo[] ACE_TIME_PROGMEM = "Indian/Antananarivo"; +static const char kZoneNameIndian_Antananarivo[] ACE_TIME_PROGMEM = "\x0a" "Antananarivo"; const basic::ZoneInfo kZoneIndian_Antananarivo ACE_TIME_PROGMEM = { kZoneNameIndian_Antananarivo /*name*/, @@ -11755,12 +11755,12 @@ const basic::ZoneInfo kZoneIndian_Antananarivo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Indian/Comoro -> Africa/Nairobi -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameIndian_Comoro[] ACE_TIME_PROGMEM = "Indian/Comoro"; +static const char kZoneNameIndian_Comoro[] ACE_TIME_PROGMEM = "\x0a" "Comoro"; const basic::ZoneInfo kZoneIndian_Comoro ACE_TIME_PROGMEM = { kZoneNameIndian_Comoro /*name*/, @@ -11772,12 +11772,12 @@ const basic::ZoneInfo kZoneIndian_Comoro ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Indian/Mayotte -> Africa/Nairobi -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameIndian_Mayotte[] ACE_TIME_PROGMEM = "Indian/Mayotte"; +static const char kZoneNameIndian_Mayotte[] ACE_TIME_PROGMEM = "\x0a" "Mayotte"; const basic::ZoneInfo kZoneIndian_Mayotte ACE_TIME_PROGMEM = { kZoneNameIndian_Mayotte /*name*/, @@ -11789,7 +11789,7 @@ const basic::ZoneInfo kZoneIndian_Mayotte ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Iran -> Asia/Tehran -// Strings (bytes): 5 +// Strings (bytes): 5 (originally 5) // Memory (8-bit): 16 // Memory (32-bit): 25 //--------------------------------------------------------------------------- @@ -11806,7 +11806,7 @@ const basic::ZoneInfo kZoneIran ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Israel -> Asia/Jerusalem -// Strings (bytes): 7 +// Strings (bytes): 7 (originally 7) // Memory (8-bit): 18 // Memory (32-bit): 27 //--------------------------------------------------------------------------- @@ -11823,7 +11823,7 @@ const basic::ZoneInfo kZoneIsrael ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Jamaica -> America/Jamaica -// Strings (bytes): 8 +// Strings (bytes): 8 (originally 8) // Memory (8-bit): 19 // Memory (32-bit): 28 //--------------------------------------------------------------------------- @@ -11840,7 +11840,7 @@ const basic::ZoneInfo kZoneJamaica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Japan -> Asia/Tokyo -// Strings (bytes): 6 +// Strings (bytes): 6 (originally 6) // Memory (8-bit): 17 // Memory (32-bit): 26 //--------------------------------------------------------------------------- @@ -11857,7 +11857,7 @@ const basic::ZoneInfo kZoneJapan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Kwajalein -> Pacific/Kwajalein -// Strings (bytes): 10 +// Strings (bytes): 10 (originally 10) // Memory (8-bit): 21 // Memory (32-bit): 30 //--------------------------------------------------------------------------- @@ -11874,7 +11874,7 @@ const basic::ZoneInfo kZoneKwajalein ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Mexico/BajaSur -> America/Mazatlan -// Strings (bytes): 15 +// Strings (bytes): 15 (originally 15) // Memory (8-bit): 26 // Memory (32-bit): 35 //--------------------------------------------------------------------------- @@ -11891,7 +11891,7 @@ const basic::ZoneInfo kZoneMexico_BajaSur ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: NZ -> Pacific/Auckland -// Strings (bytes): 3 +// Strings (bytes): 3 (originally 3) // Memory (8-bit): 14 // Memory (32-bit): 23 //--------------------------------------------------------------------------- @@ -11908,7 +11908,7 @@ const basic::ZoneInfo kZoneNZ ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: NZ-CHAT -> Pacific/Chatham -// Strings (bytes): 8 +// Strings (bytes): 8 (originally 8) // Memory (8-bit): 19 // Memory (32-bit): 28 //--------------------------------------------------------------------------- @@ -11925,7 +11925,7 @@ const basic::ZoneInfo kZoneNZ_CHAT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Navajo -> America/Denver -// Strings (bytes): 7 +// Strings (bytes): 7 (originally 7) // Memory (8-bit): 18 // Memory (32-bit): 27 //--------------------------------------------------------------------------- @@ -11942,7 +11942,7 @@ const basic::ZoneInfo kZoneNavajo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: PRC -> Asia/Shanghai -// Strings (bytes): 4 +// Strings (bytes): 4 (originally 4) // Memory (8-bit): 15 // Memory (32-bit): 24 //--------------------------------------------------------------------------- @@ -11959,12 +11959,12 @@ const basic::ZoneInfo kZonePRC ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Johnston -> Pacific/Honolulu -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNamePacific_Johnston[] ACE_TIME_PROGMEM = "Pacific/Johnston"; +static const char kZoneNamePacific_Johnston[] ACE_TIME_PROGMEM = "\x0b" "Johnston"; const basic::ZoneInfo kZonePacific_Johnston ACE_TIME_PROGMEM = { kZoneNamePacific_Johnston /*name*/, @@ -11976,12 +11976,12 @@ const basic::ZoneInfo kZonePacific_Johnston ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Midway -> Pacific/Pago_Pago -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 8 (originally 15) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNamePacific_Midway[] ACE_TIME_PROGMEM = "Pacific/Midway"; +static const char kZoneNamePacific_Midway[] ACE_TIME_PROGMEM = "\x0b" "Midway"; const basic::ZoneInfo kZonePacific_Midway ACE_TIME_PROGMEM = { kZoneNamePacific_Midway /*name*/, @@ -11993,12 +11993,12 @@ const basic::ZoneInfo kZonePacific_Midway ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Ponape -> Pacific/Pohnpei -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 8 (originally 15) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNamePacific_Ponape[] ACE_TIME_PROGMEM = "Pacific/Ponape"; +static const char kZoneNamePacific_Ponape[] ACE_TIME_PROGMEM = "\x0b" "Ponape"; const basic::ZoneInfo kZonePacific_Ponape ACE_TIME_PROGMEM = { kZoneNamePacific_Ponape /*name*/, @@ -12010,12 +12010,12 @@ const basic::ZoneInfo kZonePacific_Ponape ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Samoa -> Pacific/Pago_Pago -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 7 (originally 14) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNamePacific_Samoa[] ACE_TIME_PROGMEM = "Pacific/Samoa"; +static const char kZoneNamePacific_Samoa[] ACE_TIME_PROGMEM = "\x0b" "Samoa"; const basic::ZoneInfo kZonePacific_Samoa ACE_TIME_PROGMEM = { kZoneNamePacific_Samoa /*name*/, @@ -12027,12 +12027,12 @@ const basic::ZoneInfo kZonePacific_Samoa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Truk -> Pacific/Chuuk -// Strings (bytes): 13 -// Memory (8-bit): 24 -// Memory (32-bit): 33 +// Strings (bytes): 6 (originally 13) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNamePacific_Truk[] ACE_TIME_PROGMEM = "Pacific/Truk"; +static const char kZoneNamePacific_Truk[] ACE_TIME_PROGMEM = "\x0b" "Truk"; const basic::ZoneInfo kZonePacific_Truk ACE_TIME_PROGMEM = { kZoneNamePacific_Truk /*name*/, @@ -12044,12 +12044,12 @@ const basic::ZoneInfo kZonePacific_Truk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Yap -> Pacific/Chuuk -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 5 (originally 12) +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- -static const char kZoneNamePacific_Yap[] ACE_TIME_PROGMEM = "Pacific/Yap"; +static const char kZoneNamePacific_Yap[] ACE_TIME_PROGMEM = "\x0b" "Yap"; const basic::ZoneInfo kZonePacific_Yap ACE_TIME_PROGMEM = { kZoneNamePacific_Yap /*name*/, @@ -12061,7 +12061,7 @@ const basic::ZoneInfo kZonePacific_Yap ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Poland -> Europe/Warsaw -// Strings (bytes): 7 +// Strings (bytes): 7 (originally 7) // Memory (8-bit): 18 // Memory (32-bit): 27 //--------------------------------------------------------------------------- @@ -12078,7 +12078,7 @@ const basic::ZoneInfo kZonePoland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Portugal -> Europe/Lisbon -// Strings (bytes): 9 +// Strings (bytes): 9 (originally 9) // Memory (8-bit): 20 // Memory (32-bit): 29 //--------------------------------------------------------------------------- @@ -12095,7 +12095,7 @@ const basic::ZoneInfo kZonePortugal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: ROC -> Asia/Taipei -// Strings (bytes): 4 +// Strings (bytes): 4 (originally 4) // Memory (8-bit): 15 // Memory (32-bit): 24 //--------------------------------------------------------------------------- @@ -12112,7 +12112,7 @@ const basic::ZoneInfo kZoneROC ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: ROK -> Asia/Seoul -// Strings (bytes): 4 +// Strings (bytes): 4 (originally 4) // Memory (8-bit): 15 // Memory (32-bit): 24 //--------------------------------------------------------------------------- @@ -12129,7 +12129,7 @@ const basic::ZoneInfo kZoneROK ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Singapore -> Asia/Singapore -// Strings (bytes): 10 +// Strings (bytes): 10 (originally 10) // Memory (8-bit): 21 // Memory (32-bit): 30 //--------------------------------------------------------------------------- @@ -12146,7 +12146,7 @@ const basic::ZoneInfo kZoneSingapore ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: UCT -> Etc/UTC -// Strings (bytes): 4 +// Strings (bytes): 4 (originally 4) // Memory (8-bit): 15 // Memory (32-bit): 24 //--------------------------------------------------------------------------- @@ -12163,7 +12163,7 @@ const basic::ZoneInfo kZoneUCT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Alaska -> America/Anchorage -// Strings (bytes): 10 +// Strings (bytes): 10 (originally 10) // Memory (8-bit): 21 // Memory (32-bit): 30 //--------------------------------------------------------------------------- @@ -12180,7 +12180,7 @@ const basic::ZoneInfo kZoneUS_Alaska ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Aleutian -> America/Adak -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 23 // Memory (32-bit): 32 //--------------------------------------------------------------------------- @@ -12197,7 +12197,7 @@ const basic::ZoneInfo kZoneUS_Aleutian ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Arizona -> America/Phoenix -// Strings (bytes): 11 +// Strings (bytes): 11 (originally 11) // Memory (8-bit): 22 // Memory (32-bit): 31 //--------------------------------------------------------------------------- @@ -12214,7 +12214,7 @@ const basic::ZoneInfo kZoneUS_Arizona ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Central -> America/Chicago -// Strings (bytes): 11 +// Strings (bytes): 11 (originally 11) // Memory (8-bit): 22 // Memory (32-bit): 31 //--------------------------------------------------------------------------- @@ -12231,7 +12231,7 @@ const basic::ZoneInfo kZoneUS_Central ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/East-Indiana -> America/Indiana/Indianapolis -// Strings (bytes): 16 +// Strings (bytes): 16 (originally 16) // Memory (8-bit): 27 // Memory (32-bit): 36 //--------------------------------------------------------------------------- @@ -12248,7 +12248,7 @@ const basic::ZoneInfo kZoneUS_East_Indiana ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Eastern -> America/New_York -// Strings (bytes): 11 +// Strings (bytes): 11 (originally 11) // Memory (8-bit): 22 // Memory (32-bit): 31 //--------------------------------------------------------------------------- @@ -12265,7 +12265,7 @@ const basic::ZoneInfo kZoneUS_Eastern ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Hawaii -> Pacific/Honolulu -// Strings (bytes): 10 +// Strings (bytes): 10 (originally 10) // Memory (8-bit): 21 // Memory (32-bit): 30 //--------------------------------------------------------------------------- @@ -12282,7 +12282,7 @@ const basic::ZoneInfo kZoneUS_Hawaii ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Michigan -> America/Detroit -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 23 // Memory (32-bit): 32 //--------------------------------------------------------------------------- @@ -12299,7 +12299,7 @@ const basic::ZoneInfo kZoneUS_Michigan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Mountain -> America/Denver -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 23 // Memory (32-bit): 32 //--------------------------------------------------------------------------- @@ -12316,7 +12316,7 @@ const basic::ZoneInfo kZoneUS_Mountain ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Pacific -> America/Los_Angeles -// Strings (bytes): 11 +// Strings (bytes): 11 (originally 11) // Memory (8-bit): 22 // Memory (32-bit): 31 //--------------------------------------------------------------------------- @@ -12333,7 +12333,7 @@ const basic::ZoneInfo kZoneUS_Pacific ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Samoa -> Pacific/Pago_Pago -// Strings (bytes): 9 +// Strings (bytes): 9 (originally 9) // Memory (8-bit): 20 // Memory (32-bit): 29 //--------------------------------------------------------------------------- @@ -12350,7 +12350,7 @@ const basic::ZoneInfo kZoneUS_Samoa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: UTC -> Etc/UTC -// Strings (bytes): 4 +// Strings (bytes): 4 (originally 4) // Memory (8-bit): 15 // Memory (32-bit): 24 //--------------------------------------------------------------------------- @@ -12367,7 +12367,7 @@ const basic::ZoneInfo kZoneUTC ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Universal -> Etc/UTC -// Strings (bytes): 10 +// Strings (bytes): 10 (originally 10) // Memory (8-bit): 21 // Memory (32-bit): 30 //--------------------------------------------------------------------------- @@ -12384,7 +12384,7 @@ const basic::ZoneInfo kZoneUniversal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Zulu -> Etc/UTC -// Strings (bytes): 5 +// Strings (bytes): 5 (originally 5) // Memory (8-bit): 16 // Memory (32-bit): 25 //--------------------------------------------------------------------------- diff --git a/src/ace_time/zonedbx/zone_infos.cpp b/src/ace_time/zonedbx/zone_infos.cpp index 36643af29..87bc45e96 100644 --- a/src/ace_time/zonedbx/zone_infos.cpp +++ b/src/ace_time/zonedbx/zone_infos.cpp @@ -16673,12 +16673,12 @@ const extended::ZoneInfo kZoneWET ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Addis_Ababa -> Africa/Nairobi -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Addis_Ababa[] ACE_TIME_PROGMEM = "Africa/Addis_Ababa"; +static const char kZoneNameAfrica_Addis_Ababa[] ACE_TIME_PROGMEM = "\x01" "Addis_Ababa"; const extended::ZoneInfo kZoneAfrica_Addis_Ababa ACE_TIME_PROGMEM = { kZoneNameAfrica_Addis_Ababa /*name*/, @@ -16690,12 +16690,12 @@ const extended::ZoneInfo kZoneAfrica_Addis_Ababa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Asmara -> Africa/Nairobi -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Asmara[] ACE_TIME_PROGMEM = "Africa/Asmara"; +static const char kZoneNameAfrica_Asmara[] ACE_TIME_PROGMEM = "\x01" "Asmara"; const extended::ZoneInfo kZoneAfrica_Asmara ACE_TIME_PROGMEM = { kZoneNameAfrica_Asmara /*name*/, @@ -16707,12 +16707,12 @@ const extended::ZoneInfo kZoneAfrica_Asmara ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Asmera -> Africa/Nairobi -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Asmera[] ACE_TIME_PROGMEM = "Africa/Asmera"; +static const char kZoneNameAfrica_Asmera[] ACE_TIME_PROGMEM = "\x01" "Asmera"; const extended::ZoneInfo kZoneAfrica_Asmera ACE_TIME_PROGMEM = { kZoneNameAfrica_Asmera /*name*/, @@ -16724,12 +16724,12 @@ const extended::ZoneInfo kZoneAfrica_Asmera ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Bamako -> Africa/Abidjan -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Bamako[] ACE_TIME_PROGMEM = "Africa/Bamako"; +static const char kZoneNameAfrica_Bamako[] ACE_TIME_PROGMEM = "\x01" "Bamako"; const extended::ZoneInfo kZoneAfrica_Bamako ACE_TIME_PROGMEM = { kZoneNameAfrica_Bamako /*name*/, @@ -16741,12 +16741,12 @@ const extended::ZoneInfo kZoneAfrica_Bamako ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Bangui -> Africa/Lagos -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Bangui[] ACE_TIME_PROGMEM = "Africa/Bangui"; +static const char kZoneNameAfrica_Bangui[] ACE_TIME_PROGMEM = "\x01" "Bangui"; const extended::ZoneInfo kZoneAfrica_Bangui ACE_TIME_PROGMEM = { kZoneNameAfrica_Bangui /*name*/, @@ -16758,12 +16758,12 @@ const extended::ZoneInfo kZoneAfrica_Bangui ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Banjul -> Africa/Abidjan -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Banjul[] ACE_TIME_PROGMEM = "Africa/Banjul"; +static const char kZoneNameAfrica_Banjul[] ACE_TIME_PROGMEM = "\x01" "Banjul"; const extended::ZoneInfo kZoneAfrica_Banjul ACE_TIME_PROGMEM = { kZoneNameAfrica_Banjul /*name*/, @@ -16775,12 +16775,12 @@ const extended::ZoneInfo kZoneAfrica_Banjul ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Blantyre -> Africa/Maputo -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Blantyre[] ACE_TIME_PROGMEM = "Africa/Blantyre"; +static const char kZoneNameAfrica_Blantyre[] ACE_TIME_PROGMEM = "\x01" "Blantyre"; const extended::ZoneInfo kZoneAfrica_Blantyre ACE_TIME_PROGMEM = { kZoneNameAfrica_Blantyre /*name*/, @@ -16792,12 +16792,12 @@ const extended::ZoneInfo kZoneAfrica_Blantyre ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Brazzaville -> Africa/Lagos -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Brazzaville[] ACE_TIME_PROGMEM = "Africa/Brazzaville"; +static const char kZoneNameAfrica_Brazzaville[] ACE_TIME_PROGMEM = "\x01" "Brazzaville"; const extended::ZoneInfo kZoneAfrica_Brazzaville ACE_TIME_PROGMEM = { kZoneNameAfrica_Brazzaville /*name*/, @@ -16809,12 +16809,12 @@ const extended::ZoneInfo kZoneAfrica_Brazzaville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Bujumbura -> Africa/Maputo -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Bujumbura[] ACE_TIME_PROGMEM = "Africa/Bujumbura"; +static const char kZoneNameAfrica_Bujumbura[] ACE_TIME_PROGMEM = "\x01" "Bujumbura"; const extended::ZoneInfo kZoneAfrica_Bujumbura ACE_TIME_PROGMEM = { kZoneNameAfrica_Bujumbura /*name*/, @@ -16826,12 +16826,12 @@ const extended::ZoneInfo kZoneAfrica_Bujumbura ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Conakry -> Africa/Abidjan -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Conakry[] ACE_TIME_PROGMEM = "Africa/Conakry"; +static const char kZoneNameAfrica_Conakry[] ACE_TIME_PROGMEM = "\x01" "Conakry"; const extended::ZoneInfo kZoneAfrica_Conakry ACE_TIME_PROGMEM = { kZoneNameAfrica_Conakry /*name*/, @@ -16843,12 +16843,12 @@ const extended::ZoneInfo kZoneAfrica_Conakry ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Dakar -> Africa/Abidjan -// Strings (bytes): 13 -// Memory (8-bit): 24 -// Memory (32-bit): 33 +// Strings (bytes): 7 (originally 13) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Dakar[] ACE_TIME_PROGMEM = "Africa/Dakar"; +static const char kZoneNameAfrica_Dakar[] ACE_TIME_PROGMEM = "\x01" "Dakar"; const extended::ZoneInfo kZoneAfrica_Dakar ACE_TIME_PROGMEM = { kZoneNameAfrica_Dakar /*name*/, @@ -16860,12 +16860,12 @@ const extended::ZoneInfo kZoneAfrica_Dakar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Dar_es_Salaam -> Africa/Nairobi -// Strings (bytes): 21 -// Memory (8-bit): 32 -// Memory (32-bit): 41 +// Strings (bytes): 15 (originally 21) +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Dar_es_Salaam[] ACE_TIME_PROGMEM = "Africa/Dar_es_Salaam"; +static const char kZoneNameAfrica_Dar_es_Salaam[] ACE_TIME_PROGMEM = "\x01" "Dar_es_Salaam"; const extended::ZoneInfo kZoneAfrica_Dar_es_Salaam ACE_TIME_PROGMEM = { kZoneNameAfrica_Dar_es_Salaam /*name*/, @@ -16877,12 +16877,12 @@ const extended::ZoneInfo kZoneAfrica_Dar_es_Salaam ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Djibouti -> Africa/Nairobi -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Djibouti[] ACE_TIME_PROGMEM = "Africa/Djibouti"; +static const char kZoneNameAfrica_Djibouti[] ACE_TIME_PROGMEM = "\x01" "Djibouti"; const extended::ZoneInfo kZoneAfrica_Djibouti ACE_TIME_PROGMEM = { kZoneNameAfrica_Djibouti /*name*/, @@ -16894,12 +16894,12 @@ const extended::ZoneInfo kZoneAfrica_Djibouti ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Douala -> Africa/Lagos -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Douala[] ACE_TIME_PROGMEM = "Africa/Douala"; +static const char kZoneNameAfrica_Douala[] ACE_TIME_PROGMEM = "\x01" "Douala"; const extended::ZoneInfo kZoneAfrica_Douala ACE_TIME_PROGMEM = { kZoneNameAfrica_Douala /*name*/, @@ -16911,12 +16911,12 @@ const extended::ZoneInfo kZoneAfrica_Douala ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Freetown -> Africa/Abidjan -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Freetown[] ACE_TIME_PROGMEM = "Africa/Freetown"; +static const char kZoneNameAfrica_Freetown[] ACE_TIME_PROGMEM = "\x01" "Freetown"; const extended::ZoneInfo kZoneAfrica_Freetown ACE_TIME_PROGMEM = { kZoneNameAfrica_Freetown /*name*/, @@ -16928,12 +16928,12 @@ const extended::ZoneInfo kZoneAfrica_Freetown ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Gaborone -> Africa/Maputo -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Gaborone[] ACE_TIME_PROGMEM = "Africa/Gaborone"; +static const char kZoneNameAfrica_Gaborone[] ACE_TIME_PROGMEM = "\x01" "Gaborone"; const extended::ZoneInfo kZoneAfrica_Gaborone ACE_TIME_PROGMEM = { kZoneNameAfrica_Gaborone /*name*/, @@ -16945,12 +16945,12 @@ const extended::ZoneInfo kZoneAfrica_Gaborone ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Harare -> Africa/Maputo -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Harare[] ACE_TIME_PROGMEM = "Africa/Harare"; +static const char kZoneNameAfrica_Harare[] ACE_TIME_PROGMEM = "\x01" "Harare"; const extended::ZoneInfo kZoneAfrica_Harare ACE_TIME_PROGMEM = { kZoneNameAfrica_Harare /*name*/, @@ -16962,12 +16962,12 @@ const extended::ZoneInfo kZoneAfrica_Harare ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Kampala -> Africa/Nairobi -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Kampala[] ACE_TIME_PROGMEM = "Africa/Kampala"; +static const char kZoneNameAfrica_Kampala[] ACE_TIME_PROGMEM = "\x01" "Kampala"; const extended::ZoneInfo kZoneAfrica_Kampala ACE_TIME_PROGMEM = { kZoneNameAfrica_Kampala /*name*/, @@ -16979,12 +16979,12 @@ const extended::ZoneInfo kZoneAfrica_Kampala ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Kigali -> Africa/Maputo -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Kigali[] ACE_TIME_PROGMEM = "Africa/Kigali"; +static const char kZoneNameAfrica_Kigali[] ACE_TIME_PROGMEM = "\x01" "Kigali"; const extended::ZoneInfo kZoneAfrica_Kigali ACE_TIME_PROGMEM = { kZoneNameAfrica_Kigali /*name*/, @@ -16996,12 +16996,12 @@ const extended::ZoneInfo kZoneAfrica_Kigali ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Kinshasa -> Africa/Lagos -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Kinshasa[] ACE_TIME_PROGMEM = "Africa/Kinshasa"; +static const char kZoneNameAfrica_Kinshasa[] ACE_TIME_PROGMEM = "\x01" "Kinshasa"; const extended::ZoneInfo kZoneAfrica_Kinshasa ACE_TIME_PROGMEM = { kZoneNameAfrica_Kinshasa /*name*/, @@ -17013,12 +17013,12 @@ const extended::ZoneInfo kZoneAfrica_Kinshasa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Libreville -> Africa/Lagos -// Strings (bytes): 18 -// Memory (8-bit): 29 -// Memory (32-bit): 38 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Libreville[] ACE_TIME_PROGMEM = "Africa/Libreville"; +static const char kZoneNameAfrica_Libreville[] ACE_TIME_PROGMEM = "\x01" "Libreville"; const extended::ZoneInfo kZoneAfrica_Libreville ACE_TIME_PROGMEM = { kZoneNameAfrica_Libreville /*name*/, @@ -17030,12 +17030,12 @@ const extended::ZoneInfo kZoneAfrica_Libreville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Lome -> Africa/Abidjan -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 6 (originally 12) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Lome[] ACE_TIME_PROGMEM = "Africa/Lome"; +static const char kZoneNameAfrica_Lome[] ACE_TIME_PROGMEM = "\x01" "Lome"; const extended::ZoneInfo kZoneAfrica_Lome ACE_TIME_PROGMEM = { kZoneNameAfrica_Lome /*name*/, @@ -17047,12 +17047,12 @@ const extended::ZoneInfo kZoneAfrica_Lome ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Luanda -> Africa/Lagos -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Luanda[] ACE_TIME_PROGMEM = "Africa/Luanda"; +static const char kZoneNameAfrica_Luanda[] ACE_TIME_PROGMEM = "\x01" "Luanda"; const extended::ZoneInfo kZoneAfrica_Luanda ACE_TIME_PROGMEM = { kZoneNameAfrica_Luanda /*name*/, @@ -17064,12 +17064,12 @@ const extended::ZoneInfo kZoneAfrica_Luanda ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Lubumbashi -> Africa/Maputo -// Strings (bytes): 18 -// Memory (8-bit): 29 -// Memory (32-bit): 38 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Lubumbashi[] ACE_TIME_PROGMEM = "Africa/Lubumbashi"; +static const char kZoneNameAfrica_Lubumbashi[] ACE_TIME_PROGMEM = "\x01" "Lubumbashi"; const extended::ZoneInfo kZoneAfrica_Lubumbashi ACE_TIME_PROGMEM = { kZoneNameAfrica_Lubumbashi /*name*/, @@ -17081,12 +17081,12 @@ const extended::ZoneInfo kZoneAfrica_Lubumbashi ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Lusaka -> Africa/Maputo -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Lusaka[] ACE_TIME_PROGMEM = "Africa/Lusaka"; +static const char kZoneNameAfrica_Lusaka[] ACE_TIME_PROGMEM = "\x01" "Lusaka"; const extended::ZoneInfo kZoneAfrica_Lusaka ACE_TIME_PROGMEM = { kZoneNameAfrica_Lusaka /*name*/, @@ -17098,12 +17098,12 @@ const extended::ZoneInfo kZoneAfrica_Lusaka ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Malabo -> Africa/Lagos -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Malabo[] ACE_TIME_PROGMEM = "Africa/Malabo"; +static const char kZoneNameAfrica_Malabo[] ACE_TIME_PROGMEM = "\x01" "Malabo"; const extended::ZoneInfo kZoneAfrica_Malabo ACE_TIME_PROGMEM = { kZoneNameAfrica_Malabo /*name*/, @@ -17115,12 +17115,12 @@ const extended::ZoneInfo kZoneAfrica_Malabo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Maseru -> Africa/Johannesburg -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Maseru[] ACE_TIME_PROGMEM = "Africa/Maseru"; +static const char kZoneNameAfrica_Maseru[] ACE_TIME_PROGMEM = "\x01" "Maseru"; const extended::ZoneInfo kZoneAfrica_Maseru ACE_TIME_PROGMEM = { kZoneNameAfrica_Maseru /*name*/, @@ -17132,12 +17132,12 @@ const extended::ZoneInfo kZoneAfrica_Maseru ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Mbabane -> Africa/Johannesburg -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Mbabane[] ACE_TIME_PROGMEM = "Africa/Mbabane"; +static const char kZoneNameAfrica_Mbabane[] ACE_TIME_PROGMEM = "\x01" "Mbabane"; const extended::ZoneInfo kZoneAfrica_Mbabane ACE_TIME_PROGMEM = { kZoneNameAfrica_Mbabane /*name*/, @@ -17149,12 +17149,12 @@ const extended::ZoneInfo kZoneAfrica_Mbabane ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Mogadishu -> Africa/Nairobi -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Mogadishu[] ACE_TIME_PROGMEM = "Africa/Mogadishu"; +static const char kZoneNameAfrica_Mogadishu[] ACE_TIME_PROGMEM = "\x01" "Mogadishu"; const extended::ZoneInfo kZoneAfrica_Mogadishu ACE_TIME_PROGMEM = { kZoneNameAfrica_Mogadishu /*name*/, @@ -17166,12 +17166,12 @@ const extended::ZoneInfo kZoneAfrica_Mogadishu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Niamey -> Africa/Lagos -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Niamey[] ACE_TIME_PROGMEM = "Africa/Niamey"; +static const char kZoneNameAfrica_Niamey[] ACE_TIME_PROGMEM = "\x01" "Niamey"; const extended::ZoneInfo kZoneAfrica_Niamey ACE_TIME_PROGMEM = { kZoneNameAfrica_Niamey /*name*/, @@ -17183,12 +17183,12 @@ const extended::ZoneInfo kZoneAfrica_Niamey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Nouakchott -> Africa/Abidjan -// Strings (bytes): 18 -// Memory (8-bit): 29 -// Memory (32-bit): 38 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Nouakchott[] ACE_TIME_PROGMEM = "Africa/Nouakchott"; +static const char kZoneNameAfrica_Nouakchott[] ACE_TIME_PROGMEM = "\x01" "Nouakchott"; const extended::ZoneInfo kZoneAfrica_Nouakchott ACE_TIME_PROGMEM = { kZoneNameAfrica_Nouakchott /*name*/, @@ -17200,12 +17200,12 @@ const extended::ZoneInfo kZoneAfrica_Nouakchott ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Ouagadougou -> Africa/Abidjan -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Ouagadougou[] ACE_TIME_PROGMEM = "Africa/Ouagadougou"; +static const char kZoneNameAfrica_Ouagadougou[] ACE_TIME_PROGMEM = "\x01" "Ouagadougou"; const extended::ZoneInfo kZoneAfrica_Ouagadougou ACE_TIME_PROGMEM = { kZoneNameAfrica_Ouagadougou /*name*/, @@ -17217,12 +17217,12 @@ const extended::ZoneInfo kZoneAfrica_Ouagadougou ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Porto-Novo -> Africa/Lagos -// Strings (bytes): 18 -// Memory (8-bit): 29 -// Memory (32-bit): 38 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Porto_Novo[] ACE_TIME_PROGMEM = "Africa/Porto-Novo"; +static const char kZoneNameAfrica_Porto_Novo[] ACE_TIME_PROGMEM = "\x01" "Porto-Novo"; const extended::ZoneInfo kZoneAfrica_Porto_Novo ACE_TIME_PROGMEM = { kZoneNameAfrica_Porto_Novo /*name*/, @@ -17234,12 +17234,12 @@ const extended::ZoneInfo kZoneAfrica_Porto_Novo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Africa/Timbuktu -> Africa/Abidjan -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAfrica_Timbuktu[] ACE_TIME_PROGMEM = "Africa/Timbuktu"; +static const char kZoneNameAfrica_Timbuktu[] ACE_TIME_PROGMEM = "\x01" "Timbuktu"; const extended::ZoneInfo kZoneAfrica_Timbuktu ACE_TIME_PROGMEM = { kZoneNameAfrica_Timbuktu /*name*/, @@ -17251,12 +17251,12 @@ const extended::ZoneInfo kZoneAfrica_Timbuktu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Anguilla -> America/Port_of_Spain -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Anguilla[] ACE_TIME_PROGMEM = "America/Anguilla"; +static const char kZoneNameAmerica_Anguilla[] ACE_TIME_PROGMEM = "\x02" "Anguilla"; const extended::ZoneInfo kZoneAmerica_Anguilla ACE_TIME_PROGMEM = { kZoneNameAmerica_Anguilla /*name*/, @@ -17268,12 +17268,12 @@ const extended::ZoneInfo kZoneAmerica_Anguilla ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Antigua -> America/Port_of_Spain -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 9 (originally 16) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Antigua[] ACE_TIME_PROGMEM = "America/Antigua"; +static const char kZoneNameAmerica_Antigua[] ACE_TIME_PROGMEM = "\x02" "Antigua"; const extended::ZoneInfo kZoneAmerica_Antigua ACE_TIME_PROGMEM = { kZoneNameAmerica_Antigua /*name*/, @@ -17285,12 +17285,12 @@ const extended::ZoneInfo kZoneAmerica_Antigua ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Argentina/ComodRivadavia -> America/Argentina/Catamarca -// Strings (bytes): 33 -// Memory (8-bit): 44 -// Memory (32-bit): 53 +// Strings (bytes): 17 (originally 33) +// Memory (8-bit): 28 +// Memory (32-bit): 37 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Argentina_ComodRivadavia[] ACE_TIME_PROGMEM = "America/Argentina/ComodRivadavia"; +static const char kZoneNameAmerica_Argentina_ComodRivadavia[] ACE_TIME_PROGMEM = "\x02" "\x04" "ComodRivadavia"; const extended::ZoneInfo kZoneAmerica_Argentina_ComodRivadavia ACE_TIME_PROGMEM = { kZoneNameAmerica_Argentina_ComodRivadavia /*name*/, @@ -17302,12 +17302,12 @@ const extended::ZoneInfo kZoneAmerica_Argentina_ComodRivadavia ACE_TIME_PROGMEM //--------------------------------------------------------------------------- // Link name: America/Aruba -> America/Curacao -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 7 (originally 14) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Aruba[] ACE_TIME_PROGMEM = "America/Aruba"; +static const char kZoneNameAmerica_Aruba[] ACE_TIME_PROGMEM = "\x02" "Aruba"; const extended::ZoneInfo kZoneAmerica_Aruba ACE_TIME_PROGMEM = { kZoneNameAmerica_Aruba /*name*/, @@ -17319,12 +17319,12 @@ const extended::ZoneInfo kZoneAmerica_Aruba ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Atka -> America/Adak -// Strings (bytes): 13 -// Memory (8-bit): 24 -// Memory (32-bit): 33 +// Strings (bytes): 6 (originally 13) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Atka[] ACE_TIME_PROGMEM = "America/Atka"; +static const char kZoneNameAmerica_Atka[] ACE_TIME_PROGMEM = "\x02" "Atka"; const extended::ZoneInfo kZoneAmerica_Atka ACE_TIME_PROGMEM = { kZoneNameAmerica_Atka /*name*/, @@ -17336,12 +17336,12 @@ const extended::ZoneInfo kZoneAmerica_Atka ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Buenos_Aires -> America/Argentina/Buenos_Aires -// Strings (bytes): 21 -// Memory (8-bit): 32 -// Memory (32-bit): 41 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Buenos_Aires[] ACE_TIME_PROGMEM = "America/Buenos_Aires"; +static const char kZoneNameAmerica_Buenos_Aires[] ACE_TIME_PROGMEM = "\x02" "Buenos_Aires"; const extended::ZoneInfo kZoneAmerica_Buenos_Aires ACE_TIME_PROGMEM = { kZoneNameAmerica_Buenos_Aires /*name*/, @@ -17353,12 +17353,12 @@ const extended::ZoneInfo kZoneAmerica_Buenos_Aires ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Catamarca -> America/Argentina/Catamarca -// Strings (bytes): 18 -// Memory (8-bit): 29 -// Memory (32-bit): 38 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Catamarca[] ACE_TIME_PROGMEM = "America/Catamarca"; +static const char kZoneNameAmerica_Catamarca[] ACE_TIME_PROGMEM = "\x02" "Catamarca"; const extended::ZoneInfo kZoneAmerica_Catamarca ACE_TIME_PROGMEM = { kZoneNameAmerica_Catamarca /*name*/, @@ -17370,12 +17370,12 @@ const extended::ZoneInfo kZoneAmerica_Catamarca ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Cayman -> America/Panama -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 8 (originally 15) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Cayman[] ACE_TIME_PROGMEM = "America/Cayman"; +static const char kZoneNameAmerica_Cayman[] ACE_TIME_PROGMEM = "\x02" "Cayman"; const extended::ZoneInfo kZoneAmerica_Cayman ACE_TIME_PROGMEM = { kZoneNameAmerica_Cayman /*name*/, @@ -17387,12 +17387,12 @@ const extended::ZoneInfo kZoneAmerica_Cayman ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Coral_Harbour -> America/Atikokan -// Strings (bytes): 22 -// Memory (8-bit): 33 -// Memory (32-bit): 42 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Coral_Harbour[] ACE_TIME_PROGMEM = "America/Coral_Harbour"; +static const char kZoneNameAmerica_Coral_Harbour[] ACE_TIME_PROGMEM = "\x02" "Coral_Harbour"; const extended::ZoneInfo kZoneAmerica_Coral_Harbour ACE_TIME_PROGMEM = { kZoneNameAmerica_Coral_Harbour /*name*/, @@ -17404,12 +17404,12 @@ const extended::ZoneInfo kZoneAmerica_Coral_Harbour ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Cordoba -> America/Argentina/Cordoba -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 9 (originally 16) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Cordoba[] ACE_TIME_PROGMEM = "America/Cordoba"; +static const char kZoneNameAmerica_Cordoba[] ACE_TIME_PROGMEM = "\x02" "Cordoba"; const extended::ZoneInfo kZoneAmerica_Cordoba ACE_TIME_PROGMEM = { kZoneNameAmerica_Cordoba /*name*/, @@ -17421,12 +17421,12 @@ const extended::ZoneInfo kZoneAmerica_Cordoba ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Dominica -> America/Port_of_Spain -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Dominica[] ACE_TIME_PROGMEM = "America/Dominica"; +static const char kZoneNameAmerica_Dominica[] ACE_TIME_PROGMEM = "\x02" "Dominica"; const extended::ZoneInfo kZoneAmerica_Dominica ACE_TIME_PROGMEM = { kZoneNameAmerica_Dominica /*name*/, @@ -17438,12 +17438,12 @@ const extended::ZoneInfo kZoneAmerica_Dominica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Ensenada -> America/Tijuana -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Ensenada[] ACE_TIME_PROGMEM = "America/Ensenada"; +static const char kZoneNameAmerica_Ensenada[] ACE_TIME_PROGMEM = "\x02" "Ensenada"; const extended::ZoneInfo kZoneAmerica_Ensenada ACE_TIME_PROGMEM = { kZoneNameAmerica_Ensenada /*name*/, @@ -17455,12 +17455,12 @@ const extended::ZoneInfo kZoneAmerica_Ensenada ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Fort_Wayne -> America/Indiana/Indianapolis -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Fort_Wayne[] ACE_TIME_PROGMEM = "America/Fort_Wayne"; +static const char kZoneNameAmerica_Fort_Wayne[] ACE_TIME_PROGMEM = "\x02" "Fort_Wayne"; const extended::ZoneInfo kZoneAmerica_Fort_Wayne ACE_TIME_PROGMEM = { kZoneNameAmerica_Fort_Wayne /*name*/, @@ -17472,12 +17472,12 @@ const extended::ZoneInfo kZoneAmerica_Fort_Wayne ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Godthab -> America/Nuuk -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 9 (originally 16) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Godthab[] ACE_TIME_PROGMEM = "America/Godthab"; +static const char kZoneNameAmerica_Godthab[] ACE_TIME_PROGMEM = "\x02" "Godthab"; const extended::ZoneInfo kZoneAmerica_Godthab ACE_TIME_PROGMEM = { kZoneNameAmerica_Godthab /*name*/, @@ -17489,12 +17489,12 @@ const extended::ZoneInfo kZoneAmerica_Godthab ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Grenada -> America/Port_of_Spain -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 9 (originally 16) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Grenada[] ACE_TIME_PROGMEM = "America/Grenada"; +static const char kZoneNameAmerica_Grenada[] ACE_TIME_PROGMEM = "\x02" "Grenada"; const extended::ZoneInfo kZoneAmerica_Grenada ACE_TIME_PROGMEM = { kZoneNameAmerica_Grenada /*name*/, @@ -17506,12 +17506,12 @@ const extended::ZoneInfo kZoneAmerica_Grenada ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Guadeloupe -> America/Port_of_Spain -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Guadeloupe[] ACE_TIME_PROGMEM = "America/Guadeloupe"; +static const char kZoneNameAmerica_Guadeloupe[] ACE_TIME_PROGMEM = "\x02" "Guadeloupe"; const extended::ZoneInfo kZoneAmerica_Guadeloupe ACE_TIME_PROGMEM = { kZoneNameAmerica_Guadeloupe /*name*/, @@ -17523,12 +17523,12 @@ const extended::ZoneInfo kZoneAmerica_Guadeloupe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Indianapolis -> America/Indiana/Indianapolis -// Strings (bytes): 21 -// Memory (8-bit): 32 -// Memory (32-bit): 41 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Indianapolis[] ACE_TIME_PROGMEM = "America/Indianapolis"; +static const char kZoneNameAmerica_Indianapolis[] ACE_TIME_PROGMEM = "\x02" "Indianapolis"; const extended::ZoneInfo kZoneAmerica_Indianapolis ACE_TIME_PROGMEM = { kZoneNameAmerica_Indianapolis /*name*/, @@ -17540,12 +17540,12 @@ const extended::ZoneInfo kZoneAmerica_Indianapolis ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Jujuy -> America/Argentina/Jujuy -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 7 (originally 14) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Jujuy[] ACE_TIME_PROGMEM = "America/Jujuy"; +static const char kZoneNameAmerica_Jujuy[] ACE_TIME_PROGMEM = "\x02" "Jujuy"; const extended::ZoneInfo kZoneAmerica_Jujuy ACE_TIME_PROGMEM = { kZoneNameAmerica_Jujuy /*name*/, @@ -17557,12 +17557,12 @@ const extended::ZoneInfo kZoneAmerica_Jujuy ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Knox_IN -> America/Indiana/Knox -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 9 (originally 16) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Knox_IN[] ACE_TIME_PROGMEM = "America/Knox_IN"; +static const char kZoneNameAmerica_Knox_IN[] ACE_TIME_PROGMEM = "\x02" "Knox_IN"; const extended::ZoneInfo kZoneAmerica_Knox_IN ACE_TIME_PROGMEM = { kZoneNameAmerica_Knox_IN /*name*/, @@ -17574,12 +17574,12 @@ const extended::ZoneInfo kZoneAmerica_Knox_IN ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Kralendijk -> America/Curacao -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Kralendijk[] ACE_TIME_PROGMEM = "America/Kralendijk"; +static const char kZoneNameAmerica_Kralendijk[] ACE_TIME_PROGMEM = "\x02" "Kralendijk"; const extended::ZoneInfo kZoneAmerica_Kralendijk ACE_TIME_PROGMEM = { kZoneNameAmerica_Kralendijk /*name*/, @@ -17591,12 +17591,12 @@ const extended::ZoneInfo kZoneAmerica_Kralendijk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Louisville -> America/Kentucky/Louisville -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Louisville[] ACE_TIME_PROGMEM = "America/Louisville"; +static const char kZoneNameAmerica_Louisville[] ACE_TIME_PROGMEM = "\x02" "Louisville"; const extended::ZoneInfo kZoneAmerica_Louisville ACE_TIME_PROGMEM = { kZoneNameAmerica_Louisville /*name*/, @@ -17608,12 +17608,12 @@ const extended::ZoneInfo kZoneAmerica_Louisville ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Lower_Princes -> America/Curacao -// Strings (bytes): 22 -// Memory (8-bit): 33 -// Memory (32-bit): 42 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Lower_Princes[] ACE_TIME_PROGMEM = "America/Lower_Princes"; +static const char kZoneNameAmerica_Lower_Princes[] ACE_TIME_PROGMEM = "\x02" "Lower_Princes"; const extended::ZoneInfo kZoneAmerica_Lower_Princes ACE_TIME_PROGMEM = { kZoneNameAmerica_Lower_Princes /*name*/, @@ -17625,12 +17625,12 @@ const extended::ZoneInfo kZoneAmerica_Lower_Princes ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Marigot -> America/Port_of_Spain -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 9 (originally 16) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Marigot[] ACE_TIME_PROGMEM = "America/Marigot"; +static const char kZoneNameAmerica_Marigot[] ACE_TIME_PROGMEM = "\x02" "Marigot"; const extended::ZoneInfo kZoneAmerica_Marigot ACE_TIME_PROGMEM = { kZoneNameAmerica_Marigot /*name*/, @@ -17642,12 +17642,12 @@ const extended::ZoneInfo kZoneAmerica_Marigot ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Mendoza -> America/Argentina/Mendoza -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 9 (originally 16) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Mendoza[] ACE_TIME_PROGMEM = "America/Mendoza"; +static const char kZoneNameAmerica_Mendoza[] ACE_TIME_PROGMEM = "\x02" "Mendoza"; const extended::ZoneInfo kZoneAmerica_Mendoza ACE_TIME_PROGMEM = { kZoneNameAmerica_Mendoza /*name*/, @@ -17659,12 +17659,12 @@ const extended::ZoneInfo kZoneAmerica_Mendoza ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Montreal -> America/Toronto -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Montreal[] ACE_TIME_PROGMEM = "America/Montreal"; +static const char kZoneNameAmerica_Montreal[] ACE_TIME_PROGMEM = "\x02" "Montreal"; const extended::ZoneInfo kZoneAmerica_Montreal ACE_TIME_PROGMEM = { kZoneNameAmerica_Montreal /*name*/, @@ -17676,12 +17676,12 @@ const extended::ZoneInfo kZoneAmerica_Montreal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Montserrat -> America/Port_of_Spain -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Montserrat[] ACE_TIME_PROGMEM = "America/Montserrat"; +static const char kZoneNameAmerica_Montserrat[] ACE_TIME_PROGMEM = "\x02" "Montserrat"; const extended::ZoneInfo kZoneAmerica_Montserrat ACE_TIME_PROGMEM = { kZoneNameAmerica_Montserrat /*name*/, @@ -17693,12 +17693,12 @@ const extended::ZoneInfo kZoneAmerica_Montserrat ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Porto_Acre -> America/Rio_Branco -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Porto_Acre[] ACE_TIME_PROGMEM = "America/Porto_Acre"; +static const char kZoneNameAmerica_Porto_Acre[] ACE_TIME_PROGMEM = "\x02" "Porto_Acre"; const extended::ZoneInfo kZoneAmerica_Porto_Acre ACE_TIME_PROGMEM = { kZoneNameAmerica_Porto_Acre /*name*/, @@ -17710,12 +17710,12 @@ const extended::ZoneInfo kZoneAmerica_Porto_Acre ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Rosario -> America/Argentina/Cordoba -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 9 (originally 16) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Rosario[] ACE_TIME_PROGMEM = "America/Rosario"; +static const char kZoneNameAmerica_Rosario[] ACE_TIME_PROGMEM = "\x02" "Rosario"; const extended::ZoneInfo kZoneAmerica_Rosario ACE_TIME_PROGMEM = { kZoneNameAmerica_Rosario /*name*/, @@ -17727,12 +17727,12 @@ const extended::ZoneInfo kZoneAmerica_Rosario ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Santa_Isabel -> America/Tijuana -// Strings (bytes): 21 -// Memory (8-bit): 32 -// Memory (32-bit): 41 +// Strings (bytes): 14 (originally 21) +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Santa_Isabel[] ACE_TIME_PROGMEM = "America/Santa_Isabel"; +static const char kZoneNameAmerica_Santa_Isabel[] ACE_TIME_PROGMEM = "\x02" "Santa_Isabel"; const extended::ZoneInfo kZoneAmerica_Santa_Isabel ACE_TIME_PROGMEM = { kZoneNameAmerica_Santa_Isabel /*name*/, @@ -17744,12 +17744,12 @@ const extended::ZoneInfo kZoneAmerica_Santa_Isabel ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Shiprock -> America/Denver -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Shiprock[] ACE_TIME_PROGMEM = "America/Shiprock"; +static const char kZoneNameAmerica_Shiprock[] ACE_TIME_PROGMEM = "\x02" "Shiprock"; const extended::ZoneInfo kZoneAmerica_Shiprock ACE_TIME_PROGMEM = { kZoneNameAmerica_Shiprock /*name*/, @@ -17761,12 +17761,12 @@ const extended::ZoneInfo kZoneAmerica_Shiprock ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Barthelemy -> America/Port_of_Spain -// Strings (bytes): 22 -// Memory (8-bit): 33 -// Memory (32-bit): 42 +// Strings (bytes): 15 (originally 22) +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_St_Barthelemy[] ACE_TIME_PROGMEM = "America/St_Barthelemy"; +static const char kZoneNameAmerica_St_Barthelemy[] ACE_TIME_PROGMEM = "\x02" "St_Barthelemy"; const extended::ZoneInfo kZoneAmerica_St_Barthelemy ACE_TIME_PROGMEM = { kZoneNameAmerica_St_Barthelemy /*name*/, @@ -17778,12 +17778,12 @@ const extended::ZoneInfo kZoneAmerica_St_Barthelemy ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Kitts -> America/Port_of_Spain -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_St_Kitts[] ACE_TIME_PROGMEM = "America/St_Kitts"; +static const char kZoneNameAmerica_St_Kitts[] ACE_TIME_PROGMEM = "\x02" "St_Kitts"; const extended::ZoneInfo kZoneAmerica_St_Kitts ACE_TIME_PROGMEM = { kZoneNameAmerica_St_Kitts /*name*/, @@ -17795,12 +17795,12 @@ const extended::ZoneInfo kZoneAmerica_St_Kitts ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Lucia -> America/Port_of_Spain -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_St_Lucia[] ACE_TIME_PROGMEM = "America/St_Lucia"; +static const char kZoneNameAmerica_St_Lucia[] ACE_TIME_PROGMEM = "\x02" "St_Lucia"; const extended::ZoneInfo kZoneAmerica_St_Lucia ACE_TIME_PROGMEM = { kZoneNameAmerica_St_Lucia /*name*/, @@ -17812,12 +17812,12 @@ const extended::ZoneInfo kZoneAmerica_St_Lucia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Thomas -> America/Port_of_Spain -// Strings (bytes): 18 -// Memory (8-bit): 29 -// Memory (32-bit): 38 +// Strings (bytes): 11 (originally 18) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_St_Thomas[] ACE_TIME_PROGMEM = "America/St_Thomas"; +static const char kZoneNameAmerica_St_Thomas[] ACE_TIME_PROGMEM = "\x02" "St_Thomas"; const extended::ZoneInfo kZoneAmerica_St_Thomas ACE_TIME_PROGMEM = { kZoneNameAmerica_St_Thomas /*name*/, @@ -17829,12 +17829,12 @@ const extended::ZoneInfo kZoneAmerica_St_Thomas ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/St_Vincent -> America/Port_of_Spain -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 12 (originally 19) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_St_Vincent[] ACE_TIME_PROGMEM = "America/St_Vincent"; +static const char kZoneNameAmerica_St_Vincent[] ACE_TIME_PROGMEM = "\x02" "St_Vincent"; const extended::ZoneInfo kZoneAmerica_St_Vincent ACE_TIME_PROGMEM = { kZoneNameAmerica_St_Vincent /*name*/, @@ -17846,12 +17846,12 @@ const extended::ZoneInfo kZoneAmerica_St_Vincent ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Tortola -> America/Port_of_Spain -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 9 (originally 16) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Tortola[] ACE_TIME_PROGMEM = "America/Tortola"; +static const char kZoneNameAmerica_Tortola[] ACE_TIME_PROGMEM = "\x02" "Tortola"; const extended::ZoneInfo kZoneAmerica_Tortola ACE_TIME_PROGMEM = { kZoneNameAmerica_Tortola /*name*/, @@ -17863,12 +17863,12 @@ const extended::ZoneInfo kZoneAmerica_Tortola ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: America/Virgin -> America/Port_of_Spain -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 8 (originally 15) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAmerica_Virgin[] ACE_TIME_PROGMEM = "America/Virgin"; +static const char kZoneNameAmerica_Virgin[] ACE_TIME_PROGMEM = "\x02" "Virgin"; const extended::ZoneInfo kZoneAmerica_Virgin ACE_TIME_PROGMEM = { kZoneNameAmerica_Virgin /*name*/, @@ -17880,12 +17880,12 @@ const extended::ZoneInfo kZoneAmerica_Virgin ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Antarctica/McMurdo -> Pacific/Auckland -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 9 (originally 19) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAntarctica_McMurdo[] ACE_TIME_PROGMEM = "Antarctica/McMurdo"; +static const char kZoneNameAntarctica_McMurdo[] ACE_TIME_PROGMEM = "\x03" "McMurdo"; const extended::ZoneInfo kZoneAntarctica_McMurdo ACE_TIME_PROGMEM = { kZoneNameAntarctica_McMurdo /*name*/, @@ -17897,12 +17897,12 @@ const extended::ZoneInfo kZoneAntarctica_McMurdo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Antarctica/South_Pole -> Pacific/Auckland -// Strings (bytes): 22 -// Memory (8-bit): 33 -// Memory (32-bit): 42 +// Strings (bytes): 12 (originally 22) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAntarctica_South_Pole[] ACE_TIME_PROGMEM = "Antarctica/South_Pole"; +static const char kZoneNameAntarctica_South_Pole[] ACE_TIME_PROGMEM = "\x03" "South_Pole"; const extended::ZoneInfo kZoneAntarctica_South_Pole ACE_TIME_PROGMEM = { kZoneNameAntarctica_South_Pole /*name*/, @@ -17914,7 +17914,7 @@ const extended::ZoneInfo kZoneAntarctica_South_Pole ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Arctic/Longyearbyen -> Europe/Oslo -// Strings (bytes): 20 +// Strings (bytes): 20 (originally 20) // Memory (8-bit): 31 // Memory (32-bit): 40 //--------------------------------------------------------------------------- @@ -17931,12 +17931,12 @@ const extended::ZoneInfo kZoneArctic_Longyearbyen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Aden -> Asia/Riyadh -// Strings (bytes): 10 -// Memory (8-bit): 21 -// Memory (32-bit): 30 +// Strings (bytes): 6 (originally 10) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Aden[] ACE_TIME_PROGMEM = "Asia/Aden"; +static const char kZoneNameAsia_Aden[] ACE_TIME_PROGMEM = "\x05" "Aden"; const extended::ZoneInfo kZoneAsia_Aden ACE_TIME_PROGMEM = { kZoneNameAsia_Aden /*name*/, @@ -17948,12 +17948,12 @@ const extended::ZoneInfo kZoneAsia_Aden ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Ashkhabad -> Asia/Ashgabat -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Ashkhabad[] ACE_TIME_PROGMEM = "Asia/Ashkhabad"; +static const char kZoneNameAsia_Ashkhabad[] ACE_TIME_PROGMEM = "\x05" "Ashkhabad"; const extended::ZoneInfo kZoneAsia_Ashkhabad ACE_TIME_PROGMEM = { kZoneNameAsia_Ashkhabad /*name*/, @@ -17965,12 +17965,12 @@ const extended::ZoneInfo kZoneAsia_Ashkhabad ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Bahrain -> Asia/Qatar -// Strings (bytes): 13 -// Memory (8-bit): 24 -// Memory (32-bit): 33 +// Strings (bytes): 9 (originally 13) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Bahrain[] ACE_TIME_PROGMEM = "Asia/Bahrain"; +static const char kZoneNameAsia_Bahrain[] ACE_TIME_PROGMEM = "\x05" "Bahrain"; const extended::ZoneInfo kZoneAsia_Bahrain ACE_TIME_PROGMEM = { kZoneNameAsia_Bahrain /*name*/, @@ -17982,12 +17982,12 @@ const extended::ZoneInfo kZoneAsia_Bahrain ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Calcutta -> Asia/Kolkata -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 10 (originally 14) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Calcutta[] ACE_TIME_PROGMEM = "Asia/Calcutta"; +static const char kZoneNameAsia_Calcutta[] ACE_TIME_PROGMEM = "\x05" "Calcutta"; const extended::ZoneInfo kZoneAsia_Calcutta ACE_TIME_PROGMEM = { kZoneNameAsia_Calcutta /*name*/, @@ -17999,12 +17999,12 @@ const extended::ZoneInfo kZoneAsia_Calcutta ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Chongqing -> Asia/Shanghai -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Chongqing[] ACE_TIME_PROGMEM = "Asia/Chongqing"; +static const char kZoneNameAsia_Chongqing[] ACE_TIME_PROGMEM = "\x05" "Chongqing"; const extended::ZoneInfo kZoneAsia_Chongqing ACE_TIME_PROGMEM = { kZoneNameAsia_Chongqing /*name*/, @@ -18016,12 +18016,12 @@ const extended::ZoneInfo kZoneAsia_Chongqing ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Chungking -> Asia/Shanghai -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Chungking[] ACE_TIME_PROGMEM = "Asia/Chungking"; +static const char kZoneNameAsia_Chungking[] ACE_TIME_PROGMEM = "\x05" "Chungking"; const extended::ZoneInfo kZoneAsia_Chungking ACE_TIME_PROGMEM = { kZoneNameAsia_Chungking /*name*/, @@ -18033,12 +18033,12 @@ const extended::ZoneInfo kZoneAsia_Chungking ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Dacca -> Asia/Dhaka -// Strings (bytes): 11 -// Memory (8-bit): 22 -// Memory (32-bit): 31 +// Strings (bytes): 7 (originally 11) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Dacca[] ACE_TIME_PROGMEM = "Asia/Dacca"; +static const char kZoneNameAsia_Dacca[] ACE_TIME_PROGMEM = "\x05" "Dacca"; const extended::ZoneInfo kZoneAsia_Dacca ACE_TIME_PROGMEM = { kZoneNameAsia_Dacca /*name*/, @@ -18050,12 +18050,12 @@ const extended::ZoneInfo kZoneAsia_Dacca ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Harbin -> Asia/Shanghai -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 8 (originally 12) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Harbin[] ACE_TIME_PROGMEM = "Asia/Harbin"; +static const char kZoneNameAsia_Harbin[] ACE_TIME_PROGMEM = "\x05" "Harbin"; const extended::ZoneInfo kZoneAsia_Harbin ACE_TIME_PROGMEM = { kZoneNameAsia_Harbin /*name*/, @@ -18067,12 +18067,12 @@ const extended::ZoneInfo kZoneAsia_Harbin ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Istanbul -> Europe/Istanbul -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 10 (originally 14) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Istanbul[] ACE_TIME_PROGMEM = "Asia/Istanbul"; +static const char kZoneNameAsia_Istanbul[] ACE_TIME_PROGMEM = "\x05" "Istanbul"; const extended::ZoneInfo kZoneAsia_Istanbul ACE_TIME_PROGMEM = { kZoneNameAsia_Istanbul /*name*/, @@ -18084,12 +18084,12 @@ const extended::ZoneInfo kZoneAsia_Istanbul ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Kashgar -> Asia/Urumqi -// Strings (bytes): 13 -// Memory (8-bit): 24 -// Memory (32-bit): 33 +// Strings (bytes): 9 (originally 13) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Kashgar[] ACE_TIME_PROGMEM = "Asia/Kashgar"; +static const char kZoneNameAsia_Kashgar[] ACE_TIME_PROGMEM = "\x05" "Kashgar"; const extended::ZoneInfo kZoneAsia_Kashgar ACE_TIME_PROGMEM = { kZoneNameAsia_Kashgar /*name*/, @@ -18101,12 +18101,12 @@ const extended::ZoneInfo kZoneAsia_Kashgar ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Katmandu -> Asia/Kathmandu -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 10 (originally 14) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Katmandu[] ACE_TIME_PROGMEM = "Asia/Katmandu"; +static const char kZoneNameAsia_Katmandu[] ACE_TIME_PROGMEM = "\x05" "Katmandu"; const extended::ZoneInfo kZoneAsia_Katmandu ACE_TIME_PROGMEM = { kZoneNameAsia_Katmandu /*name*/, @@ -18118,12 +18118,12 @@ const extended::ZoneInfo kZoneAsia_Katmandu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Kuwait -> Asia/Riyadh -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 8 (originally 12) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Kuwait[] ACE_TIME_PROGMEM = "Asia/Kuwait"; +static const char kZoneNameAsia_Kuwait[] ACE_TIME_PROGMEM = "\x05" "Kuwait"; const extended::ZoneInfo kZoneAsia_Kuwait ACE_TIME_PROGMEM = { kZoneNameAsia_Kuwait /*name*/, @@ -18135,12 +18135,12 @@ const extended::ZoneInfo kZoneAsia_Kuwait ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Macao -> Asia/Macau -// Strings (bytes): 11 -// Memory (8-bit): 22 -// Memory (32-bit): 31 +// Strings (bytes): 7 (originally 11) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Macao[] ACE_TIME_PROGMEM = "Asia/Macao"; +static const char kZoneNameAsia_Macao[] ACE_TIME_PROGMEM = "\x05" "Macao"; const extended::ZoneInfo kZoneAsia_Macao ACE_TIME_PROGMEM = { kZoneNameAsia_Macao /*name*/, @@ -18152,12 +18152,12 @@ const extended::ZoneInfo kZoneAsia_Macao ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Muscat -> Asia/Dubai -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 8 (originally 12) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Muscat[] ACE_TIME_PROGMEM = "Asia/Muscat"; +static const char kZoneNameAsia_Muscat[] ACE_TIME_PROGMEM = "\x05" "Muscat"; const extended::ZoneInfo kZoneAsia_Muscat ACE_TIME_PROGMEM = { kZoneNameAsia_Muscat /*name*/, @@ -18169,12 +18169,12 @@ const extended::ZoneInfo kZoneAsia_Muscat ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Phnom_Penh -> Asia/Bangkok -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Phnom_Penh[] ACE_TIME_PROGMEM = "Asia/Phnom_Penh"; +static const char kZoneNameAsia_Phnom_Penh[] ACE_TIME_PROGMEM = "\x05" "Phnom_Penh"; const extended::ZoneInfo kZoneAsia_Phnom_Penh ACE_TIME_PROGMEM = { kZoneNameAsia_Phnom_Penh /*name*/, @@ -18186,12 +18186,12 @@ const extended::ZoneInfo kZoneAsia_Phnom_Penh ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Rangoon -> Asia/Yangon -// Strings (bytes): 13 -// Memory (8-bit): 24 -// Memory (32-bit): 33 +// Strings (bytes): 9 (originally 13) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Rangoon[] ACE_TIME_PROGMEM = "Asia/Rangoon"; +static const char kZoneNameAsia_Rangoon[] ACE_TIME_PROGMEM = "\x05" "Rangoon"; const extended::ZoneInfo kZoneAsia_Rangoon ACE_TIME_PROGMEM = { kZoneNameAsia_Rangoon /*name*/, @@ -18203,12 +18203,12 @@ const extended::ZoneInfo kZoneAsia_Rangoon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Saigon -> Asia/Ho_Chi_Minh -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 8 (originally 12) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Saigon[] ACE_TIME_PROGMEM = "Asia/Saigon"; +static const char kZoneNameAsia_Saigon[] ACE_TIME_PROGMEM = "\x05" "Saigon"; const extended::ZoneInfo kZoneAsia_Saigon ACE_TIME_PROGMEM = { kZoneNameAsia_Saigon /*name*/, @@ -18220,12 +18220,12 @@ const extended::ZoneInfo kZoneAsia_Saigon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Tel_Aviv -> Asia/Jerusalem -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 10 (originally 14) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Tel_Aviv[] ACE_TIME_PROGMEM = "Asia/Tel_Aviv"; +static const char kZoneNameAsia_Tel_Aviv[] ACE_TIME_PROGMEM = "\x05" "Tel_Aviv"; const extended::ZoneInfo kZoneAsia_Tel_Aviv ACE_TIME_PROGMEM = { kZoneNameAsia_Tel_Aviv /*name*/, @@ -18237,12 +18237,12 @@ const extended::ZoneInfo kZoneAsia_Tel_Aviv ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Thimbu -> Asia/Thimphu -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 8 (originally 12) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Thimbu[] ACE_TIME_PROGMEM = "Asia/Thimbu"; +static const char kZoneNameAsia_Thimbu[] ACE_TIME_PROGMEM = "\x05" "Thimbu"; const extended::ZoneInfo kZoneAsia_Thimbu ACE_TIME_PROGMEM = { kZoneNameAsia_Thimbu /*name*/, @@ -18254,12 +18254,12 @@ const extended::ZoneInfo kZoneAsia_Thimbu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Ujung_Pandang -> Asia/Makassar -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 15 (originally 19) +// Memory (8-bit): 26 +// Memory (32-bit): 35 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Ujung_Pandang[] ACE_TIME_PROGMEM = "Asia/Ujung_Pandang"; +static const char kZoneNameAsia_Ujung_Pandang[] ACE_TIME_PROGMEM = "\x05" "Ujung_Pandang"; const extended::ZoneInfo kZoneAsia_Ujung_Pandang ACE_TIME_PROGMEM = { kZoneNameAsia_Ujung_Pandang /*name*/, @@ -18271,12 +18271,12 @@ const extended::ZoneInfo kZoneAsia_Ujung_Pandang ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Ulan_Bator -> Asia/Ulaanbaatar -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 12 (originally 16) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Ulan_Bator[] ACE_TIME_PROGMEM = "Asia/Ulan_Bator"; +static const char kZoneNameAsia_Ulan_Bator[] ACE_TIME_PROGMEM = "\x05" "Ulan_Bator"; const extended::ZoneInfo kZoneAsia_Ulan_Bator ACE_TIME_PROGMEM = { kZoneNameAsia_Ulan_Bator /*name*/, @@ -18288,12 +18288,12 @@ const extended::ZoneInfo kZoneAsia_Ulan_Bator ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Asia/Vientiane -> Asia/Bangkok -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 11 (originally 15) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAsia_Vientiane[] ACE_TIME_PROGMEM = "Asia/Vientiane"; +static const char kZoneNameAsia_Vientiane[] ACE_TIME_PROGMEM = "\x05" "Vientiane"; const extended::ZoneInfo kZoneAsia_Vientiane ACE_TIME_PROGMEM = { kZoneNameAsia_Vientiane /*name*/, @@ -18305,12 +18305,12 @@ const extended::ZoneInfo kZoneAsia_Vientiane ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Atlantic/Faeroe -> Atlantic/Faroe -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 8 (originally 16) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAtlantic_Faeroe[] ACE_TIME_PROGMEM = "Atlantic/Faeroe"; +static const char kZoneNameAtlantic_Faeroe[] ACE_TIME_PROGMEM = "\x06" "Faeroe"; const extended::ZoneInfo kZoneAtlantic_Faeroe ACE_TIME_PROGMEM = { kZoneNameAtlantic_Faeroe /*name*/, @@ -18322,12 +18322,12 @@ const extended::ZoneInfo kZoneAtlantic_Faeroe ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Atlantic/Jan_Mayen -> Europe/Oslo -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 11 (originally 19) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAtlantic_Jan_Mayen[] ACE_TIME_PROGMEM = "Atlantic/Jan_Mayen"; +static const char kZoneNameAtlantic_Jan_Mayen[] ACE_TIME_PROGMEM = "\x06" "Jan_Mayen"; const extended::ZoneInfo kZoneAtlantic_Jan_Mayen ACE_TIME_PROGMEM = { kZoneNameAtlantic_Jan_Mayen /*name*/, @@ -18339,12 +18339,12 @@ const extended::ZoneInfo kZoneAtlantic_Jan_Mayen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Atlantic/St_Helena -> Africa/Abidjan -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 11 (originally 19) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameAtlantic_St_Helena[] ACE_TIME_PROGMEM = "Atlantic/St_Helena"; +static const char kZoneNameAtlantic_St_Helena[] ACE_TIME_PROGMEM = "\x06" "St_Helena"; const extended::ZoneInfo kZoneAtlantic_St_Helena ACE_TIME_PROGMEM = { kZoneNameAtlantic_St_Helena /*name*/, @@ -18356,12 +18356,12 @@ const extended::ZoneInfo kZoneAtlantic_St_Helena ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/ACT -> Australia/Sydney -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 5 (originally 14) +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_ACT[] ACE_TIME_PROGMEM = "Australia/ACT"; +static const char kZoneNameAustralia_ACT[] ACE_TIME_PROGMEM = "\x07" "ACT"; const extended::ZoneInfo kZoneAustralia_ACT ACE_TIME_PROGMEM = { kZoneNameAustralia_ACT /*name*/, @@ -18373,12 +18373,12 @@ const extended::ZoneInfo kZoneAustralia_ACT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Canberra -> Australia/Sydney -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 10 (originally 19) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_Canberra[] ACE_TIME_PROGMEM = "Australia/Canberra"; +static const char kZoneNameAustralia_Canberra[] ACE_TIME_PROGMEM = "\x07" "Canberra"; const extended::ZoneInfo kZoneAustralia_Canberra ACE_TIME_PROGMEM = { kZoneNameAustralia_Canberra /*name*/, @@ -18390,12 +18390,12 @@ const extended::ZoneInfo kZoneAustralia_Canberra ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Currie -> Australia/Hobart -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 8 (originally 17) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_Currie[] ACE_TIME_PROGMEM = "Australia/Currie"; +static const char kZoneNameAustralia_Currie[] ACE_TIME_PROGMEM = "\x07" "Currie"; const extended::ZoneInfo kZoneAustralia_Currie ACE_TIME_PROGMEM = { kZoneNameAustralia_Currie /*name*/, @@ -18407,12 +18407,12 @@ const extended::ZoneInfo kZoneAustralia_Currie ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/LHI -> Australia/Lord_Howe -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 5 (originally 14) +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_LHI[] ACE_TIME_PROGMEM = "Australia/LHI"; +static const char kZoneNameAustralia_LHI[] ACE_TIME_PROGMEM = "\x07" "LHI"; const extended::ZoneInfo kZoneAustralia_LHI ACE_TIME_PROGMEM = { kZoneNameAustralia_LHI /*name*/, @@ -18424,12 +18424,12 @@ const extended::ZoneInfo kZoneAustralia_LHI ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/NSW -> Australia/Sydney -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 5 (originally 14) +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_NSW[] ACE_TIME_PROGMEM = "Australia/NSW"; +static const char kZoneNameAustralia_NSW[] ACE_TIME_PROGMEM = "\x07" "NSW"; const extended::ZoneInfo kZoneAustralia_NSW ACE_TIME_PROGMEM = { kZoneNameAustralia_NSW /*name*/, @@ -18441,12 +18441,12 @@ const extended::ZoneInfo kZoneAustralia_NSW ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/North -> Australia/Darwin -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 7 (originally 16) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_North[] ACE_TIME_PROGMEM = "Australia/North"; +static const char kZoneNameAustralia_North[] ACE_TIME_PROGMEM = "\x07" "North"; const extended::ZoneInfo kZoneAustralia_North ACE_TIME_PROGMEM = { kZoneNameAustralia_North /*name*/, @@ -18458,12 +18458,12 @@ const extended::ZoneInfo kZoneAustralia_North ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Queensland -> Australia/Brisbane -// Strings (bytes): 21 -// Memory (8-bit): 32 -// Memory (32-bit): 41 +// Strings (bytes): 12 (originally 21) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_Queensland[] ACE_TIME_PROGMEM = "Australia/Queensland"; +static const char kZoneNameAustralia_Queensland[] ACE_TIME_PROGMEM = "\x07" "Queensland"; const extended::ZoneInfo kZoneAustralia_Queensland ACE_TIME_PROGMEM = { kZoneNameAustralia_Queensland /*name*/, @@ -18475,12 +18475,12 @@ const extended::ZoneInfo kZoneAustralia_Queensland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/South -> Australia/Adelaide -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 7 (originally 16) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_South[] ACE_TIME_PROGMEM = "Australia/South"; +static const char kZoneNameAustralia_South[] ACE_TIME_PROGMEM = "\x07" "South"; const extended::ZoneInfo kZoneAustralia_South ACE_TIME_PROGMEM = { kZoneNameAustralia_South /*name*/, @@ -18492,12 +18492,12 @@ const extended::ZoneInfo kZoneAustralia_South ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Tasmania -> Australia/Hobart -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 10 (originally 19) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_Tasmania[] ACE_TIME_PROGMEM = "Australia/Tasmania"; +static const char kZoneNameAustralia_Tasmania[] ACE_TIME_PROGMEM = "\x07" "Tasmania"; const extended::ZoneInfo kZoneAustralia_Tasmania ACE_TIME_PROGMEM = { kZoneNameAustralia_Tasmania /*name*/, @@ -18509,12 +18509,12 @@ const extended::ZoneInfo kZoneAustralia_Tasmania ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Victoria -> Australia/Melbourne -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 10 (originally 19) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_Victoria[] ACE_TIME_PROGMEM = "Australia/Victoria"; +static const char kZoneNameAustralia_Victoria[] ACE_TIME_PROGMEM = "\x07" "Victoria"; const extended::ZoneInfo kZoneAustralia_Victoria ACE_TIME_PROGMEM = { kZoneNameAustralia_Victoria /*name*/, @@ -18526,12 +18526,12 @@ const extended::ZoneInfo kZoneAustralia_Victoria ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/West -> Australia/Perth -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 6 (originally 15) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_West[] ACE_TIME_PROGMEM = "Australia/West"; +static const char kZoneNameAustralia_West[] ACE_TIME_PROGMEM = "\x07" "West"; const extended::ZoneInfo kZoneAustralia_West ACE_TIME_PROGMEM = { kZoneNameAustralia_West /*name*/, @@ -18543,12 +18543,12 @@ const extended::ZoneInfo kZoneAustralia_West ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Australia/Yancowinna -> Australia/Broken_Hill -// Strings (bytes): 21 -// Memory (8-bit): 32 -// Memory (32-bit): 41 +// Strings (bytes): 12 (originally 21) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameAustralia_Yancowinna[] ACE_TIME_PROGMEM = "Australia/Yancowinna"; +static const char kZoneNameAustralia_Yancowinna[] ACE_TIME_PROGMEM = "\x07" "Yancowinna"; const extended::ZoneInfo kZoneAustralia_Yancowinna ACE_TIME_PROGMEM = { kZoneNameAustralia_Yancowinna /*name*/, @@ -18560,12 +18560,12 @@ const extended::ZoneInfo kZoneAustralia_Yancowinna ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Brazil/Acre -> America/Rio_Branco -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 6 (originally 12) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNameBrazil_Acre[] ACE_TIME_PROGMEM = "Brazil/Acre"; +static const char kZoneNameBrazil_Acre[] ACE_TIME_PROGMEM = "\x08" "Acre"; const extended::ZoneInfo kZoneBrazil_Acre ACE_TIME_PROGMEM = { kZoneNameBrazil_Acre /*name*/, @@ -18577,12 +18577,12 @@ const extended::ZoneInfo kZoneBrazil_Acre ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Brazil/DeNoronha -> America/Noronha -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameBrazil_DeNoronha[] ACE_TIME_PROGMEM = "Brazil/DeNoronha"; +static const char kZoneNameBrazil_DeNoronha[] ACE_TIME_PROGMEM = "\x08" "DeNoronha"; const extended::ZoneInfo kZoneBrazil_DeNoronha ACE_TIME_PROGMEM = { kZoneNameBrazil_DeNoronha /*name*/, @@ -18594,12 +18594,12 @@ const extended::ZoneInfo kZoneBrazil_DeNoronha ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Brazil/East -> America/Sao_Paulo -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 6 (originally 12) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNameBrazil_East[] ACE_TIME_PROGMEM = "Brazil/East"; +static const char kZoneNameBrazil_East[] ACE_TIME_PROGMEM = "\x08" "East"; const extended::ZoneInfo kZoneBrazil_East ACE_TIME_PROGMEM = { kZoneNameBrazil_East /*name*/, @@ -18611,12 +18611,12 @@ const extended::ZoneInfo kZoneBrazil_East ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Brazil/West -> America/Manaus -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 6 (originally 12) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNameBrazil_West[] ACE_TIME_PROGMEM = "Brazil/West"; +static const char kZoneNameBrazil_West[] ACE_TIME_PROGMEM = "\x08" "West"; const extended::ZoneInfo kZoneBrazil_West ACE_TIME_PROGMEM = { kZoneNameBrazil_West /*name*/, @@ -18628,12 +18628,12 @@ const extended::ZoneInfo kZoneBrazil_West ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Atlantic -> America/Halifax -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameCanada_Atlantic[] ACE_TIME_PROGMEM = "Canada/Atlantic"; +static const char kZoneNameCanada_Atlantic[] ACE_TIME_PROGMEM = "\x09" "Atlantic"; const extended::ZoneInfo kZoneCanada_Atlantic ACE_TIME_PROGMEM = { kZoneNameCanada_Atlantic /*name*/, @@ -18645,12 +18645,12 @@ const extended::ZoneInfo kZoneCanada_Atlantic ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Central -> America/Winnipeg -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameCanada_Central[] ACE_TIME_PROGMEM = "Canada/Central"; +static const char kZoneNameCanada_Central[] ACE_TIME_PROGMEM = "\x09" "Central"; const extended::ZoneInfo kZoneCanada_Central ACE_TIME_PROGMEM = { kZoneNameCanada_Central /*name*/, @@ -18662,12 +18662,12 @@ const extended::ZoneInfo kZoneCanada_Central ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Eastern -> America/Toronto -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameCanada_Eastern[] ACE_TIME_PROGMEM = "Canada/Eastern"; +static const char kZoneNameCanada_Eastern[] ACE_TIME_PROGMEM = "\x09" "Eastern"; const extended::ZoneInfo kZoneCanada_Eastern ACE_TIME_PROGMEM = { kZoneNameCanada_Eastern /*name*/, @@ -18679,12 +18679,12 @@ const extended::ZoneInfo kZoneCanada_Eastern ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Mountain -> America/Edmonton -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameCanada_Mountain[] ACE_TIME_PROGMEM = "Canada/Mountain"; +static const char kZoneNameCanada_Mountain[] ACE_TIME_PROGMEM = "\x09" "Mountain"; const extended::ZoneInfo kZoneCanada_Mountain ACE_TIME_PROGMEM = { kZoneNameCanada_Mountain /*name*/, @@ -18696,12 +18696,12 @@ const extended::ZoneInfo kZoneCanada_Mountain ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Newfoundland -> America/St_Johns -// Strings (bytes): 20 -// Memory (8-bit): 31 -// Memory (32-bit): 40 +// Strings (bytes): 14 (originally 20) +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- -static const char kZoneNameCanada_Newfoundland[] ACE_TIME_PROGMEM = "Canada/Newfoundland"; +static const char kZoneNameCanada_Newfoundland[] ACE_TIME_PROGMEM = "\x09" "Newfoundland"; const extended::ZoneInfo kZoneCanada_Newfoundland ACE_TIME_PROGMEM = { kZoneNameCanada_Newfoundland /*name*/, @@ -18713,12 +18713,12 @@ const extended::ZoneInfo kZoneCanada_Newfoundland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Pacific -> America/Vancouver -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameCanada_Pacific[] ACE_TIME_PROGMEM = "Canada/Pacific"; +static const char kZoneNameCanada_Pacific[] ACE_TIME_PROGMEM = "\x09" "Pacific"; const extended::ZoneInfo kZoneCanada_Pacific ACE_TIME_PROGMEM = { kZoneNameCanada_Pacific /*name*/, @@ -18730,12 +18730,12 @@ const extended::ZoneInfo kZoneCanada_Pacific ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Saskatchewan -> America/Regina -// Strings (bytes): 20 -// Memory (8-bit): 31 -// Memory (32-bit): 40 +// Strings (bytes): 14 (originally 20) +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- -static const char kZoneNameCanada_Saskatchewan[] ACE_TIME_PROGMEM = "Canada/Saskatchewan"; +static const char kZoneNameCanada_Saskatchewan[] ACE_TIME_PROGMEM = "\x09" "Saskatchewan"; const extended::ZoneInfo kZoneCanada_Saskatchewan ACE_TIME_PROGMEM = { kZoneNameCanada_Saskatchewan /*name*/, @@ -18747,12 +18747,12 @@ const extended::ZoneInfo kZoneCanada_Saskatchewan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Canada/Yukon -> America/Whitehorse -// Strings (bytes): 13 -// Memory (8-bit): 24 -// Memory (32-bit): 33 +// Strings (bytes): 7 (originally 13) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameCanada_Yukon[] ACE_TIME_PROGMEM = "Canada/Yukon"; +static const char kZoneNameCanada_Yukon[] ACE_TIME_PROGMEM = "\x09" "Yukon"; const extended::ZoneInfo kZoneCanada_Yukon ACE_TIME_PROGMEM = { kZoneNameCanada_Yukon /*name*/, @@ -18764,7 +18764,7 @@ const extended::ZoneInfo kZoneCanada_Yukon ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Chile/Continental -> America/Santiago -// Strings (bytes): 18 +// Strings (bytes): 18 (originally 18) // Memory (8-bit): 29 // Memory (32-bit): 38 //--------------------------------------------------------------------------- @@ -18781,7 +18781,7 @@ const extended::ZoneInfo kZoneChile_Continental ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Chile/EasterIsland -> Pacific/Easter -// Strings (bytes): 19 +// Strings (bytes): 19 (originally 19) // Memory (8-bit): 30 // Memory (32-bit): 39 //--------------------------------------------------------------------------- @@ -18798,7 +18798,7 @@ const extended::ZoneInfo kZoneChile_EasterIsland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Cuba -> America/Havana -// Strings (bytes): 5 +// Strings (bytes): 5 (originally 5) // Memory (8-bit): 16 // Memory (32-bit): 25 //--------------------------------------------------------------------------- @@ -18815,7 +18815,7 @@ const extended::ZoneInfo kZoneCuba ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Egypt -> Africa/Cairo -// Strings (bytes): 6 +// Strings (bytes): 6 (originally 6) // Memory (8-bit): 17 // Memory (32-bit): 26 //--------------------------------------------------------------------------- @@ -18832,7 +18832,7 @@ const extended::ZoneInfo kZoneEgypt ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Eire -> Europe/Dublin -// Strings (bytes): 5 +// Strings (bytes): 5 (originally 5) // Memory (8-bit): 16 // Memory (32-bit): 25 //--------------------------------------------------------------------------- @@ -18849,12 +18849,12 @@ const extended::ZoneInfo kZoneEire ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/GMT+0 -> Etc/GMT -// Strings (bytes): 10 -// Memory (8-bit): 21 -// Memory (32-bit): 30 +// Strings (bytes): 7 (originally 10) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameEtc_GMT_PLUS_0[] ACE_TIME_PROGMEM = "Etc/GMT+0"; +static const char kZoneNameEtc_GMT_PLUS_0[] ACE_TIME_PROGMEM = "\x0a" "GMT+0"; const extended::ZoneInfo kZoneEtc_GMT_PLUS_0 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_PLUS_0 /*name*/, @@ -18866,12 +18866,12 @@ const extended::ZoneInfo kZoneEtc_GMT_PLUS_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/GMT-0 -> Etc/GMT -// Strings (bytes): 10 -// Memory (8-bit): 21 -// Memory (32-bit): 30 +// Strings (bytes): 7 (originally 10) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameEtc_GMT_0[] ACE_TIME_PROGMEM = "Etc/GMT-0"; +static const char kZoneNameEtc_GMT_0[] ACE_TIME_PROGMEM = "\x0a" "GMT-0"; const extended::ZoneInfo kZoneEtc_GMT_0 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT_0 /*name*/, @@ -18883,12 +18883,12 @@ const extended::ZoneInfo kZoneEtc_GMT_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/GMT0 -> Etc/GMT -// Strings (bytes): 9 -// Memory (8-bit): 20 -// Memory (32-bit): 29 +// Strings (bytes): 6 (originally 9) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNameEtc_GMT0[] ACE_TIME_PROGMEM = "Etc/GMT0"; +static const char kZoneNameEtc_GMT0[] ACE_TIME_PROGMEM = "\x0a" "GMT0"; const extended::ZoneInfo kZoneEtc_GMT0 ACE_TIME_PROGMEM = { kZoneNameEtc_GMT0 /*name*/, @@ -18900,12 +18900,12 @@ const extended::ZoneInfo kZoneEtc_GMT0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/Greenwich -> Etc/GMT -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameEtc_Greenwich[] ACE_TIME_PROGMEM = "Etc/Greenwich"; +static const char kZoneNameEtc_Greenwich[] ACE_TIME_PROGMEM = "\x0a" "Greenwich"; const extended::ZoneInfo kZoneEtc_Greenwich ACE_TIME_PROGMEM = { kZoneNameEtc_Greenwich /*name*/, @@ -18917,12 +18917,12 @@ const extended::ZoneInfo kZoneEtc_Greenwich ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/UCT -> Etc/UTC -// Strings (bytes): 8 -// Memory (8-bit): 19 -// Memory (32-bit): 28 +// Strings (bytes): 5 (originally 8) +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- -static const char kZoneNameEtc_UCT[] ACE_TIME_PROGMEM = "Etc/UCT"; +static const char kZoneNameEtc_UCT[] ACE_TIME_PROGMEM = "\x0a" "UCT"; const extended::ZoneInfo kZoneEtc_UCT ACE_TIME_PROGMEM = { kZoneNameEtc_UCT /*name*/, @@ -18934,12 +18934,12 @@ const extended::ZoneInfo kZoneEtc_UCT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/Universal -> Etc/UTC -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 11 (originally 14) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameEtc_Universal[] ACE_TIME_PROGMEM = "Etc/Universal"; +static const char kZoneNameEtc_Universal[] ACE_TIME_PROGMEM = "\x0a" "Universal"; const extended::ZoneInfo kZoneEtc_Universal ACE_TIME_PROGMEM = { kZoneNameEtc_Universal /*name*/, @@ -18951,12 +18951,12 @@ const extended::ZoneInfo kZoneEtc_Universal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Etc/Zulu -> Etc/UTC -// Strings (bytes): 9 -// Memory (8-bit): 20 -// Memory (32-bit): 29 +// Strings (bytes): 6 (originally 9) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNameEtc_Zulu[] ACE_TIME_PROGMEM = "Etc/Zulu"; +static const char kZoneNameEtc_Zulu[] ACE_TIME_PROGMEM = "\x0a" "Zulu"; const extended::ZoneInfo kZoneEtc_Zulu ACE_TIME_PROGMEM = { kZoneNameEtc_Zulu /*name*/, @@ -18968,12 +18968,12 @@ const extended::ZoneInfo kZoneEtc_Zulu ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Belfast -> Europe/London -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Belfast[] ACE_TIME_PROGMEM = "Europe/Belfast"; +static const char kZoneNameEurope_Belfast[] ACE_TIME_PROGMEM = "\x0b" "Belfast"; const extended::ZoneInfo kZoneEurope_Belfast ACE_TIME_PROGMEM = { kZoneNameEurope_Belfast /*name*/, @@ -18985,12 +18985,12 @@ const extended::ZoneInfo kZoneEurope_Belfast ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Bratislava -> Europe/Prague -// Strings (bytes): 18 -// Memory (8-bit): 29 -// Memory (32-bit): 38 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Bratislava[] ACE_TIME_PROGMEM = "Europe/Bratislava"; +static const char kZoneNameEurope_Bratislava[] ACE_TIME_PROGMEM = "\x0b" "Bratislava"; const extended::ZoneInfo kZoneEurope_Bratislava ACE_TIME_PROGMEM = { kZoneNameEurope_Bratislava /*name*/, @@ -19002,12 +19002,12 @@ const extended::ZoneInfo kZoneEurope_Bratislava ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Busingen -> Europe/Zurich -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Busingen[] ACE_TIME_PROGMEM = "Europe/Busingen"; +static const char kZoneNameEurope_Busingen[] ACE_TIME_PROGMEM = "\x0b" "Busingen"; const extended::ZoneInfo kZoneEurope_Busingen ACE_TIME_PROGMEM = { kZoneNameEurope_Busingen /*name*/, @@ -19019,12 +19019,12 @@ const extended::ZoneInfo kZoneEurope_Busingen ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Guernsey -> Europe/London -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Guernsey[] ACE_TIME_PROGMEM = "Europe/Guernsey"; +static const char kZoneNameEurope_Guernsey[] ACE_TIME_PROGMEM = "\x0b" "Guernsey"; const extended::ZoneInfo kZoneEurope_Guernsey ACE_TIME_PROGMEM = { kZoneNameEurope_Guernsey /*name*/, @@ -19036,12 +19036,12 @@ const extended::ZoneInfo kZoneEurope_Guernsey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Isle_of_Man -> Europe/London -// Strings (bytes): 19 -// Memory (8-bit): 30 -// Memory (32-bit): 39 +// Strings (bytes): 13 (originally 19) +// Memory (8-bit): 24 +// Memory (32-bit): 33 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Isle_of_Man[] ACE_TIME_PROGMEM = "Europe/Isle_of_Man"; +static const char kZoneNameEurope_Isle_of_Man[] ACE_TIME_PROGMEM = "\x0b" "Isle_of_Man"; const extended::ZoneInfo kZoneEurope_Isle_of_Man ACE_TIME_PROGMEM = { kZoneNameEurope_Isle_of_Man /*name*/, @@ -19053,12 +19053,12 @@ const extended::ZoneInfo kZoneEurope_Isle_of_Man ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Jersey -> Europe/London -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Jersey[] ACE_TIME_PROGMEM = "Europe/Jersey"; +static const char kZoneNameEurope_Jersey[] ACE_TIME_PROGMEM = "\x0b" "Jersey"; const extended::ZoneInfo kZoneEurope_Jersey ACE_TIME_PROGMEM = { kZoneNameEurope_Jersey /*name*/, @@ -19070,12 +19070,12 @@ const extended::ZoneInfo kZoneEurope_Jersey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Ljubljana -> Europe/Belgrade -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Ljubljana[] ACE_TIME_PROGMEM = "Europe/Ljubljana"; +static const char kZoneNameEurope_Ljubljana[] ACE_TIME_PROGMEM = "\x0b" "Ljubljana"; const extended::ZoneInfo kZoneEurope_Ljubljana ACE_TIME_PROGMEM = { kZoneNameEurope_Ljubljana /*name*/, @@ -19087,12 +19087,12 @@ const extended::ZoneInfo kZoneEurope_Ljubljana ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Mariehamn -> Europe/Helsinki -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Mariehamn[] ACE_TIME_PROGMEM = "Europe/Mariehamn"; +static const char kZoneNameEurope_Mariehamn[] ACE_TIME_PROGMEM = "\x0b" "Mariehamn"; const extended::ZoneInfo kZoneEurope_Mariehamn ACE_TIME_PROGMEM = { kZoneNameEurope_Mariehamn /*name*/, @@ -19104,12 +19104,12 @@ const extended::ZoneInfo kZoneEurope_Mariehamn ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Nicosia -> Asia/Nicosia -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Nicosia[] ACE_TIME_PROGMEM = "Europe/Nicosia"; +static const char kZoneNameEurope_Nicosia[] ACE_TIME_PROGMEM = "\x0b" "Nicosia"; const extended::ZoneInfo kZoneEurope_Nicosia ACE_TIME_PROGMEM = { kZoneNameEurope_Nicosia /*name*/, @@ -19121,12 +19121,12 @@ const extended::ZoneInfo kZoneEurope_Nicosia ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Podgorica -> Europe/Belgrade -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 11 (originally 17) +// Memory (8-bit): 22 +// Memory (32-bit): 31 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Podgorica[] ACE_TIME_PROGMEM = "Europe/Podgorica"; +static const char kZoneNameEurope_Podgorica[] ACE_TIME_PROGMEM = "\x0b" "Podgorica"; const extended::ZoneInfo kZoneEurope_Podgorica ACE_TIME_PROGMEM = { kZoneNameEurope_Podgorica /*name*/, @@ -19138,12 +19138,12 @@ const extended::ZoneInfo kZoneEurope_Podgorica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/San_Marino -> Europe/Rome -// Strings (bytes): 18 -// Memory (8-bit): 29 -// Memory (32-bit): 38 +// Strings (bytes): 12 (originally 18) +// Memory (8-bit): 23 +// Memory (32-bit): 32 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_San_Marino[] ACE_TIME_PROGMEM = "Europe/San_Marino"; +static const char kZoneNameEurope_San_Marino[] ACE_TIME_PROGMEM = "\x0b" "San_Marino"; const extended::ZoneInfo kZoneEurope_San_Marino ACE_TIME_PROGMEM = { kZoneNameEurope_San_Marino /*name*/, @@ -19155,12 +19155,12 @@ const extended::ZoneInfo kZoneEurope_San_Marino ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Sarajevo -> Europe/Belgrade -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Sarajevo[] ACE_TIME_PROGMEM = "Europe/Sarajevo"; +static const char kZoneNameEurope_Sarajevo[] ACE_TIME_PROGMEM = "\x0b" "Sarajevo"; const extended::ZoneInfo kZoneEurope_Sarajevo ACE_TIME_PROGMEM = { kZoneNameEurope_Sarajevo /*name*/, @@ -19172,12 +19172,12 @@ const extended::ZoneInfo kZoneEurope_Sarajevo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Skopje -> Europe/Belgrade -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Skopje[] ACE_TIME_PROGMEM = "Europe/Skopje"; +static const char kZoneNameEurope_Skopje[] ACE_TIME_PROGMEM = "\x0b" "Skopje"; const extended::ZoneInfo kZoneEurope_Skopje ACE_TIME_PROGMEM = { kZoneNameEurope_Skopje /*name*/, @@ -19189,12 +19189,12 @@ const extended::ZoneInfo kZoneEurope_Skopje ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Tiraspol -> Europe/Chisinau -// Strings (bytes): 16 -// Memory (8-bit): 27 -// Memory (32-bit): 36 +// Strings (bytes): 10 (originally 16) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Tiraspol[] ACE_TIME_PROGMEM = "Europe/Tiraspol"; +static const char kZoneNameEurope_Tiraspol[] ACE_TIME_PROGMEM = "\x0b" "Tiraspol"; const extended::ZoneInfo kZoneEurope_Tiraspol ACE_TIME_PROGMEM = { kZoneNameEurope_Tiraspol /*name*/, @@ -19206,12 +19206,12 @@ const extended::ZoneInfo kZoneEurope_Tiraspol ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Vaduz -> Europe/Zurich -// Strings (bytes): 13 -// Memory (8-bit): 24 -// Memory (32-bit): 33 +// Strings (bytes): 7 (originally 13) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Vaduz[] ACE_TIME_PROGMEM = "Europe/Vaduz"; +static const char kZoneNameEurope_Vaduz[] ACE_TIME_PROGMEM = "\x0b" "Vaduz"; const extended::ZoneInfo kZoneEurope_Vaduz ACE_TIME_PROGMEM = { kZoneNameEurope_Vaduz /*name*/, @@ -19223,12 +19223,12 @@ const extended::ZoneInfo kZoneEurope_Vaduz ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Vatican -> Europe/Rome -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Vatican[] ACE_TIME_PROGMEM = "Europe/Vatican"; +static const char kZoneNameEurope_Vatican[] ACE_TIME_PROGMEM = "\x0b" "Vatican"; const extended::ZoneInfo kZoneEurope_Vatican ACE_TIME_PROGMEM = { kZoneNameEurope_Vatican /*name*/, @@ -19240,12 +19240,12 @@ const extended::ZoneInfo kZoneEurope_Vatican ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Europe/Zagreb -> Europe/Belgrade -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameEurope_Zagreb[] ACE_TIME_PROGMEM = "Europe/Zagreb"; +static const char kZoneNameEurope_Zagreb[] ACE_TIME_PROGMEM = "\x0b" "Zagreb"; const extended::ZoneInfo kZoneEurope_Zagreb ACE_TIME_PROGMEM = { kZoneNameEurope_Zagreb /*name*/, @@ -19257,7 +19257,7 @@ const extended::ZoneInfo kZoneEurope_Zagreb ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GB -> Europe/London -// Strings (bytes): 3 +// Strings (bytes): 3 (originally 3) // Memory (8-bit): 14 // Memory (32-bit): 23 //--------------------------------------------------------------------------- @@ -19274,7 +19274,7 @@ const extended::ZoneInfo kZoneGB ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GB-Eire -> Europe/London -// Strings (bytes): 8 +// Strings (bytes): 8 (originally 8) // Memory (8-bit): 19 // Memory (32-bit): 28 //--------------------------------------------------------------------------- @@ -19291,7 +19291,7 @@ const extended::ZoneInfo kZoneGB_Eire ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT -> Etc/GMT -// Strings (bytes): 4 +// Strings (bytes): 4 (originally 4) // Memory (8-bit): 15 // Memory (32-bit): 24 //--------------------------------------------------------------------------- @@ -19308,7 +19308,7 @@ const extended::ZoneInfo kZoneGMT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT+0 -> Etc/GMT -// Strings (bytes): 6 +// Strings (bytes): 6 (originally 6) // Memory (8-bit): 17 // Memory (32-bit): 26 //--------------------------------------------------------------------------- @@ -19325,7 +19325,7 @@ const extended::ZoneInfo kZoneGMT_PLUS_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT-0 -> Etc/GMT -// Strings (bytes): 6 +// Strings (bytes): 6 (originally 6) // Memory (8-bit): 17 // Memory (32-bit): 26 //--------------------------------------------------------------------------- @@ -19342,7 +19342,7 @@ const extended::ZoneInfo kZoneGMT_0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: GMT0 -> Etc/GMT -// Strings (bytes): 5 +// Strings (bytes): 5 (originally 5) // Memory (8-bit): 16 // Memory (32-bit): 25 //--------------------------------------------------------------------------- @@ -19359,7 +19359,7 @@ const extended::ZoneInfo kZoneGMT0 ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Greenwich -> Etc/GMT -// Strings (bytes): 10 +// Strings (bytes): 10 (originally 10) // Memory (8-bit): 21 // Memory (32-bit): 30 //--------------------------------------------------------------------------- @@ -19376,7 +19376,7 @@ const extended::ZoneInfo kZoneGreenwich ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Hongkong -> Asia/Hong_Kong -// Strings (bytes): 9 +// Strings (bytes): 9 (originally 9) // Memory (8-bit): 20 // Memory (32-bit): 29 //--------------------------------------------------------------------------- @@ -19393,7 +19393,7 @@ const extended::ZoneInfo kZoneHongkong ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Iceland -> Atlantic/Reykjavik -// Strings (bytes): 8 +// Strings (bytes): 8 (originally 8) // Memory (8-bit): 19 // Memory (32-bit): 28 //--------------------------------------------------------------------------- @@ -19410,12 +19410,12 @@ const extended::ZoneInfo kZoneIceland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Indian/Antananarivo -> Africa/Nairobi -// Strings (bytes): 20 -// Memory (8-bit): 31 -// Memory (32-bit): 40 +// Strings (bytes): 14 (originally 20) +// Memory (8-bit): 25 +// Memory (32-bit): 34 //--------------------------------------------------------------------------- -static const char kZoneNameIndian_Antananarivo[] ACE_TIME_PROGMEM = "Indian/Antananarivo"; +static const char kZoneNameIndian_Antananarivo[] ACE_TIME_PROGMEM = "\x0c" "Antananarivo"; const extended::ZoneInfo kZoneIndian_Antananarivo ACE_TIME_PROGMEM = { kZoneNameIndian_Antananarivo /*name*/, @@ -19427,12 +19427,12 @@ const extended::ZoneInfo kZoneIndian_Antananarivo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Indian/Comoro -> Africa/Nairobi -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 8 (originally 14) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNameIndian_Comoro[] ACE_TIME_PROGMEM = "Indian/Comoro"; +static const char kZoneNameIndian_Comoro[] ACE_TIME_PROGMEM = "\x0c" "Comoro"; const extended::ZoneInfo kZoneIndian_Comoro ACE_TIME_PROGMEM = { kZoneNameIndian_Comoro /*name*/, @@ -19444,12 +19444,12 @@ const extended::ZoneInfo kZoneIndian_Comoro ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Indian/Mayotte -> Africa/Nairobi -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 9 (originally 15) +// Memory (8-bit): 20 +// Memory (32-bit): 29 //--------------------------------------------------------------------------- -static const char kZoneNameIndian_Mayotte[] ACE_TIME_PROGMEM = "Indian/Mayotte"; +static const char kZoneNameIndian_Mayotte[] ACE_TIME_PROGMEM = "\x0c" "Mayotte"; const extended::ZoneInfo kZoneIndian_Mayotte ACE_TIME_PROGMEM = { kZoneNameIndian_Mayotte /*name*/, @@ -19461,7 +19461,7 @@ const extended::ZoneInfo kZoneIndian_Mayotte ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Iran -> Asia/Tehran -// Strings (bytes): 5 +// Strings (bytes): 5 (originally 5) // Memory (8-bit): 16 // Memory (32-bit): 25 //--------------------------------------------------------------------------- @@ -19478,7 +19478,7 @@ const extended::ZoneInfo kZoneIran ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Israel -> Asia/Jerusalem -// Strings (bytes): 7 +// Strings (bytes): 7 (originally 7) // Memory (8-bit): 18 // Memory (32-bit): 27 //--------------------------------------------------------------------------- @@ -19495,7 +19495,7 @@ const extended::ZoneInfo kZoneIsrael ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Jamaica -> America/Jamaica -// Strings (bytes): 8 +// Strings (bytes): 8 (originally 8) // Memory (8-bit): 19 // Memory (32-bit): 28 //--------------------------------------------------------------------------- @@ -19512,7 +19512,7 @@ const extended::ZoneInfo kZoneJamaica ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Japan -> Asia/Tokyo -// Strings (bytes): 6 +// Strings (bytes): 6 (originally 6) // Memory (8-bit): 17 // Memory (32-bit): 26 //--------------------------------------------------------------------------- @@ -19529,7 +19529,7 @@ const extended::ZoneInfo kZoneJapan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Kwajalein -> Pacific/Kwajalein -// Strings (bytes): 10 +// Strings (bytes): 10 (originally 10) // Memory (8-bit): 21 // Memory (32-bit): 30 //--------------------------------------------------------------------------- @@ -19546,7 +19546,7 @@ const extended::ZoneInfo kZoneKwajalein ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Libya -> Africa/Tripoli -// Strings (bytes): 6 +// Strings (bytes): 6 (originally 6) // Memory (8-bit): 17 // Memory (32-bit): 26 //--------------------------------------------------------------------------- @@ -19563,7 +19563,7 @@ const extended::ZoneInfo kZoneLibya ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Mexico/BajaNorte -> America/Tijuana -// Strings (bytes): 17 +// Strings (bytes): 17 (originally 17) // Memory (8-bit): 28 // Memory (32-bit): 37 //--------------------------------------------------------------------------- @@ -19580,7 +19580,7 @@ const extended::ZoneInfo kZoneMexico_BajaNorte ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Mexico/BajaSur -> America/Mazatlan -// Strings (bytes): 15 +// Strings (bytes): 15 (originally 15) // Memory (8-bit): 26 // Memory (32-bit): 35 //--------------------------------------------------------------------------- @@ -19597,7 +19597,7 @@ const extended::ZoneInfo kZoneMexico_BajaSur ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Mexico/General -> America/Mexico_City -// Strings (bytes): 15 +// Strings (bytes): 15 (originally 15) // Memory (8-bit): 26 // Memory (32-bit): 35 //--------------------------------------------------------------------------- @@ -19614,7 +19614,7 @@ const extended::ZoneInfo kZoneMexico_General ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: NZ -> Pacific/Auckland -// Strings (bytes): 3 +// Strings (bytes): 3 (originally 3) // Memory (8-bit): 14 // Memory (32-bit): 23 //--------------------------------------------------------------------------- @@ -19631,7 +19631,7 @@ const extended::ZoneInfo kZoneNZ ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: NZ-CHAT -> Pacific/Chatham -// Strings (bytes): 8 +// Strings (bytes): 8 (originally 8) // Memory (8-bit): 19 // Memory (32-bit): 28 //--------------------------------------------------------------------------- @@ -19648,7 +19648,7 @@ const extended::ZoneInfo kZoneNZ_CHAT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Navajo -> America/Denver -// Strings (bytes): 7 +// Strings (bytes): 7 (originally 7) // Memory (8-bit): 18 // Memory (32-bit): 27 //--------------------------------------------------------------------------- @@ -19665,7 +19665,7 @@ const extended::ZoneInfo kZoneNavajo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: PRC -> Asia/Shanghai -// Strings (bytes): 4 +// Strings (bytes): 4 (originally 4) // Memory (8-bit): 15 // Memory (32-bit): 24 //--------------------------------------------------------------------------- @@ -19682,12 +19682,12 @@ const extended::ZoneInfo kZonePRC ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Johnston -> Pacific/Honolulu -// Strings (bytes): 17 -// Memory (8-bit): 28 -// Memory (32-bit): 37 +// Strings (bytes): 10 (originally 17) +// Memory (8-bit): 21 +// Memory (32-bit): 30 //--------------------------------------------------------------------------- -static const char kZoneNamePacific_Johnston[] ACE_TIME_PROGMEM = "Pacific/Johnston"; +static const char kZoneNamePacific_Johnston[] ACE_TIME_PROGMEM = "\x0e" "Johnston"; const extended::ZoneInfo kZonePacific_Johnston ACE_TIME_PROGMEM = { kZoneNamePacific_Johnston /*name*/, @@ -19699,12 +19699,12 @@ const extended::ZoneInfo kZonePacific_Johnston ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Midway -> Pacific/Pago_Pago -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 8 (originally 15) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNamePacific_Midway[] ACE_TIME_PROGMEM = "Pacific/Midway"; +static const char kZoneNamePacific_Midway[] ACE_TIME_PROGMEM = "\x0e" "Midway"; const extended::ZoneInfo kZonePacific_Midway ACE_TIME_PROGMEM = { kZoneNamePacific_Midway /*name*/, @@ -19716,12 +19716,12 @@ const extended::ZoneInfo kZonePacific_Midway ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Ponape -> Pacific/Pohnpei -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 8 (originally 15) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNamePacific_Ponape[] ACE_TIME_PROGMEM = "Pacific/Ponape"; +static const char kZoneNamePacific_Ponape[] ACE_TIME_PROGMEM = "\x0e" "Ponape"; const extended::ZoneInfo kZonePacific_Ponape ACE_TIME_PROGMEM = { kZoneNamePacific_Ponape /*name*/, @@ -19733,12 +19733,12 @@ const extended::ZoneInfo kZonePacific_Ponape ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Saipan -> Pacific/Guam -// Strings (bytes): 15 -// Memory (8-bit): 26 -// Memory (32-bit): 35 +// Strings (bytes): 8 (originally 15) +// Memory (8-bit): 19 +// Memory (32-bit): 28 //--------------------------------------------------------------------------- -static const char kZoneNamePacific_Saipan[] ACE_TIME_PROGMEM = "Pacific/Saipan"; +static const char kZoneNamePacific_Saipan[] ACE_TIME_PROGMEM = "\x0e" "Saipan"; const extended::ZoneInfo kZonePacific_Saipan ACE_TIME_PROGMEM = { kZoneNamePacific_Saipan /*name*/, @@ -19750,12 +19750,12 @@ const extended::ZoneInfo kZonePacific_Saipan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Samoa -> Pacific/Pago_Pago -// Strings (bytes): 14 -// Memory (8-bit): 25 -// Memory (32-bit): 34 +// Strings (bytes): 7 (originally 14) +// Memory (8-bit): 18 +// Memory (32-bit): 27 //--------------------------------------------------------------------------- -static const char kZoneNamePacific_Samoa[] ACE_TIME_PROGMEM = "Pacific/Samoa"; +static const char kZoneNamePacific_Samoa[] ACE_TIME_PROGMEM = "\x0e" "Samoa"; const extended::ZoneInfo kZonePacific_Samoa ACE_TIME_PROGMEM = { kZoneNamePacific_Samoa /*name*/, @@ -19767,12 +19767,12 @@ const extended::ZoneInfo kZonePacific_Samoa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Truk -> Pacific/Chuuk -// Strings (bytes): 13 -// Memory (8-bit): 24 -// Memory (32-bit): 33 +// Strings (bytes): 6 (originally 13) +// Memory (8-bit): 17 +// Memory (32-bit): 26 //--------------------------------------------------------------------------- -static const char kZoneNamePacific_Truk[] ACE_TIME_PROGMEM = "Pacific/Truk"; +static const char kZoneNamePacific_Truk[] ACE_TIME_PROGMEM = "\x0e" "Truk"; const extended::ZoneInfo kZonePacific_Truk ACE_TIME_PROGMEM = { kZoneNamePacific_Truk /*name*/, @@ -19784,12 +19784,12 @@ const extended::ZoneInfo kZonePacific_Truk ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Pacific/Yap -> Pacific/Chuuk -// Strings (bytes): 12 -// Memory (8-bit): 23 -// Memory (32-bit): 32 +// Strings (bytes): 5 (originally 12) +// Memory (8-bit): 16 +// Memory (32-bit): 25 //--------------------------------------------------------------------------- -static const char kZoneNamePacific_Yap[] ACE_TIME_PROGMEM = "Pacific/Yap"; +static const char kZoneNamePacific_Yap[] ACE_TIME_PROGMEM = "\x0e" "Yap"; const extended::ZoneInfo kZonePacific_Yap ACE_TIME_PROGMEM = { kZoneNamePacific_Yap /*name*/, @@ -19801,7 +19801,7 @@ const extended::ZoneInfo kZonePacific_Yap ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Poland -> Europe/Warsaw -// Strings (bytes): 7 +// Strings (bytes): 7 (originally 7) // Memory (8-bit): 18 // Memory (32-bit): 27 //--------------------------------------------------------------------------- @@ -19818,7 +19818,7 @@ const extended::ZoneInfo kZonePoland ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Portugal -> Europe/Lisbon -// Strings (bytes): 9 +// Strings (bytes): 9 (originally 9) // Memory (8-bit): 20 // Memory (32-bit): 29 //--------------------------------------------------------------------------- @@ -19835,7 +19835,7 @@ const extended::ZoneInfo kZonePortugal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: ROC -> Asia/Taipei -// Strings (bytes): 4 +// Strings (bytes): 4 (originally 4) // Memory (8-bit): 15 // Memory (32-bit): 24 //--------------------------------------------------------------------------- @@ -19852,7 +19852,7 @@ const extended::ZoneInfo kZoneROC ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: ROK -> Asia/Seoul -// Strings (bytes): 4 +// Strings (bytes): 4 (originally 4) // Memory (8-bit): 15 // Memory (32-bit): 24 //--------------------------------------------------------------------------- @@ -19869,7 +19869,7 @@ const extended::ZoneInfo kZoneROK ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Singapore -> Asia/Singapore -// Strings (bytes): 10 +// Strings (bytes): 10 (originally 10) // Memory (8-bit): 21 // Memory (32-bit): 30 //--------------------------------------------------------------------------- @@ -19886,7 +19886,7 @@ const extended::ZoneInfo kZoneSingapore ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Turkey -> Europe/Istanbul -// Strings (bytes): 7 +// Strings (bytes): 7 (originally 7) // Memory (8-bit): 18 // Memory (32-bit): 27 //--------------------------------------------------------------------------- @@ -19903,7 +19903,7 @@ const extended::ZoneInfo kZoneTurkey ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: UCT -> Etc/UTC -// Strings (bytes): 4 +// Strings (bytes): 4 (originally 4) // Memory (8-bit): 15 // Memory (32-bit): 24 //--------------------------------------------------------------------------- @@ -19920,7 +19920,7 @@ const extended::ZoneInfo kZoneUCT ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Alaska -> America/Anchorage -// Strings (bytes): 10 +// Strings (bytes): 10 (originally 10) // Memory (8-bit): 21 // Memory (32-bit): 30 //--------------------------------------------------------------------------- @@ -19937,7 +19937,7 @@ const extended::ZoneInfo kZoneUS_Alaska ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Aleutian -> America/Adak -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 23 // Memory (32-bit): 32 //--------------------------------------------------------------------------- @@ -19954,7 +19954,7 @@ const extended::ZoneInfo kZoneUS_Aleutian ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Arizona -> America/Phoenix -// Strings (bytes): 11 +// Strings (bytes): 11 (originally 11) // Memory (8-bit): 22 // Memory (32-bit): 31 //--------------------------------------------------------------------------- @@ -19971,7 +19971,7 @@ const extended::ZoneInfo kZoneUS_Arizona ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Central -> America/Chicago -// Strings (bytes): 11 +// Strings (bytes): 11 (originally 11) // Memory (8-bit): 22 // Memory (32-bit): 31 //--------------------------------------------------------------------------- @@ -19988,7 +19988,7 @@ const extended::ZoneInfo kZoneUS_Central ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/East-Indiana -> America/Indiana/Indianapolis -// Strings (bytes): 16 +// Strings (bytes): 16 (originally 16) // Memory (8-bit): 27 // Memory (32-bit): 36 //--------------------------------------------------------------------------- @@ -20005,7 +20005,7 @@ const extended::ZoneInfo kZoneUS_East_Indiana ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Eastern -> America/New_York -// Strings (bytes): 11 +// Strings (bytes): 11 (originally 11) // Memory (8-bit): 22 // Memory (32-bit): 31 //--------------------------------------------------------------------------- @@ -20022,7 +20022,7 @@ const extended::ZoneInfo kZoneUS_Eastern ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Hawaii -> Pacific/Honolulu -// Strings (bytes): 10 +// Strings (bytes): 10 (originally 10) // Memory (8-bit): 21 // Memory (32-bit): 30 //--------------------------------------------------------------------------- @@ -20039,7 +20039,7 @@ const extended::ZoneInfo kZoneUS_Hawaii ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Indiana-Starke -> America/Indiana/Knox -// Strings (bytes): 18 +// Strings (bytes): 18 (originally 18) // Memory (8-bit): 29 // Memory (32-bit): 38 //--------------------------------------------------------------------------- @@ -20056,7 +20056,7 @@ const extended::ZoneInfo kZoneUS_Indiana_Starke ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Michigan -> America/Detroit -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 23 // Memory (32-bit): 32 //--------------------------------------------------------------------------- @@ -20073,7 +20073,7 @@ const extended::ZoneInfo kZoneUS_Michigan ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Mountain -> America/Denver -// Strings (bytes): 12 +// Strings (bytes): 12 (originally 12) // Memory (8-bit): 23 // Memory (32-bit): 32 //--------------------------------------------------------------------------- @@ -20090,7 +20090,7 @@ const extended::ZoneInfo kZoneUS_Mountain ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Pacific -> America/Los_Angeles -// Strings (bytes): 11 +// Strings (bytes): 11 (originally 11) // Memory (8-bit): 22 // Memory (32-bit): 31 //--------------------------------------------------------------------------- @@ -20107,7 +20107,7 @@ const extended::ZoneInfo kZoneUS_Pacific ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: US/Samoa -> Pacific/Pago_Pago -// Strings (bytes): 9 +// Strings (bytes): 9 (originally 9) // Memory (8-bit): 20 // Memory (32-bit): 29 //--------------------------------------------------------------------------- @@ -20124,7 +20124,7 @@ const extended::ZoneInfo kZoneUS_Samoa ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: UTC -> Etc/UTC -// Strings (bytes): 4 +// Strings (bytes): 4 (originally 4) // Memory (8-bit): 15 // Memory (32-bit): 24 //--------------------------------------------------------------------------- @@ -20141,7 +20141,7 @@ const extended::ZoneInfo kZoneUTC ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Universal -> Etc/UTC -// Strings (bytes): 10 +// Strings (bytes): 10 (originally 10) // Memory (8-bit): 21 // Memory (32-bit): 30 //--------------------------------------------------------------------------- @@ -20158,7 +20158,7 @@ const extended::ZoneInfo kZoneUniversal ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: W-SU -> Europe/Moscow -// Strings (bytes): 5 +// Strings (bytes): 5 (originally 5) // Memory (8-bit): 16 // Memory (32-bit): 25 //--------------------------------------------------------------------------- @@ -20175,7 +20175,7 @@ const extended::ZoneInfo kZoneW_SU ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Link name: Zulu -> Etc/UTC -// Strings (bytes): 5 +// Strings (bytes): 5 (originally 5) // Memory (8-bit): 16 // Memory (32-bit): 25 //--------------------------------------------------------------------------- From a1ad88dfd2d0ff5ea09288fc4357898ed4045efc Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 7 Jan 2021 14:52:28 -0800 Subject: [PATCH 46/74] MemoryBenchmark: Add memory consumption for kZoneAndLinkRegistry[] --- examples/MemoryBenchmark/MemoryBenchmark.ino | 46 ++-- examples/MemoryBenchmark/README.md | 264 ++++++++++--------- examples/MemoryBenchmark/collect.sh | 2 +- examples/MemoryBenchmark/esp32.txt | 16 +- examples/MemoryBenchmark/esp8266.txt | 16 +- examples/MemoryBenchmark/generate_table.awk | 44 ++-- examples/MemoryBenchmark/micro.txt | 16 +- examples/MemoryBenchmark/nano.txt | 16 +- examples/MemoryBenchmark/samd.txt | 22 +- examples/MemoryBenchmark/teensy32.txt | 16 +- 10 files changed, 250 insertions(+), 208 deletions(-) diff --git a/examples/MemoryBenchmark/MemoryBenchmark.ino b/examples/MemoryBenchmark/MemoryBenchmark.ino index 3fa3609e8..5d6de84e9 100644 --- a/examples/MemoryBenchmark/MemoryBenchmark.ino +++ b/examples/MemoryBenchmark/MemoryBenchmark.ino @@ -12,15 +12,17 @@ #define FEATURE_MANUAL_ZONE_MANAGER 3 #define FEATURE_BASIC_TIME_ZONE 4 #define FEATURE_BASIC_TIME_ZONE2 5 -#define FEATURE_BASIC_ZONE_MANAGER_1 6 -#define FEATURE_BASIC_ZONE_MANAGER_ALL 7 -#define FEATURE_EXTENDED_TIME_ZONE 8 -#define FEATURE_EXTENDED_TIME_ZONE2 9 -#define FEATURE_EXTENDED_ZONE_MANAGER_1 10 -#define FEATURE_EXTENDED_ZONE_MANAGER_ALL 11 -#define FEATURE_SYSTEM_CLOCK 12 -#define FEATURE_SYSTEM_CLOCK_AND_BASIC_TIME_ZONE 13 -#define FEATURE_SYSTEM_CLOCK_AND_EXTENDED_TIME_ZONE 14 +#define FEATURE_BASIC_ZONE_MANAGER_ONE 6 +#define FEATURE_BASIC_ZONE_MANAGER_ZONES 7 +#define FEATURE_BASIC_ZONE_MANAGER_ZONES_AND_LINKS 8 +#define FEATURE_EXTENDED_TIME_ZONE 9 +#define FEATURE_EXTENDED_TIME_ZONE2 10 +#define FEATURE_EXTENDED_ZONE_MANAGER_ONE 11 +#define FEATURE_EXTENDED_ZONE_MANAGER_ZONES 12 +#define FEATURE_EXTENDED_ZONE_MANAGER_ZONES_AND_LINKS 13 +#define FEATURE_SYSTEM_CLOCK 14 +#define FEATURE_SYSTEM_CLOCK_AND_BASIC_TIME_ZONE 15 +#define FEATURE_SYSTEM_CLOCK_AND_EXTENDED_TIME_ZONE 16 // Select one of the FEATURE_* parameter and compile. Then look at the flash // and RAM usage, compared to FEATURE_BASELINE usage to determine how much @@ -39,7 +41,7 @@ // being tested when it determines that it does nothing. volatile uint8_t guard; -#if FEATURE == FEATURE_BASIC_ZONE_MANAGER_1 +#if FEATURE == FEATURE_BASIC_ZONE_MANAGER_ONE static const basic::ZoneInfo* const kBasicZoneRegistry[] ACE_TIME_PROGMEM = { &zonedb::kZoneAmerica_Los_Angeles, @@ -47,7 +49,7 @@ static const basic::ZoneInfo* const kBasicZoneRegistry[] ACE_TIME_PROGMEM = { static const uint16_t kBasicZoneRegistrySize = sizeof(kBasicZoneRegistry) / sizeof(basic::ZoneInfo*); -#elif FEATURE == FEATURE_EXTENDED_ZONE_MANAGER_1 +#elif FEATURE == FEATURE_EXTENDED_ZONE_MANAGER_ONE static const extended::ZoneInfo* const kExtendedZoneRegistry[] ACE_TIME_PROGMEM = { @@ -95,18 +97,25 @@ void setup() { auto dt2 = dt1.convertToTimeZone(tz2); acetime_t epochSeconds = dt2.toEpochSeconds(); guard ^= epochSeconds; -#elif FEATURE == FEATURE_BASIC_ZONE_MANAGER_1 +#elif FEATURE == FEATURE_BASIC_ZONE_MANAGER_ONE BasicZoneManager<1> manager(kBasicZoneRegistrySize, kBasicZoneRegistry); auto tz = manager.createForZoneInfo(&zonedb::kZoneAmerica_Los_Angeles); auto dt = ZonedDateTime::forComponents(2019, 6, 17, 9, 18, 0, tz); acetime_t epochSeconds = dt.toEpochSeconds(); guard ^= epochSeconds; -#elif FEATURE == FEATURE_BASIC_ZONE_MANAGER_ALL +#elif FEATURE == FEATURE_BASIC_ZONE_MANAGER_ZONES BasicZoneManager<1> manager(zonedb::kZoneRegistrySize, zonedb::kZoneRegistry); auto tz = manager.createForZoneInfo(&zonedb::kZoneAmerica_Los_Angeles); auto dt = ZonedDateTime::forComponents(2019, 6, 17, 9, 18, 0, tz); acetime_t epochSeconds = dt.toEpochSeconds(); guard ^= epochSeconds; +#elif FEATURE == FEATURE_BASIC_ZONE_MANAGER_ZONES_AND_LINKS + BasicZoneManager<1> manager( + zonedb::kZoneAndLinkRegistrySize, zonedb::kZoneAndLinkRegistry); + auto tz = manager.createForZoneInfo(&zonedb::kZoneAmerica_Los_Angeles); + auto dt = ZonedDateTime::forComponents(2019, 6, 17, 9, 18, 0, tz); + acetime_t epochSeconds = dt.toEpochSeconds(); + guard ^= epochSeconds; #elif FEATURE == FEATURE_EXTENDED_TIME_ZONE ExtendedZoneProcessor processor; auto tz = TimeZone::forZoneInfo(&zonedbx::kZoneAmerica_Los_Angeles, @@ -126,20 +135,27 @@ void setup() { auto dt2 = dt1.convertToTimeZone(tz2); acetime_t epochSeconds = dt2.toEpochSeconds(); guard ^= epochSeconds; -#elif FEATURE == FEATURE_EXTENDED_ZONE_MANAGER_1 +#elif FEATURE == FEATURE_EXTENDED_ZONE_MANAGER_ONE ExtendedZoneManager<1> manager( kExtendedZoneRegistrySize, kExtendedZoneRegistry); auto tz = manager.createForZoneInfo(&zonedbx::kZoneAmerica_Los_Angeles); auto dt = ZonedDateTime::forComponents(2019, 6, 17, 9, 18, 0, tz); acetime_t epochSeconds = dt.toEpochSeconds(); guard ^= epochSeconds; -#elif FEATURE == FEATURE_EXTENDED_ZONE_MANAGER_ALL +#elif FEATURE == FEATURE_EXTENDED_ZONE_MANAGER_ZONES ExtendedZoneManager<1> manager( zonedbx::kZoneRegistrySize, zonedbx::kZoneRegistry); auto tz = manager.createForZoneInfo(&zonedbx::kZoneAmerica_Los_Angeles); auto dt = ZonedDateTime::forComponents(2019, 6, 17, 9, 18, 0, tz); acetime_t epochSeconds = dt.toEpochSeconds(); guard ^= epochSeconds; +#elif FEATURE == FEATURE_EXTENDED_ZONE_MANAGER_ZONES_AND_LINKS + ExtendedZoneManager<1> manager( + zonedbx::kZoneAndLinkRegistrySize, zonedbx::kZoneAndLinkRegistry); + auto tz = manager.createForZoneInfo(&zonedbx::kZoneAmerica_Los_Angeles); + auto dt = ZonedDateTime::forComponents(2019, 6, 17, 9, 18, 0, tz); + acetime_t epochSeconds = dt.toEpochSeconds(); + guard ^= epochSeconds; #elif FEATURE == FEATURE_SYSTEM_CLOCK DS3231Clock dsClock; SystemClockLoop systemClock(&dsClock, &dsClock); diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index 77fb479d8..2a75e0ef2 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -63,27 +63,29 @@ consumption by 1200-2400 bytes when all the zones are loaded into the * Arduino AVR Boards 1.8.3 ``` -+--------------------------------------------------------------+ -| Functionality | flash/ ram | delta | -|---------------------------------+--------------+-------------| -| Baseline | 448/ 10 | 0/ 0 | -|---------------------------------+--------------+-------------| -| LocalDateTime | 1648/ 123 | 1200/ 113 | -| ZonedDateTime | 2440/ 123 | 1992/ 113 | -| Manual ZoneManager | 2684/ 123 | 2236/ 113 | -| Basic TimeZone (1 zone) | 7168/ 309 | 6720/ 299 | -| Basic TimeZone (2 zones) | 7736/ 313 | 7288/ 303 | -| Basic ZoneManager (1 zone) | 8816/ 335 | 8368/ 325 | -| Basic ZoneManager (all) | 21800/ 711 | 21352/ 701 | -| Extended TimeZone (1 zone) | 9982/ 343 | 9534/ 333 | -| Extended TimeZone (2 zones) | 10450/ 347 | 10002/ 337 | -| Extended ZoneManager (1 zone) | 11790/ 369 | 11342/ 359 | -| Extended ZoneManager (all) | 33844/ 853 | 33396/ 843 | -|---------------------------------+--------------+-------------| -| SystemClock | 5662/ 282 | 5214/ 272 | -| SystemClock+Basic TimeZone | 10248/ 456 | 9800/ 446 | -| SystemClock+Extended TimeZone | 13288/ 490 | 12840/ 480 | -+--------------------------------------------------------------+ ++----------------------------------------------------------------+ +| Functionality | flash/ ram | delta | +|-----------------------------------+--------------+-------------| +| Baseline | 448/ 10 | 0/ 0 | +|-----------------------------------+--------------+-------------| +| LocalDateTime | 1648/ 123 | 1200/ 113 | +| ZonedDateTime | 2440/ 123 | 1992/ 113 | +| Manual ZoneManager | 2684/ 123 | 2236/ 113 | +| Basic TimeZone (1 zone) | 7168/ 309 | 6720/ 299 | +| Basic TimeZone (2 zones) | 7736/ 313 | 7288/ 303 | +| BasicZoneManager (1 zone) | 8816/ 335 | 8368/ 325 | +| BasicZoneManager (all zones) | 21800/ 711 | 21352/ 701 | +| BasicZoneManager (zones+links) | 25892/ 711 | 25444/ 701 | +| Extended TimeZone (1 zone) | 9982/ 343 | 9534/ 333 | +| Extended TimeZone (2 zones) | 10450/ 347 | 10002/ 337 | +| ExtendedZoneManager (1 zone) | 11790/ 369 | 11342/ 359 | +| ExtendedZoneManager (all zones) | 33844/ 853 | 33396/ 843 | +| ExtendedZoneManager (zones+links) | 38488/ 853 | 38040/ 843 | +|-----------------------------------+--------------+-------------| +| SystemClock | 5662/ 282 | 5214/ 272 | +| SystemClock+Basic TimeZone | 10248/ 456 | 9800/ 446 | +| SystemClock+Extended TimeZone | 13288/ 490 | 12840/ 480 | ++----------------------------------------------------------------+ ``` @@ -93,27 +95,29 @@ consumption by 1200-2400 bytes when all the zones are loaded into the * SparkFun AVR Boards 1.1.13 ``` -+--------------------------------------------------------------+ -| Functionality | flash/ ram | delta | -|---------------------------------+--------------+-------------| -| Baseline | 3464/ 150 | 0/ 0 | -|---------------------------------+--------------+-------------| -| LocalDateTime | 4772/ 263 | 1308/ 113 | -| ZonedDateTime | 5564/ 263 | 2100/ 113 | -| Manual ZoneManager | 5808/ 263 | 2344/ 113 | -| Basic TimeZone (1 zone) | 10268/ 447 | 6804/ 297 | -| Basic TimeZone (2 zones) | 10838/ 453 | 7374/ 303 | -| Basic ZoneManager (1 zone) | 11916/ 473 | 8452/ 323 | -| Basic ZoneManager (all) | 24902/ 851 | 21438/ 701 | -| Extended TimeZone (1 zone) | 13082/ 481 | 9618/ 331 | -| Extended TimeZone (2 zones) | 13552/ 487 | 10088/ 337 | -| Extended ZoneManager (1 zone) | 14890/ 507 | 11426/ 357 | -| Extended ZoneManager (all) | 36944/ 991 | 33480/ 841 | -|---------------------------------+--------------+-------------| -| SystemClock | 8646/ 422 | 5182/ 272 | -| SystemClock+Basic TimeZone | 13230/ 594 | 9766/ 444 | -| SystemClock+Extended TimeZone | 16270/ 628 | 12806/ 478 | -+--------------------------------------------------------------+ ++----------------------------------------------------------------+ +| Functionality | flash/ ram | delta | +|-----------------------------------+--------------+-------------| +| Baseline | 3464/ 150 | 0/ 0 | +|-----------------------------------+--------------+-------------| +| LocalDateTime | 4772/ 263 | 1308/ 113 | +| ZonedDateTime | 5564/ 263 | 2100/ 113 | +| Manual ZoneManager | 5808/ 263 | 2344/ 113 | +| Basic TimeZone (1 zone) | 10268/ 447 | 6804/ 297 | +| Basic TimeZone (2 zones) | 10838/ 453 | 7374/ 303 | +| BasicZoneManager (1 zone) | 11916/ 473 | 8452/ 323 | +| BasicZoneManager (all zones) | 24902/ 851 | 21438/ 701 | +| BasicZoneManager (zones+links) | 28994/ 851 | 25530/ 701 | +| Extended TimeZone (1 zone) | 13082/ 481 | 9618/ 331 | +| Extended TimeZone (2 zones) | 13552/ 487 | 10088/ 337 | +| ExtendedZoneManager (1 zone) | 14890/ 507 | 11426/ 357 | +| ExtendedZoneManager (all zones) | 36944/ 991 | 33480/ 841 | +| ExtendedZoneManager (zones+links) | 41588/ 991 | 38124/ 841 | +|-----------------------------------+--------------+-------------| +| SystemClock | 8646/ 422 | 5182/ 272 | +| SystemClock+Basic TimeZone | 13230/ 594 | 9766/ 444 | +| SystemClock+Extended TimeZone | 16270/ 628 | 12806/ 478 | ++----------------------------------------------------------------+ ``` @@ -123,27 +127,29 @@ consumption by 1200-2400 bytes when all the zones are loaded into the * Sparkfun SAMD Boards 1.8.1 ``` -+--------------------------------------------------------------+ -| Functionality | flash/ ram | delta | -|---------------------------------+--------------+-------------| -| Baseline | 10064/ 0 | 0/ 0 | -|---------------------------------+--------------+-------------| -| LocalDateTime | 10920/ 0 | 856/ 0 | -| ZonedDateTime | 11160/ 0 | 1096/ 0 | -| Manual ZoneManager | 11184/ 0 | 1120/ 0 | -| Basic TimeZone (1 zone) | 15300/ 0 | 5236/ 0 | -| Basic TimeZone (2 zones) | 15684/ 0 | 5620/ 0 | -| Basic ZoneManager (1 zone) | 16332/ 0 | 6268/ 0 | -| Basic ZoneManager (all) | 33844/ 0 | 23780/ 0 | -| Extended TimeZone (1 zone) | 17108/ 0 | 7044/ 0 | -| Extended TimeZone (2 zones) | 17532/ 0 | 7468/ 0 | -| Extended ZoneManager (1 zone) | 18140/ 0 | 8076/ 0 | -| Extended ZoneManager (all) | 48164/ 0 | 38100/ 0 | -|---------------------------------+--------------+-------------| -| SystemClock | 13264/ 0 | 3200/ 0 | -| SystemClock+Basic TimeZone | 16940/ 0 | 6876/ 0 | -| SystemClock+Extended TimeZone | 18932/ 0 | 8868/ 0 | -+--------------------------------------------------------------+ ++----------------------------------------------------------------+ +| Functionality | flash/ ram | delta | +|-----------------------------------+--------------+-------------| +| Baseline | 10064/ 0 | 0/ 0 | +|-----------------------------------+--------------+-------------| +| LocalDateTime | 10920/ 0 | 856/ 0 | +| ZonedDateTime | 11160/ 0 | 1096/ 0 | +| Manual ZoneManager | 11184/ 0 | 1120/ 0 | +| Basic TimeZone (1 zone) | 15308/ 0 | 5244/ 0 | +| Basic TimeZone (2 zones) | 15692/ 0 | 5628/ 0 | +| BasicZoneManager (1 zone) | 16340/ 0 | 6276/ 0 | +| BasicZoneManager (all zones) | 33844/ 0 | 23780/ 0 | +| BasicZoneManager (zones+links) | 40084/ 0 | 30020/ 0 | +| Extended TimeZone (1 zone) | 17108/ 0 | 7044/ 0 | +| Extended TimeZone (2 zones) | 17532/ 0 | 7468/ 0 | +| ExtendedZoneManager (1 zone) | 18140/ 0 | 8076/ 0 | +| ExtendedZoneManager (all zones) | 48164/ 0 | 38100/ 0 | +| ExtendedZoneManager (zones+links) | 55252/ 0 | 45188/ 0 | +|-----------------------------------+--------------+-------------| +| SystemClock | 13264/ 0 | 3200/ 0 | +| SystemClock+Basic TimeZone | 16948/ 0 | 6884/ 0 | +| SystemClock+Extended TimeZone | 18932/ 0 | 8868/ 0 | ++----------------------------------------------------------------+ ``` @@ -155,27 +161,29 @@ consumption by 1200-2400 bytes when all the zones are loaded into the * ESP8266 Boards 2.7.4 ``` -+--------------------------------------------------------------+ -| Functionality | flash/ ram | delta | -|---------------------------------+--------------+-------------| -| Baseline | 256700/26776 | 0/ 0 | -|---------------------------------+--------------+-------------| -| LocalDateTime | 258820/27264 | 2120/ 488 | -| ZonedDateTime | 259492/27264 | 2792/ 488 | -| Manual ZoneManager | 259540/27264 | 2840/ 488 | -| Basic TimeZone (1 zone) | 265228/27824 | 8528/ 1048 | -| Basic TimeZone (2 zones) | 265452/27824 | 8752/ 1048 | -| Basic ZoneManager (1 zone) | 266348/27824 | 9648/ 1048 | -| Basic ZoneManager (all) | 283980/27824 | 27280/ 1048 | -| Extended TimeZone (1 zone) | 267292/27968 | 10592/ 1192 | -| Extended TimeZone (2 zones) | 267580/27968 | 10880/ 1192 | -| Extended ZoneManager (1 zone) | 268412/27968 | 11712/ 1192 | -| Extended ZoneManager (all) | 298608/27980 | 41908/ 1204 | -|---------------------------------+--------------+-------------| -| SystemClock | 262268/27276 | 5568/ 500 | -| SystemClock+Basic TimeZone | 267624/27824 | 10924/ 1048 | -| SystemClock+Extended TimeZone | 269944/27968 | 13244/ 1192 | -+--------------------------------------------------------------+ ++----------------------------------------------------------------+ +| Functionality | flash/ ram | delta | +|-----------------------------------+--------------+-------------| +| Baseline | 256700/26776 | 0/ 0 | +|-----------------------------------+--------------+-------------| +| LocalDateTime | 258820/27264 | 2120/ 488 | +| ZonedDateTime | 259492/27264 | 2792/ 488 | +| Manual ZoneManager | 259540/27264 | 2840/ 488 | +| Basic TimeZone (1 zone) | 265228/27824 | 8528/ 1048 | +| Basic TimeZone (2 zones) | 265452/27824 | 8752/ 1048 | +| BasicZoneManager (1 zone) | 266348/27824 | 9648/ 1048 | +| BasicZoneManager (all zones) | 283980/27824 | 27280/ 1048 | +| BasicZoneManager (zones+links) | 290076/27824 | 33376/ 1048 | +| Extended TimeZone (1 zone) | 267292/27968 | 10592/ 1192 | +| Extended TimeZone (2 zones) | 267580/27968 | 10880/ 1192 | +| ExtendedZoneManager (1 zone) | 268412/27968 | 11712/ 1192 | +| ExtendedZoneManager (all zones) | 298608/27980 | 41908/ 1204 | +| ExtendedZoneManager (zones+links) | 305536/27980 | 48836/ 1204 | +|-----------------------------------+--------------+-------------| +| SystemClock | 262268/27276 | 5568/ 500 | +| SystemClock+Basic TimeZone | 267624/27824 | 10924/ 1048 | +| SystemClock+Extended TimeZone | 269944/27968 | 13244/ 1192 | ++----------------------------------------------------------------+ ``` @@ -185,27 +193,29 @@ consumption by 1200-2400 bytes when all the zones are loaded into the * ESP32 Boards 1.0.4 ``` -+--------------------------------------------------------------+ -| Functionality | flash/ ram | delta | -|---------------------------------+--------------+-------------| -| Baseline | 206435/14564 | 0/ 0 | -|---------------------------------+--------------+-------------| -| LocalDateTime | 218425/16116 | 11990/ 1552 | -| ZonedDateTime | 219229/16116 | 12794/ 1552 | -| Manual ZoneManager | 219261/16116 | 12826/ 1552 | -| Basic TimeZone (1 zone) | 223225/16116 | 16790/ 1552 | -| Basic TimeZone (2 zones) | 223469/16116 | 17034/ 1552 | -| Basic ZoneManager (1 zone) | 224085/16116 | 17650/ 1552 | -| Basic ZoneManager (all) | 241797/16116 | 35362/ 1552 | -| Extended TimeZone (1 zone) | 225153/16116 | 18718/ 1552 | -| Extended TimeZone (2 zones) | 225421/16116 | 18986/ 1552 | -| Extended ZoneManager (1 zone) | 226109/16116 | 19674/ 1552 | -| Extended ZoneManager (all) | 256393/16116 | 49958/ 1552 | -|---------------------------------+--------------+-------------| -| SystemClock | 226013/16220 | 19578/ 1656 | -| SystemClock+Basic TimeZone | 229909/16220 | 23474/ 1656 | -| SystemClock+Extended TimeZone | 231901/16220 | 25466/ 1656 | -+--------------------------------------------------------------+ ++----------------------------------------------------------------+ +| Functionality | flash/ ram | delta | +|-----------------------------------+--------------+-------------| +| Baseline | 206435/14564 | 0/ 0 | +|-----------------------------------+--------------+-------------| +| LocalDateTime | 218425/16116 | 11990/ 1552 | +| ZonedDateTime | 219229/16116 | 12794/ 1552 | +| Manual ZoneManager | 219261/16116 | 12826/ 1552 | +| Basic TimeZone (1 zone) | 223225/16116 | 16790/ 1552 | +| Basic TimeZone (2 zones) | 223469/16116 | 17034/ 1552 | +| BasicZoneManager (1 zone) | 224085/16116 | 17650/ 1552 | +| BasicZoneManager (all zones) | 241797/16116 | 35362/ 1552 | +| BasicZoneManager (zones+links) | 248141/16116 | 41706/ 1552 | +| Extended TimeZone (1 zone) | 225153/16116 | 18718/ 1552 | +| Extended TimeZone (2 zones) | 225421/16116 | 18986/ 1552 | +| ExtendedZoneManager (1 zone) | 226109/16116 | 19674/ 1552 | +| ExtendedZoneManager (all zones) | 256393/16116 | 49958/ 1552 | +| ExtendedZoneManager (zones+links) | 263601/16116 | 57166/ 1552 | +|-----------------------------------+--------------+-------------| +| SystemClock | 226013/16220 | 19578/ 1656 | +| SystemClock+Basic TimeZone | 229909/16220 | 23474/ 1656 | +| SystemClock+Extended TimeZone | 231901/16220 | 25466/ 1656 | ++----------------------------------------------------------------+ ``` @@ -219,27 +229,29 @@ usage by objects. * Teensyduino 1.53 ``` -+--------------------------------------------------------------+ -| Functionality | flash/ ram | delta | -|---------------------------------+--------------+-------------| -| Baseline | 7624/ 3048 | 0/ 0 | -|---------------------------------+--------------+-------------| -| LocalDateTime | 13268/ 4812 | 5644/ 1764 | -| ZonedDateTime | 13268/ 4812 | 5644/ 1764 | -| Manual ZoneManager | 13268/ 4812 | 5644/ 1764 | -| Basic TimeZone (1 zone) | 22264/ 4812 | 14640/ 1764 | -| Basic TimeZone (2 zones) | 22992/ 4812 | 15368/ 1764 | -| Basic ZoneManager (1 zone) | 23536/ 4812 | 15912/ 1764 | -| Basic ZoneManager (all) | 41280/ 4812 | 33656/ 1764 | -| Extended TimeZone (1 zone) | 24564/ 4812 | 16940/ 1764 | -| Extended TimeZone (2 zones) | 25228/ 4812 | 17604/ 1764 | -| Extended ZoneManager (1 zone) | 25836/ 4812 | 18212/ 1764 | -| Extended ZoneManager (all) | 56116/ 4812 | 48492/ 1764 | -|---------------------------------+--------------+-------------| -| SystemClock | 16192/ 4812 | 8568/ 1764 | -| SystemClock+Basic TimeZone | 25372/ 4812 | 17748/ 1764 | -| SystemClock+Extended TimeZone | 27672/ 4812 | 20048/ 1764 | -+--------------------------------------------------------------+ ++----------------------------------------------------------------+ +| Functionality | flash/ ram | delta | +|-----------------------------------+--------------+-------------| +| Baseline | 7624/ 3048 | 0/ 0 | +|-----------------------------------+--------------+-------------| +| LocalDateTime | 13268/ 4812 | 5644/ 1764 | +| ZonedDateTime | 13268/ 4812 | 5644/ 1764 | +| Manual ZoneManager | 13268/ 4812 | 5644/ 1764 | +| Basic TimeZone (1 zone) | 22264/ 4812 | 14640/ 1764 | +| Basic TimeZone (2 zones) | 22992/ 4812 | 15368/ 1764 | +| BasicZoneManager (1 zone) | 23536/ 4812 | 15912/ 1764 | +| BasicZoneManager (all zones) | 41280/ 4812 | 33656/ 1764 | +| BasicZoneManager (zones+links) | 47624/ 4812 | 40000/ 1764 | +| Extended TimeZone (1 zone) | 24564/ 4812 | 16940/ 1764 | +| Extended TimeZone (2 zones) | 25228/ 4812 | 17604/ 1764 | +| ExtendedZoneManager (1 zone) | 25836/ 4812 | 18212/ 1764 | +| ExtendedZoneManager (all zones) | 56116/ 4812 | 48492/ 1764 | +| ExtendedZoneManager (zones+links) | 63324/ 4812 | 55700/ 1764 | +|-----------------------------------+--------------+-------------| +| SystemClock | 16192/ 4812 | 8568/ 1764 | +| SystemClock+Basic TimeZone | 25372/ 4812 | 17748/ 1764 | +| SystemClock+Extended TimeZone | 27672/ 4812 | 20048/ 1764 | ++----------------------------------------------------------------+ ``` diff --git a/examples/MemoryBenchmark/collect.sh b/examples/MemoryBenchmark/collect.sh index 68ca40bde..212968ef0 100755 --- a/examples/MemoryBenchmark/collect.sh +++ b/examples/MemoryBenchmark/collect.sh @@ -49,7 +49,7 @@ function collect_for_board() { local board=$2 local result_file=$3 - for feature in {0..14}; do + for feature in {0..16}; do echo "Collecting flash and ram usage for FEATURE $feature" sed -i -e "s/#define FEATURE [0-9]*/#define FEATURE $feature/" \ $PROGRAM_NAME diff --git a/examples/MemoryBenchmark/esp32.txt b/examples/MemoryBenchmark/esp32.txt index 03aa2e548..8e13c53b1 100644 --- a/examples/MemoryBenchmark/esp32.txt +++ b/examples/MemoryBenchmark/esp32.txt @@ -6,10 +6,12 @@ 5 223469 1310720 16116 327680 6 224085 1310720 16116 327680 7 241797 1310720 16116 327680 -8 225153 1310720 16116 327680 -9 225421 1310720 16116 327680 -10 226109 1310720 16116 327680 -11 256393 1310720 16116 327680 -12 226013 1310720 16220 327680 -13 229909 1310720 16220 327680 -14 231901 1310720 16220 327680 +8 248141 1310720 16116 327680 +9 225153 1310720 16116 327680 +10 225421 1310720 16116 327680 +11 226109 1310720 16116 327680 +12 256393 1310720 16116 327680 +13 263601 1310720 16116 327680 +14 226013 1310720 16220 327680 +15 229909 1310720 16220 327680 +16 231901 1310720 16220 327680 diff --git a/examples/MemoryBenchmark/esp8266.txt b/examples/MemoryBenchmark/esp8266.txt index e99402294..f5aadb5b7 100644 --- a/examples/MemoryBenchmark/esp8266.txt +++ b/examples/MemoryBenchmark/esp8266.txt @@ -6,10 +6,12 @@ 5 265452 1044464 27824 81920 6 266348 1044464 27824 81920 7 283980 1044464 27824 81920 -8 267292 1044464 27968 81920 -9 267580 1044464 27968 81920 -10 268412 1044464 27968 81920 -11 298608 1044464 27980 81920 -12 262268 1044464 27276 81920 -13 267624 1044464 27824 81920 -14 269944 1044464 27968 81920 +8 290076 1044464 27824 81920 +9 267292 1044464 27968 81920 +10 267580 1044464 27968 81920 +11 268412 1044464 27968 81920 +12 298608 1044464 27980 81920 +13 305536 1044464 27980 81920 +14 262268 1044464 27276 81920 +15 267624 1044464 27824 81920 +16 269944 1044464 27968 81920 diff --git a/examples/MemoryBenchmark/generate_table.awk b/examples/MemoryBenchmark/generate_table.awk index 5db723c24..dae7bf43a 100755 --- a/examples/MemoryBenchmark/generate_table.awk +++ b/examples/MemoryBenchmark/generate_table.awk @@ -6,22 +6,24 @@ # table that can be inserted into the README.md. BEGIN { - NUM_FEATURES = 14 + NUM_FEATURES = 16 labels[0] = "Baseline" labels[1] = "LocalDateTime" labels[2] = "ZonedDateTime" labels[3] = "Manual ZoneManager" labels[4] = "Basic TimeZone (1 zone)" labels[5] = "Basic TimeZone (2 zones)" - labels[6] = "Basic ZoneManager (1 zone)" - labels[7] = "Basic ZoneManager (all)" - labels[8] = "Extended TimeZone (1 zone)" - labels[9] = "Extended TimeZone (2 zones)" - labels[10] = "Extended ZoneManager (1 zone)" - labels[11] = "Extended ZoneManager (all)" - labels[12] = "SystemClock" - labels[13] = "SystemClock+Basic TimeZone" - labels[14] = "SystemClock+Extended TimeZone" + labels[6] = "BasicZoneManager (1 zone)" + labels[7] = "BasicZoneManager (all zones)" + labels[8] = "BasicZoneManager (zones+links)" + labels[9] = "Extended TimeZone (1 zone)" + labels[10] = "Extended TimeZone (2 zones)" + labels[11] = "ExtendedZoneManager (1 zone)" + labels[12] = "ExtendedZoneManager (all zones)" + labels[13] = "ExtendedZoneManager (zones+links)" + labels[14] = "SystemClock" + labels[15] = "SystemClock+Basic TimeZone" + labels[16] = "SystemClock+Extended TimeZone" record_index = 0 } { @@ -37,20 +39,20 @@ END { u[i]["d_ram"] = u[i]["ram"]- base_ram } - printf("+--------------------------------------------------------------+\n") - printf("| Functionality | flash/ ram | delta |\n") - printf("|---------------------------------+--------------+-------------|\n") - printf("| %-31s | %6d/%5d | %5d/%5d |\n", + printf("+----------------------------------------------------------------+\n") + printf("| Functionality | flash/ ram | delta |\n") + printf("|-----------------------------------+--------------+-------------|\n") + printf("| %-33s | %6d/%5d | %5d/%5d |\n", labels[0], u[0]["flash"], u[0]["ram"], u[0]["d_flash"], u[0]["d_ram"]) - printf("|---------------------------------+--------------+-------------|\n") - for (i = 1; i <= 11; i++) { - printf("| %-31s | %6d/%5d | %5d/%5d |\n", + printf("|-----------------------------------+--------------+-------------|\n") + for (i = 1; i <= 13; i++) { + printf("| %-33s | %6d/%5d | %5d/%5d |\n", labels[i], u[i]["flash"], u[i]["ram"], u[i]["d_flash"], u[i]["d_ram"]) } - printf("|---------------------------------+--------------+-------------|\n") - for (i = 12; i <= NUM_FEATURES; i++) { - printf("| %-31s | %6d/%5d | %5d/%5d |\n", + printf("|-----------------------------------+--------------+-------------|\n") + for (i = 14; i <= NUM_FEATURES; i++) { + printf("| %-33s | %6d/%5d | %5d/%5d |\n", labels[i], u[i]["flash"], u[i]["ram"], u[i]["d_flash"], u[i]["d_ram"]) } - printf("+--------------------------------------------------------------+\n") + printf("+----------------------------------------------------------------+\n") } diff --git a/examples/MemoryBenchmark/micro.txt b/examples/MemoryBenchmark/micro.txt index 62e43f79b..7df787a42 100644 --- a/examples/MemoryBenchmark/micro.txt +++ b/examples/MemoryBenchmark/micro.txt @@ -6,10 +6,12 @@ 5 10838 28672 453 2560 6 11916 28672 473 2560 7 24902 28672 851 2560 -8 13082 28672 481 2560 -9 13552 28672 487 2560 -10 14890 28672 507 2560 -11 36944 28672 991 2560 -12 8646 28672 422 2560 -13 13230 28672 594 2560 -14 16270 28672 628 2560 +8 28994 28672 851 2560 +9 13082 28672 481 2560 +10 13552 28672 487 2560 +11 14890 28672 507 2560 +12 36944 28672 991 2560 +13 41588 28672 991 2560 +14 8646 28672 422 2560 +15 13230 28672 594 2560 +16 16270 28672 628 2560 diff --git a/examples/MemoryBenchmark/nano.txt b/examples/MemoryBenchmark/nano.txt index 4e024584b..e69f4474b 100644 --- a/examples/MemoryBenchmark/nano.txt +++ b/examples/MemoryBenchmark/nano.txt @@ -6,10 +6,12 @@ 5 7736 30720 313 2048 6 8816 30720 335 2048 7 21800 30720 711 2048 -8 9982 30720 343 2048 -9 10450 30720 347 2048 -10 11790 30720 369 2048 -11 33844 30720 853 2048 -12 5662 30720 282 2048 -13 10248 30720 456 2048 -14 13288 30720 490 2048 +8 25892 30720 711 2048 +9 9982 30720 343 2048 +10 10450 30720 347 2048 +11 11790 30720 369 2048 +12 33844 30720 853 2048 +13 38488 30720 853 2048 +14 5662 30720 282 2048 +15 10248 30720 456 2048 +16 13288 30720 490 2048 diff --git a/examples/MemoryBenchmark/samd.txt b/examples/MemoryBenchmark/samd.txt index b49a36d0d..1b91db41e 100644 --- a/examples/MemoryBenchmark/samd.txt +++ b/examples/MemoryBenchmark/samd.txt @@ -2,14 +2,16 @@ 1 10920 262144 2 11160 262144 3 11184 262144 -4 15300 262144 -5 15684 262144 -6 16332 262144 +4 15308 262144 +5 15692 262144 +6 16340 262144 7 33844 262144 -8 17108 262144 -9 17532 262144 -10 18140 262144 -11 48164 262144 -12 13264 262144 -13 16940 262144 -14 18932 262144 +8 40084 262144 +9 17108 262144 +10 17532 262144 +11 18140 262144 +12 48164 262144 +13 55252 262144 +14 13264 262144 +15 16948 262144 +16 18932 262144 diff --git a/examples/MemoryBenchmark/teensy32.txt b/examples/MemoryBenchmark/teensy32.txt index be203c8f0..b8de7b930 100644 --- a/examples/MemoryBenchmark/teensy32.txt +++ b/examples/MemoryBenchmark/teensy32.txt @@ -6,10 +6,12 @@ 5 22992 262144 4812 65536 6 23536 262144 4812 65536 7 41280 262144 4812 65536 -8 24564 262144 4812 65536 -9 25228 262144 4812 65536 -10 25836 262144 4812 65536 -11 56116 262144 4812 65536 -12 16192 262144 4812 65536 -13 25372 262144 4812 65536 -14 27672 262144 4812 65536 +8 47624 262144 4812 65536 +9 24564 262144 4812 65536 +10 25228 262144 4812 65536 +11 25836 262144 4812 65536 +12 56116 262144 4812 65536 +13 63324 262144 4812 65536 +14 16192 262144 4812 65536 +15 25372 262144 4812 65536 +16 27672 262144 4812 65536 From 1ed0281f9eacc3652051561fb92ec5f6226e42d0 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 7 Jan 2021 15:00:08 -0800 Subject: [PATCH 47/74] CHANGELOG.md: Add info about 'fat links' becoming default; add info about kZoneAndLinkRegistry --- CHANGELOG.md | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 361dc0434..f32d3126d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,6 @@ # Changelog * Unreleased - * Experimental `--fat_links` flag when generating zonedb and zonedbx files. * Use binary search for both `ZoneManager::createForZoneName()` and `ZoneManager::createForZoneId()`. Previously, the `zone_registry.cpp` was sorted by zoneName, so only the `createForZoneName()` could use the binary @@ -15,16 +14,21 @@ that a binary search on the 386 zones in `zonedbx/zone_registry.cpp` is 9-10X faster (on average) than a linear search through the same list. (Linear search takes ~190 iterations; binary search takes ~9 iterations.) - * Remove `transitionBufSize` from `ZoneInfo` struct, and migrate to - `kZoneBufSize{xxx}` constants in the `zone_infos.h` files. This was used - only in validation tests under `tests/validation` and only for - `Extended{xxx}` tests. Saves 1 byte per Zone on 8-bit processors, but none - on 32-bit processors due to 4-byte alignment. This has no impact on client - code since this field was used only for validation testing. + * Upgrade Link entries to be "fat links". Links become essentially identical + to Zone entries, with references to the same underlying `ZoneEra` records. + Add `kZoneAndLinkRegistry[]` array in `zone_registry.h` that contains all + Links as well as Zones. * Implement zoneName compression using `ace_common::KString`. Saves about - 1500 bytes for basic `zonedb` info files, and 2500 bytes for extended - `zonedbx` info files. - * **Breaking Change**: Replace `BasicZone::name()` and `shortName() + 1500-2300 bytes for basic `zonedb` info files, and 2500-3400 bytes for + extended `zonedbx` info files. + * **Potentially Breaking Change**: Remove `transitionBufSize` from + `ZoneInfo` struct, and migrate to `kZoneBufSize{xxx}` constants in the + `zone_infos.h` files. This was used only in validation tests under + `tests/validation` and only for `Extended{xxx}` tests. Saves 1 byte per + Zone on 8-bit processors, but none on 32-bit processors due to 4-byte + alignment. This has no impact on client code since this field was used + only for validation testing. + * **API Breaking Change**: Replace `BasicZone::name()` and `shortName() with `printNameTo()` and `printShortNameTo()`. Same with `ExtendedZone::name()` and `shortName()`, replaced with `printNameTo()` and `printShortNameTo()`. After implementing zoneName compression, it was From 0eeccfc87f24ca2b80468798f09ea7390a243d0e Mon Sep 17 00:00:00 2001 From: Brian Park Date: Fri, 15 Jan 2021 14:25:44 -0800 Subject: [PATCH 48/74] tools/argenerator.py: Add comments about determination of SIZEOF_ZONE_{xx} for 32-bit processors --- tools/generator/argenerator.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index fa17c3082..df5be105d 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -234,9 +234,9 @@ class ZonePoliciesGenerator: """ SIZEOF_ZONE_RULE_8 = 9 - SIZEOF_ZONE_RULE_32 = 12 + SIZEOF_ZONE_RULE_32 = 12 # 9 rounded to 4-byte alignment SIZEOF_ZONE_POLICY_8 = 6 - SIZEOF_ZONE_POLICY_32 = 12 + SIZEOF_ZONE_POLICY_32 = 12 # 10 rounded to 4-byte alignment def __init__( self, @@ -314,7 +314,7 @@ def generate_policies_h(self) -> str: def generate_policies_cpp(self) -> str: policy_items = '' memory8 = 0 - memory32 = 32 + memory32 = 0 num_rules = 0 for name, rules in sorted(self.policies_map.items()): indexed_letters: Optional[IndexMap] = \ @@ -668,9 +668,9 @@ class ZoneInfosGenerator: """ # noqa SIZEOF_ZONE_ERA_8 = 11 - SIZEOF_ZONE_ERA_32 = 16 # 15 + 1 for 4-byte alignment + SIZEOF_ZONE_ERA_32 = 16 # 15 rounded to 4-byte alignment SIZEOF_ZONE_INFO_8 = 11 - SIZEOF_ZONE_INFO_32 = 20 # 18 + 2 for 4-byte alignment + SIZEOF_ZONE_INFO_32 = 20 # 18 rounded to 4-byte alignment def __init__( self, From e9ea658a643097dee41b24655033a1571ca64e33 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Fri, 15 Jan 2021 14:28:18 -0800 Subject: [PATCH 49/74] DEVELOPER.md: Add documentation for offset and time encoding --- DEVELOPER.md | 127 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 118 insertions(+), 9 deletions(-) diff --git a/DEVELOPER.md b/DEVELOPER.md index 8aec0508f..1d95c87ab 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -45,7 +45,7 @@ The `kTzDatabaseVersion` string constant identifies the version of the TZ Database that was used to generate these files, e.g. "2019a". The `kZoneContext` variable points to an instance of `common::ZoneContext` -which identifies the `startYear` and `endYear` of the current database. These +which identifies the `startYear` and `untilYear` of the current database. These will normally be 2000 and 2050 respectively, but a custom version of the zonedb files could be generated whose startYear and endYear could be smaller (to produce smaller ZoneDB files). @@ -58,17 +58,40 @@ known inaccuracies for a particular zone. ### `zone_infos.cpp` +The top of this file contains a summary of the sizes of various parts of +the data structures in this file, and the 2 registries supplied by +`zone_registry.cpp`: + +``` +// Zones: 386 +// Links: 207 +// kZoneRegistry sizes (bytes): +// Names: 3667 (originally 6100) +// Formats: 597 +// Fragments: 122 +// Memory (8-bit): 16848 +// Memory (32-bit): 24464 +// kZoneAndLinkRegistry sizes (bytes): +// Names: 5620 (originally 9027) +// Formats: 597 +// Fragments: 122 +// Memory (8-bit): 21492 +// Memory (32-bit): 31385 +``` + Each zone entry in the `zone_info.cpp` contains a comment section that describes some metadata about the given entry. For example, the entry for -`zonedb::kZoneEraAmerica_Los_Angeles` contains the following, showing how +`zonedb::kZoneAmerica_Los_Angeles` contains the following, showing how much memory it will consume on the 8-bit Arduino controllers and the 32-bit Arduino controllers: -* `// Zone name: America/Los_Angeles` -* `// Era count: 1` -* `// Strings: 24` -* `// Memory (8-bit): 43` -* `// Memory (32-bit): 53` +``` +// Zone name: America/Los_Angeles +// Zone Eras: 1 +// Strings (bytes): 17 (originally 24) +// Memory (8-bit): 39 +// Memory (32-bit): 53 +``` ### `zone_policies.h` @@ -80,14 +103,100 @@ Each policy entry starts with a comment secion that contains some metadata about the policy. For example: ``` // Policy name: US -// Rule count: 5 +// Rules: 5 // Memory (8-bit): 51 -// Memory (32-bit): 55 +// Memory (32-bit): 72 ``` Just like `zone_infos.cpp`, the Memory section describes the amount of static RAM consumed by the particular `ZonePolicy` data structure (and associated `ZoneRule`. +## Encoding Offset and Time Fields + +There are 5 offsets and moment-in-time quantities from the TZ zoneinfo files +which are captured in the `zone_info.{h,cpp}` and `zone_policies.{h,cpp}` files: + +* `STDOFF` field in `Zone` entry (previously `OFFSET`), 1-minute resolution +* `RULES` field in `Zone` entry when numeric (e.g. "1:00"), 15-minute resolution +* `UNTIL` field in `Zone` entry, 1-minute resolution +* `SAVE` field in `Rule` entry, 15-minute resolution +* `AT` field in `Rule` entry, 1-minute resolution + +To reduce flash memory size, these fields are encoded in non-obvious ways which +are difficult to remember. Here is my attempt to document the encoding. In the +following diagram, a field labled `code` (e.g. `offsetCode`) has a unit of 15 +minutes. For example, an `offsetCode` of 2 means 30 minutes. To capture time +offsets or moments with a 1-minute resolution, we store the remaining 15-minutes +(0 to 14 inclusive), using 4-bits in the upper 4-bits or the lower 4-bits of one +of the other fields. For the "extended" zoneinfo files (i.e. `zonedbx`), the +`code` value is shifted by +4 (in other words, 1 hour), so that a 4-bit field is +able to represent offsets from -1:00 to +2:45. This allows us to capture zones +which have a negative -1:00 hour offset, and zones which undergo a "double DST" +shift of +2:00 hours. + +``` +TZ DB Fields ZoneEra +============ ======= + +STDOFF (1-min resolution) +-> offset_seconds +--------------------+ + -> offset_code ---------------------> | offsetCode | + offset_minute | (8 bits) | + \ +--------------------+ + \ + \ +--------------------+ + \ | deltaCode | + \ +--------------------+ + ---------------> | minute | code | + | (4-bits)| (4-bits) | + +--------------------+ + ^ +RULES (numeric, 15-min resolution) / +-> rules_delta_seconds / + -> rules_delta_code -- (basic) ----------------/ + -- (extended) + 4 --------- + + +UNTIL (1-min resolution) +-> until_time_seconds +--------------------+ + until_time_suffix (w, s, u) | untilTimeCode | + -> until_time_code --------------> | (8-bits) | + until_time_minute -------. +--------------------+ + until_time_suffix --. \ + \ --------------------------------. + \ \ + \ +--------------------+ | + \ | untilTimeModifier | | + \ +--------------------+ / + -----> | suffix | minute | <-' + | (4-bits)| (4-bits) | + +--------------------+ + + + ZoneRule + ======== +AT (1-min resolution) +-> at_time_seconds +--------------------+ + at_time_suffix (w, s, u) | atTimeCode | + -> at_time_code -----------------> | (8-bits) | + at_time_minute -----------. +--------------------+ + at_time_suffix -----. \ + \ -------------------------------. + \ \ + \ +--------------------+ | + \ | atTimeModifier | | + \ +--------------------+ / + -----> | suffix | minute | <-' + | (4-bits)| (4-bits) | + +--------------------+ + +SAVE (15-min resolution) +-> delta_seconds +--------------------+ + -> delta_code -- (basic) ---------> | deltaCode | + -- (extended) + 4 --> | (8 bits) | + +--------------------+ +``` + ## Upgrading ZoneInfo Files to a New TZDB Version About 2-4 times a year, a new TZDB version is released. Here are some notes From 6489d763c34143c81e3d716406dc106bd6389ec7 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Fri, 15 Jan 2021 15:19:41 -0800 Subject: [PATCH 50/74] tools/argenerator.py: Update 'deltaCode' comment to explain its calculation better --- tools/generator/argenerator.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/generator/argenerator.py b/tools/generator/argenerator.py index df5be105d..4e3ebf54c 100644 --- a/tools/generator/argenerator.py +++ b/tools/generator/argenerator.py @@ -1263,14 +1263,14 @@ def _get_era_delta_code_comment( calculated. """ offset_minute = offset_seconds % 900 // 60 - delta_minute = delta_seconds // 60 + delta_minutes = delta_seconds // 60 if scope == 'extended': return ( - f"(offsetMinute={offset_minute} << 4) + " - f"(deltaMinute={delta_minute}/15 + 4)" + f"((offsetMinute={offset_minute}) << 4) + " + f"((deltaMinutes={delta_minutes})/15 + 4)" ) else: - return f"deltaMinute={delta_minute}/15" + return f"(deltaMinutes={delta_minutes})/15" def _get_rule_delta_code_comment( @@ -1280,11 +1280,11 @@ def _get_rule_delta_code_comment( """Create the comment that explains how the ZoneRule delta_code[_encoded] was calculated. """ - delta_minute = delta_seconds // 60 + delta_minutes = delta_seconds // 60 if scope == 'extended': - return f"deltaMinute={delta_minute}/15 + 4" + return f"(deltaMinutes={delta_minutes})/15 + 4" else: - return f"deltaMinute={delta_minute}/15" + return f"(deltaMinutes={delta_minutes})/15" def _compressed_name_to_c_string(compressed_name: str) -> str: From c81b3053062bac07a5710d49326d96ac8d805515 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Fri, 15 Jan 2021 15:23:00 -0800 Subject: [PATCH 51/74] src/zonedb,zonedbx: Regenerate with better 'deltaCode' comments; no data change --- src/ace_time/zonedb/zone_infos.cpp | 558 +++++----- src/ace_time/zonedb/zone_policies.cpp | 724 ++++++------- src/ace_time/zonedbx/zone_infos.cpp | 1348 ++++++++++++------------ src/ace_time/zonedbx/zone_policies.cpp | 1104 +++++++++---------- 4 files changed, 1867 insertions(+), 1867 deletions(-) diff --git a/src/ace_time/zonedb/zone_infos.cpp b/src/ace_time/zonedb/zone_infos.cpp index b7366ba13..91b6ab749 100644 --- a/src/ace_time/zonedb/zone_infos.cpp +++ b/src/ace_time/zonedb/zone_infos.cpp @@ -96,7 +96,7 @@ static const basic::ZoneEra kZoneEraAfrica_Abidjan[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "GMT" /*format*/, 0 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -130,7 +130,7 @@ static const basic::ZoneEra kZoneEraAfrica_Algiers[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "CET" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -164,7 +164,7 @@ static const basic::ZoneEra kZoneEraAfrica_Bissau[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "GMT" /*format*/, 0 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -198,7 +198,7 @@ static const basic::ZoneEra kZoneEraAfrica_Ceuta[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -232,7 +232,7 @@ static const basic::ZoneEra kZoneEraAfrica_Johannesburg[] ACE_TIME_PROGMEM = { &kPolicySA /*zonePolicy*/, "SAST" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -266,7 +266,7 @@ static const basic::ZoneEra kZoneEraAfrica_Lagos[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "WAT" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -300,7 +300,7 @@ static const basic::ZoneEra kZoneEraAfrica_Maputo[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "CAT" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -334,7 +334,7 @@ static const basic::ZoneEra kZoneEraAfrica_Monrovia[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "GMT" /*format*/, 0 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -368,7 +368,7 @@ static const basic::ZoneEra kZoneEraAfrica_Nairobi[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EAT" /*format*/, 12 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -402,7 +402,7 @@ static const basic::ZoneEra kZoneEraAfrica_Ndjamena[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "WAT" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -436,7 +436,7 @@ static const basic::ZoneEra kZoneEraAfrica_Tunis[] ACE_TIME_PROGMEM = { &kPolicyTunisia /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -470,7 +470,7 @@ static const basic::ZoneEra kZoneEraAmerica_Adak[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "H%T" /*format*/, -40 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -504,7 +504,7 @@ static const basic::ZoneEra kZoneEraAmerica_Anchorage[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "AK%T" /*format*/, -36 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -538,7 +538,7 @@ static const basic::ZoneEra kZoneEraAmerica_Asuncion[] ACE_TIME_PROGMEM = { &kPolicyPara /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -572,7 +572,7 @@ static const basic::ZoneEra kZoneEraAmerica_Atikokan[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -606,7 +606,7 @@ static const basic::ZoneEra kZoneEraAmerica_Barbados[] ACE_TIME_PROGMEM = { &kPolicyBarb /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -640,7 +640,7 @@ static const basic::ZoneEra kZoneEraAmerica_Belem[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -674,7 +674,7 @@ static const basic::ZoneEra kZoneEraAmerica_Blanc_Sablon[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "AST" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -708,7 +708,7 @@ static const basic::ZoneEra kZoneEraAmerica_Bogota[] ACE_TIME_PROGMEM = { &kPolicyCO /*zonePolicy*/, "-05/-04" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -742,7 +742,7 @@ static const basic::ZoneEra kZoneEraAmerica_Boise[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -776,7 +776,7 @@ static const basic::ZoneEra kZoneEraAmerica_Campo_Grande[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -810,7 +810,7 @@ static const basic::ZoneEra kZoneEraAmerica_Cayenne[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -844,7 +844,7 @@ static const basic::ZoneEra kZoneEraAmerica_Chicago[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -878,7 +878,7 @@ static const basic::ZoneEra kZoneEraAmerica_Chihuahua[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -912,7 +912,7 @@ static const basic::ZoneEra kZoneEraAmerica_Costa_Rica[] ACE_TIME_PROGMEM = { &kPolicyCR /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -946,7 +946,7 @@ static const basic::ZoneEra kZoneEraAmerica_Creston[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "MST" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -980,7 +980,7 @@ static const basic::ZoneEra kZoneEraAmerica_Curacao[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "AST" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1014,7 +1014,7 @@ static const basic::ZoneEra kZoneEraAmerica_Danmarkshavn[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "GMT" /*format*/, 0 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1048,7 +1048,7 @@ static const basic::ZoneEra kZoneEraAmerica_Dawson_Creek[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "MST" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1082,7 +1082,7 @@ static const basic::ZoneEra kZoneEraAmerica_Denver[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1116,7 +1116,7 @@ static const basic::ZoneEra kZoneEraAmerica_Detroit[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1150,7 +1150,7 @@ static const basic::ZoneEra kZoneEraAmerica_Edmonton[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1184,7 +1184,7 @@ static const basic::ZoneEra kZoneEraAmerica_El_Salvador[] ACE_TIME_PROGMEM = { &kPolicySalv /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1218,7 +1218,7 @@ static const basic::ZoneEra kZoneEraAmerica_Glace_Bay[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1252,7 +1252,7 @@ static const basic::ZoneEra kZoneEraAmerica_Guatemala[] ACE_TIME_PROGMEM = { &kPolicyGuat /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1286,7 +1286,7 @@ static const basic::ZoneEra kZoneEraAmerica_Guayaquil[] ACE_TIME_PROGMEM = { &kPolicyEcuador /*zonePolicy*/, "-05/-04" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1320,7 +1320,7 @@ static const basic::ZoneEra kZoneEraAmerica_Guyana[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1354,7 +1354,7 @@ static const basic::ZoneEra kZoneEraAmerica_Halifax[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1388,7 +1388,7 @@ static const basic::ZoneEra kZoneEraAmerica_Havana[] ACE_TIME_PROGMEM = { &kPolicyCuba /*zonePolicy*/, "C%T" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1422,7 +1422,7 @@ static const basic::ZoneEra kZoneEraAmerica_Hermosillo[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, -1 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1434,7 +1434,7 @@ static const basic::ZoneEra kZoneEraAmerica_Hermosillo[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "MST" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1468,7 +1468,7 @@ static const basic::ZoneEra kZoneEraAmerica_Indiana_Indianapolis[] ACE_TIME_PROG nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 6 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1480,7 +1480,7 @@ static const basic::ZoneEra kZoneEraAmerica_Indiana_Indianapolis[] ACE_TIME_PROG &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1514,7 +1514,7 @@ static const basic::ZoneEra kZoneEraAmerica_Indiana_Marengo[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 6 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1526,7 +1526,7 @@ static const basic::ZoneEra kZoneEraAmerica_Indiana_Marengo[] ACE_TIME_PROGMEM = &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1560,7 +1560,7 @@ static const basic::ZoneEra kZoneEraAmerica_Indiana_Vevay[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 6 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1572,7 +1572,7 @@ static const basic::ZoneEra kZoneEraAmerica_Indiana_Vevay[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1606,7 +1606,7 @@ static const basic::ZoneEra kZoneEraAmerica_Inuvik[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1640,7 +1640,7 @@ static const basic::ZoneEra kZoneEraAmerica_Jamaica[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1674,7 +1674,7 @@ static const basic::ZoneEra kZoneEraAmerica_Juneau[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "AK%T" /*format*/, -36 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1708,7 +1708,7 @@ static const basic::ZoneEra kZoneEraAmerica_Kentucky_Louisville[] ACE_TIME_PROGM &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1742,7 +1742,7 @@ static const basic::ZoneEra kZoneEraAmerica_La_Paz[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1776,7 +1776,7 @@ static const basic::ZoneEra kZoneEraAmerica_Lima[] ACE_TIME_PROGMEM = { &kPolicyPeru /*zonePolicy*/, "-05/-04" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1810,7 +1810,7 @@ static const basic::ZoneEra kZoneEraAmerica_Los_Angeles[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "P%T" /*format*/, -32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1844,7 +1844,7 @@ static const basic::ZoneEra kZoneEraAmerica_Managua[] ACE_TIME_PROGMEM = { &kPolicyNic /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1878,7 +1878,7 @@ static const basic::ZoneEra kZoneEraAmerica_Manaus[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1912,7 +1912,7 @@ static const basic::ZoneEra kZoneEraAmerica_Martinique[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "AST" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1946,7 +1946,7 @@ static const basic::ZoneEra kZoneEraAmerica_Matamoros[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 10 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1958,7 +1958,7 @@ static const basic::ZoneEra kZoneEraAmerica_Matamoros[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1992,7 +1992,7 @@ static const basic::ZoneEra kZoneEraAmerica_Mazatlan[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2026,7 +2026,7 @@ static const basic::ZoneEra kZoneEraAmerica_Menominee[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2060,7 +2060,7 @@ static const basic::ZoneEra kZoneEraAmerica_Merida[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2094,7 +2094,7 @@ static const basic::ZoneEra kZoneEraAmerica_Miquelon[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2128,7 +2128,7 @@ static const basic::ZoneEra kZoneEraAmerica_Moncton[] ACE_TIME_PROGMEM = { &kPolicyMoncton /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 7 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2140,7 +2140,7 @@ static const basic::ZoneEra kZoneEraAmerica_Moncton[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2174,7 +2174,7 @@ static const basic::ZoneEra kZoneEraAmerica_Monterrey[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2208,7 +2208,7 @@ static const basic::ZoneEra kZoneEraAmerica_Montevideo[] ACE_TIME_PROGMEM = { &kPolicyUruguay /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2242,7 +2242,7 @@ static const basic::ZoneEra kZoneEraAmerica_Nassau[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2276,7 +2276,7 @@ static const basic::ZoneEra kZoneEraAmerica_New_York[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2310,7 +2310,7 @@ static const basic::ZoneEra kZoneEraAmerica_Nipigon[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2344,7 +2344,7 @@ static const basic::ZoneEra kZoneEraAmerica_Nome[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "AK%T" /*format*/, -36 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2378,7 +2378,7 @@ static const basic::ZoneEra kZoneEraAmerica_North_Dakota_Center[] ACE_TIME_PROGM &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2412,7 +2412,7 @@ static const basic::ZoneEra kZoneEraAmerica_Nuuk[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2446,7 +2446,7 @@ static const basic::ZoneEra kZoneEraAmerica_Ojinaga[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 10 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2458,7 +2458,7 @@ static const basic::ZoneEra kZoneEraAmerica_Ojinaga[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2492,7 +2492,7 @@ static const basic::ZoneEra kZoneEraAmerica_Panama[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2526,7 +2526,7 @@ static const basic::ZoneEra kZoneEraAmerica_Paramaribo[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2560,7 +2560,7 @@ static const basic::ZoneEra kZoneEraAmerica_Phoenix[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "MST" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2594,7 +2594,7 @@ static const basic::ZoneEra kZoneEraAmerica_Port_au_Prince[] ACE_TIME_PROGMEM = &kPolicyHaiti /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2628,7 +2628,7 @@ static const basic::ZoneEra kZoneEraAmerica_Port_of_Spain[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "AST" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2662,7 +2662,7 @@ static const basic::ZoneEra kZoneEraAmerica_Porto_Velho[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2696,7 +2696,7 @@ static const basic::ZoneEra kZoneEraAmerica_Puerto_Rico[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "AST" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2730,7 +2730,7 @@ static const basic::ZoneEra kZoneEraAmerica_Rainy_River[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2764,7 +2764,7 @@ static const basic::ZoneEra kZoneEraAmerica_Regina[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "CST" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2798,7 +2798,7 @@ static const basic::ZoneEra kZoneEraAmerica_Santiago[] ACE_TIME_PROGMEM = { &kPolicyChile /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2832,7 +2832,7 @@ static const basic::ZoneEra kZoneEraAmerica_Sao_Paulo[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2866,7 +2866,7 @@ static const basic::ZoneEra kZoneEraAmerica_Scoresbysund[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "-01/+00" /*format*/, -4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2900,7 +2900,7 @@ static const basic::ZoneEra kZoneEraAmerica_Sitka[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "AK%T" /*format*/, -36 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2934,7 +2934,7 @@ static const basic::ZoneEra kZoneEraAmerica_Swift_Current[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "CST" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2968,7 +2968,7 @@ static const basic::ZoneEra kZoneEraAmerica_Tegucigalpa[] ACE_TIME_PROGMEM = { &kPolicyHond /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3002,7 +3002,7 @@ static const basic::ZoneEra kZoneEraAmerica_Thule[] ACE_TIME_PROGMEM = { &kPolicyThule /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3036,7 +3036,7 @@ static const basic::ZoneEra kZoneEraAmerica_Thunder_Bay[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3070,7 +3070,7 @@ static const basic::ZoneEra kZoneEraAmerica_Toronto[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3104,7 +3104,7 @@ static const basic::ZoneEra kZoneEraAmerica_Vancouver[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "P%T" /*format*/, -32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3138,7 +3138,7 @@ static const basic::ZoneEra kZoneEraAmerica_Winnipeg[] ACE_TIME_PROGMEM = { &kPolicyWinn /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 6 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3150,7 +3150,7 @@ static const basic::ZoneEra kZoneEraAmerica_Winnipeg[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3184,7 +3184,7 @@ static const basic::ZoneEra kZoneEraAmerica_Yakutat[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "AK%T" /*format*/, -36 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3218,7 +3218,7 @@ static const basic::ZoneEra kZoneEraAmerica_Yellowknife[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3252,7 +3252,7 @@ static const basic::ZoneEra kZoneEraAntarctica_DumontDUrville[] ACE_TIME_PROGMEM nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3286,7 +3286,7 @@ static const basic::ZoneEra kZoneEraAntarctica_Rothera[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3320,7 +3320,7 @@ static const basic::ZoneEra kZoneEraAntarctica_Syowa[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3354,7 +3354,7 @@ static const basic::ZoneEra kZoneEraAntarctica_Vostok[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3388,7 +3388,7 @@ static const basic::ZoneEra kZoneEraAsia_Amman[] ACE_TIME_PROGMEM = { &kPolicyJordan /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3422,7 +3422,7 @@ static const basic::ZoneEra kZoneEraAsia_Ashgabat[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3456,7 +3456,7 @@ static const basic::ZoneEra kZoneEraAsia_Baghdad[] ACE_TIME_PROGMEM = { &kPolicyIraq /*zonePolicy*/, "+03/+04" /*format*/, 12 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3490,7 +3490,7 @@ static const basic::ZoneEra kZoneEraAsia_Baku[] ACE_TIME_PROGMEM = { &kPolicyAzer /*zonePolicy*/, "+04/+05" /*format*/, 16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3524,7 +3524,7 @@ static const basic::ZoneEra kZoneEraAsia_Bangkok[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3558,7 +3558,7 @@ static const basic::ZoneEra kZoneEraAsia_Beirut[] ACE_TIME_PROGMEM = { &kPolicyLebanon /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3592,7 +3592,7 @@ static const basic::ZoneEra kZoneEraAsia_Brunei[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3626,7 +3626,7 @@ static const basic::ZoneEra kZoneEraAsia_Damascus[] ACE_TIME_PROGMEM = { &kPolicySyria /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3660,7 +3660,7 @@ static const basic::ZoneEra kZoneEraAsia_Dhaka[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 9 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3672,7 +3672,7 @@ static const basic::ZoneEra kZoneEraAsia_Dhaka[] ACE_TIME_PROGMEM = { &kPolicyDhaka /*zonePolicy*/, "+06/+07" /*format*/, 24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3706,7 +3706,7 @@ static const basic::ZoneEra kZoneEraAsia_Dubai[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3740,7 +3740,7 @@ static const basic::ZoneEra kZoneEraAsia_Dushanbe[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3774,7 +3774,7 @@ static const basic::ZoneEra kZoneEraAsia_Ho_Chi_Minh[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3808,7 +3808,7 @@ static const basic::ZoneEra kZoneEraAsia_Hong_Kong[] ACE_TIME_PROGMEM = { &kPolicyHK /*zonePolicy*/, "HK%T" /*format*/, 32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3842,7 +3842,7 @@ static const basic::ZoneEra kZoneEraAsia_Hovd[] ACE_TIME_PROGMEM = { &kPolicyMongol /*zonePolicy*/, "+07/+08" /*format*/, 28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3876,7 +3876,7 @@ static const basic::ZoneEra kZoneEraAsia_Jakarta[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "WIB" /*format*/, 28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3910,7 +3910,7 @@ static const basic::ZoneEra kZoneEraAsia_Jayapura[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "WIT" /*format*/, 36 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3944,7 +3944,7 @@ static const basic::ZoneEra kZoneEraAsia_Jerusalem[] ACE_TIME_PROGMEM = { &kPolicyZion /*zonePolicy*/, "I%T" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3978,7 +3978,7 @@ static const basic::ZoneEra kZoneEraAsia_Kabul[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+0430" /*format*/, 18 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4012,7 +4012,7 @@ static const basic::ZoneEra kZoneEraAsia_Karachi[] ACE_TIME_PROGMEM = { &kPolicyPakistan /*zonePolicy*/, "PK%T" /*format*/, 20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4046,7 +4046,7 @@ static const basic::ZoneEra kZoneEraAsia_Kathmandu[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+0545" /*format*/, 23 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4080,7 +4080,7 @@ static const basic::ZoneEra kZoneEraAsia_Kolkata[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "IST" /*format*/, 22 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4114,7 +4114,7 @@ static const basic::ZoneEra kZoneEraAsia_Kuala_Lumpur[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4148,7 +4148,7 @@ static const basic::ZoneEra kZoneEraAsia_Kuching[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4182,7 +4182,7 @@ static const basic::ZoneEra kZoneEraAsia_Macau[] ACE_TIME_PROGMEM = { &kPolicyMacau /*zonePolicy*/, "C%T" /*format*/, 32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4216,7 +4216,7 @@ static const basic::ZoneEra kZoneEraAsia_Makassar[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "WITA" /*format*/, 32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4250,7 +4250,7 @@ static const basic::ZoneEra kZoneEraAsia_Manila[] ACE_TIME_PROGMEM = { &kPolicyPhil /*zonePolicy*/, "P%T" /*format*/, 32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4284,7 +4284,7 @@ static const basic::ZoneEra kZoneEraAsia_Nicosia[] ACE_TIME_PROGMEM = { &kPolicyEUAsia /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4318,7 +4318,7 @@ static const basic::ZoneEra kZoneEraAsia_Pontianak[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "WIB" /*format*/, 28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4352,7 +4352,7 @@ static const basic::ZoneEra kZoneEraAsia_Qatar[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4386,7 +4386,7 @@ static const basic::ZoneEra kZoneEraAsia_Riyadh[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4420,7 +4420,7 @@ static const basic::ZoneEra kZoneEraAsia_Samarkand[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4454,7 +4454,7 @@ static const basic::ZoneEra kZoneEraAsia_Seoul[] ACE_TIME_PROGMEM = { &kPolicyROK /*zonePolicy*/, "K%T" /*format*/, 36 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4488,7 +4488,7 @@ static const basic::ZoneEra kZoneEraAsia_Shanghai[] ACE_TIME_PROGMEM = { &kPolicyPRC /*zonePolicy*/, "C%T" /*format*/, 32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4522,7 +4522,7 @@ static const basic::ZoneEra kZoneEraAsia_Singapore[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4556,7 +4556,7 @@ static const basic::ZoneEra kZoneEraAsia_Taipei[] ACE_TIME_PROGMEM = { &kPolicyTaiwan /*zonePolicy*/, "C%T" /*format*/, 32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4590,7 +4590,7 @@ static const basic::ZoneEra kZoneEraAsia_Tashkent[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4624,7 +4624,7 @@ static const basic::ZoneEra kZoneEraAsia_Tehran[] ACE_TIME_PROGMEM = { &kPolicyIran /*zonePolicy*/, "+0330/+0430" /*format*/, 14 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4658,7 +4658,7 @@ static const basic::ZoneEra kZoneEraAsia_Thimphu[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4692,7 +4692,7 @@ static const basic::ZoneEra kZoneEraAsia_Tokyo[] ACE_TIME_PROGMEM = { &kPolicyJapan /*zonePolicy*/, "J%T" /*format*/, 36 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4726,7 +4726,7 @@ static const basic::ZoneEra kZoneEraAsia_Ulaanbaatar[] ACE_TIME_PROGMEM = { &kPolicyMongol /*zonePolicy*/, "+08/+09" /*format*/, 32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4760,7 +4760,7 @@ static const basic::ZoneEra kZoneEraAsia_Urumqi[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4794,7 +4794,7 @@ static const basic::ZoneEra kZoneEraAsia_Yangon[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+0630" /*format*/, 26 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4828,7 +4828,7 @@ static const basic::ZoneEra kZoneEraAsia_Yerevan[] ACE_TIME_PROGMEM = { &kPolicyRussiaAsia /*zonePolicy*/, "+04/+05" /*format*/, 16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 11 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4840,7 +4840,7 @@ static const basic::ZoneEra kZoneEraAsia_Yerevan[] ACE_TIME_PROGMEM = { &kPolicyArmenia /*zonePolicy*/, "+04/+05" /*format*/, 16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4874,7 +4874,7 @@ static const basic::ZoneEra kZoneEraAtlantic_Azores[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "-01/+00" /*format*/, -4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4908,7 +4908,7 @@ static const basic::ZoneEra kZoneEraAtlantic_Bermuda[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4942,7 +4942,7 @@ static const basic::ZoneEra kZoneEraAtlantic_Canary[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "WE%T" /*format*/, 0 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4976,7 +4976,7 @@ static const basic::ZoneEra kZoneEraAtlantic_Cape_Verde[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-01" /*format*/, -4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5010,7 +5010,7 @@ static const basic::ZoneEra kZoneEraAtlantic_Faroe[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "WE%T" /*format*/, 0 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5044,7 +5044,7 @@ static const basic::ZoneEra kZoneEraAtlantic_Madeira[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "WE%T" /*format*/, 0 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5078,7 +5078,7 @@ static const basic::ZoneEra kZoneEraAtlantic_Reykjavik[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "GMT" /*format*/, 0 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5112,7 +5112,7 @@ static const basic::ZoneEra kZoneEraAtlantic_South_Georgia[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "-02" /*format*/, -8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5146,7 +5146,7 @@ static const basic::ZoneEra kZoneEraAustralia_Adelaide[] ACE_TIME_PROGMEM = { &kPolicyAS /*zonePolicy*/, "AC%T" /*format*/, 38 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5180,7 +5180,7 @@ static const basic::ZoneEra kZoneEraAustralia_Brisbane[] ACE_TIME_PROGMEM = { &kPolicyAQ /*zonePolicy*/, "AE%T" /*format*/, 40 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5214,7 +5214,7 @@ static const basic::ZoneEra kZoneEraAustralia_Broken_Hill[] ACE_TIME_PROGMEM = { &kPolicyAN /*zonePolicy*/, "AC%T" /*format*/, 38 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 0 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5226,7 +5226,7 @@ static const basic::ZoneEra kZoneEraAustralia_Broken_Hill[] ACE_TIME_PROGMEM = { &kPolicyAS /*zonePolicy*/, "AC%T" /*format*/, 38 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5260,7 +5260,7 @@ static const basic::ZoneEra kZoneEraAustralia_Darwin[] ACE_TIME_PROGMEM = { &kPolicyAus /*zonePolicy*/, "AC%T" /*format*/, 38 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5294,7 +5294,7 @@ static const basic::ZoneEra kZoneEraAustralia_Eucla[] ACE_TIME_PROGMEM = { &kPolicyAW /*zonePolicy*/, "+0845/+0945" /*format*/, 35 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5328,7 +5328,7 @@ static const basic::ZoneEra kZoneEraAustralia_Hobart[] ACE_TIME_PROGMEM = { &kPolicyAT /*zonePolicy*/, "AE%T" /*format*/, 40 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5362,7 +5362,7 @@ static const basic::ZoneEra kZoneEraAustralia_Lindeman[] ACE_TIME_PROGMEM = { &kPolicyHoliday /*zonePolicy*/, "AE%T" /*format*/, 40 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5396,7 +5396,7 @@ static const basic::ZoneEra kZoneEraAustralia_Lord_Howe[] ACE_TIME_PROGMEM = { &kPolicyLH /*zonePolicy*/, "+1030/+11" /*format*/, 42 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5430,7 +5430,7 @@ static const basic::ZoneEra kZoneEraAustralia_Melbourne[] ACE_TIME_PROGMEM = { &kPolicyAV /*zonePolicy*/, "AE%T" /*format*/, 40 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5464,7 +5464,7 @@ static const basic::ZoneEra kZoneEraAustralia_Perth[] ACE_TIME_PROGMEM = { &kPolicyAW /*zonePolicy*/, "AW%T" /*format*/, 32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5498,7 +5498,7 @@ static const basic::ZoneEra kZoneEraAustralia_Sydney[] ACE_TIME_PROGMEM = { &kPolicyAN /*zonePolicy*/, "AE%T" /*format*/, 40 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5532,7 +5532,7 @@ static const basic::ZoneEra kZoneEraCET[] ACE_TIME_PROGMEM = { &kPolicyC_Eur /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5566,7 +5566,7 @@ static const basic::ZoneEra kZoneEraCST6CDT[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5600,7 +5600,7 @@ static const basic::ZoneEra kZoneEraEET[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5634,7 +5634,7 @@ static const basic::ZoneEra kZoneEraEST[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5668,7 +5668,7 @@ static const basic::ZoneEra kZoneEraEST5EDT[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5702,7 +5702,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "GMT" /*format*/, 0 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5736,7 +5736,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_1[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-01" /*format*/, -4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5770,7 +5770,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_10[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-10" /*format*/, -40 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5804,7 +5804,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_11[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-11" /*format*/, -44 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5838,7 +5838,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_12[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-12" /*format*/, -48 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5872,7 +5872,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_2[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-02" /*format*/, -8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5906,7 +5906,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_3[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5940,7 +5940,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_4[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5974,7 +5974,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_5[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-05" /*format*/, -20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6008,7 +6008,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_6[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-06" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6042,7 +6042,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_7[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-07" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6076,7 +6076,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_8[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-08" /*format*/, -32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6110,7 +6110,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_PLUS_9[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-09" /*format*/, -36 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6144,7 +6144,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_1[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+01" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6178,7 +6178,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_10[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6212,7 +6212,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_11[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6246,7 +6246,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_12[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6280,7 +6280,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_13[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+13" /*format*/, 52 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6314,7 +6314,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_14[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+14" /*format*/, 56 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6348,7 +6348,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_2[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+02" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6382,7 +6382,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_3[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6416,7 +6416,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_4[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6450,7 +6450,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_5[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6484,7 +6484,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_6[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6518,7 +6518,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_7[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6552,7 +6552,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_8[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6586,7 +6586,7 @@ static const basic::ZoneEra kZoneEraEtc_GMT_9[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+09" /*format*/, 36 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6620,7 +6620,7 @@ static const basic::ZoneEra kZoneEraEtc_UTC[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "UTC" /*format*/, 0 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6654,7 +6654,7 @@ static const basic::ZoneEra kZoneEraEurope_Amsterdam[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6688,7 +6688,7 @@ static const basic::ZoneEra kZoneEraEurope_Andorra[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6722,7 +6722,7 @@ static const basic::ZoneEra kZoneEraEurope_Athens[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6756,7 +6756,7 @@ static const basic::ZoneEra kZoneEraEurope_Belgrade[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6790,7 +6790,7 @@ static const basic::ZoneEra kZoneEraEurope_Berlin[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6824,7 +6824,7 @@ static const basic::ZoneEra kZoneEraEurope_Brussels[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6858,7 +6858,7 @@ static const basic::ZoneEra kZoneEraEurope_Bucharest[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6892,7 +6892,7 @@ static const basic::ZoneEra kZoneEraEurope_Budapest[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6926,7 +6926,7 @@ static const basic::ZoneEra kZoneEraEurope_Chisinau[] ACE_TIME_PROGMEM = { &kPolicyMoldova /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6960,7 +6960,7 @@ static const basic::ZoneEra kZoneEraEurope_Copenhagen[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6994,7 +6994,7 @@ static const basic::ZoneEra kZoneEraEurope_Dublin[] ACE_TIME_PROGMEM = { &kPolicyEire /*zonePolicy*/, "IST/GMT" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7028,7 +7028,7 @@ static const basic::ZoneEra kZoneEraEurope_Gibraltar[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7062,7 +7062,7 @@ static const basic::ZoneEra kZoneEraEurope_Helsinki[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7096,7 +7096,7 @@ static const basic::ZoneEra kZoneEraEurope_Kiev[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7130,7 +7130,7 @@ static const basic::ZoneEra kZoneEraEurope_Lisbon[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "WE%T" /*format*/, 0 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7164,7 +7164,7 @@ static const basic::ZoneEra kZoneEraEurope_London[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "GMT/BST" /*format*/, 0 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7198,7 +7198,7 @@ static const basic::ZoneEra kZoneEraEurope_Luxembourg[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7232,7 +7232,7 @@ static const basic::ZoneEra kZoneEraEurope_Madrid[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7266,7 +7266,7 @@ static const basic::ZoneEra kZoneEraEurope_Malta[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7300,7 +7300,7 @@ static const basic::ZoneEra kZoneEraEurope_Monaco[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7334,7 +7334,7 @@ static const basic::ZoneEra kZoneEraEurope_Oslo[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7368,7 +7368,7 @@ static const basic::ZoneEra kZoneEraEurope_Paris[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7402,7 +7402,7 @@ static const basic::ZoneEra kZoneEraEurope_Prague[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7436,7 +7436,7 @@ static const basic::ZoneEra kZoneEraEurope_Rome[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7470,7 +7470,7 @@ static const basic::ZoneEra kZoneEraEurope_Sofia[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7504,7 +7504,7 @@ static const basic::ZoneEra kZoneEraEurope_Stockholm[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7538,7 +7538,7 @@ static const basic::ZoneEra kZoneEraEurope_Tirane[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7572,7 +7572,7 @@ static const basic::ZoneEra kZoneEraEurope_Uzhgorod[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7606,7 +7606,7 @@ static const basic::ZoneEra kZoneEraEurope_Vienna[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7640,7 +7640,7 @@ static const basic::ZoneEra kZoneEraEurope_Warsaw[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7674,7 +7674,7 @@ static const basic::ZoneEra kZoneEraEurope_Zaporozhye[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7708,7 +7708,7 @@ static const basic::ZoneEra kZoneEraEurope_Zurich[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7742,7 +7742,7 @@ static const basic::ZoneEra kZoneEraHST[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "HST" /*format*/, -40 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7776,7 +7776,7 @@ static const basic::ZoneEra kZoneEraIndian_Chagos[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7810,7 +7810,7 @@ static const basic::ZoneEra kZoneEraIndian_Christmas[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7844,7 +7844,7 @@ static const basic::ZoneEra kZoneEraIndian_Cocos[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+0630" /*format*/, 26 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7878,7 +7878,7 @@ static const basic::ZoneEra kZoneEraIndian_Kerguelen[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7912,7 +7912,7 @@ static const basic::ZoneEra kZoneEraIndian_Mahe[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7946,7 +7946,7 @@ static const basic::ZoneEra kZoneEraIndian_Maldives[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7980,7 +7980,7 @@ static const basic::ZoneEra kZoneEraIndian_Mauritius[] ACE_TIME_PROGMEM = { &kPolicyMauritius /*zonePolicy*/, "+04/+05" /*format*/, 16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8014,7 +8014,7 @@ static const basic::ZoneEra kZoneEraIndian_Reunion[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8048,7 +8048,7 @@ static const basic::ZoneEra kZoneEraMET[] ACE_TIME_PROGMEM = { &kPolicyC_Eur /*zonePolicy*/, "ME%T" /*format*/, 4 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8082,7 +8082,7 @@ static const basic::ZoneEra kZoneEraMST[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "MST" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8116,7 +8116,7 @@ static const basic::ZoneEra kZoneEraMST7MDT[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8150,7 +8150,7 @@ static const basic::ZoneEra kZoneEraPST8PDT[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "P%T" /*format*/, -32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8184,7 +8184,7 @@ static const basic::ZoneEra kZoneEraPacific_Auckland[] ACE_TIME_PROGMEM = { &kPolicyNZ /*zonePolicy*/, "NZ%T" /*format*/, 48 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8218,7 +8218,7 @@ static const basic::ZoneEra kZoneEraPacific_Chatham[] ACE_TIME_PROGMEM = { &kPolicyChatham /*zonePolicy*/, "+1245/+1345" /*format*/, 51 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8252,7 +8252,7 @@ static const basic::ZoneEra kZoneEraPacific_Chuuk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8286,7 +8286,7 @@ static const basic::ZoneEra kZoneEraPacific_Easter[] ACE_TIME_PROGMEM = { &kPolicyChile /*zonePolicy*/, "-06/-05" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8320,7 +8320,7 @@ static const basic::ZoneEra kZoneEraPacific_Efate[] ACE_TIME_PROGMEM = { &kPolicyVanuatu /*zonePolicy*/, "+11/+12" /*format*/, 44 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8354,7 +8354,7 @@ static const basic::ZoneEra kZoneEraPacific_Enderbury[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+13" /*format*/, 52 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8388,7 +8388,7 @@ static const basic::ZoneEra kZoneEraPacific_Fiji[] ACE_TIME_PROGMEM = { &kPolicyFiji /*zonePolicy*/, "+12/+13" /*format*/, 48 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8422,7 +8422,7 @@ static const basic::ZoneEra kZoneEraPacific_Funafuti[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8456,7 +8456,7 @@ static const basic::ZoneEra kZoneEraPacific_Galapagos[] ACE_TIME_PROGMEM = { &kPolicyEcuador /*zonePolicy*/, "-06/-05" /*format*/, -24 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8490,7 +8490,7 @@ static const basic::ZoneEra kZoneEraPacific_Gambier[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-09" /*format*/, -36 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8524,7 +8524,7 @@ static const basic::ZoneEra kZoneEraPacific_Guadalcanal[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8558,7 +8558,7 @@ static const basic::ZoneEra kZoneEraPacific_Honolulu[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "HST" /*format*/, -40 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8592,7 +8592,7 @@ static const basic::ZoneEra kZoneEraPacific_Kiritimati[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+14" /*format*/, 56 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8626,7 +8626,7 @@ static const basic::ZoneEra kZoneEraPacific_Kosrae[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, -1 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8638,7 +8638,7 @@ static const basic::ZoneEra kZoneEraPacific_Kosrae[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8672,7 +8672,7 @@ static const basic::ZoneEra kZoneEraPacific_Kwajalein[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8706,7 +8706,7 @@ static const basic::ZoneEra kZoneEraPacific_Majuro[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8740,7 +8740,7 @@ static const basic::ZoneEra kZoneEraPacific_Marquesas[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-0930" /*format*/, -38 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8774,7 +8774,7 @@ static const basic::ZoneEra kZoneEraPacific_Nauru[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8808,7 +8808,7 @@ static const basic::ZoneEra kZoneEraPacific_Niue[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-11" /*format*/, -44 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8842,7 +8842,7 @@ static const basic::ZoneEra kZoneEraPacific_Noumea[] ACE_TIME_PROGMEM = { &kPolicyNC /*zonePolicy*/, "+11/+12" /*format*/, 44 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8876,7 +8876,7 @@ static const basic::ZoneEra kZoneEraPacific_Pago_Pago[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "SST" /*format*/, -44 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8910,7 +8910,7 @@ static const basic::ZoneEra kZoneEraPacific_Palau[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+09" /*format*/, 36 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8944,7 +8944,7 @@ static const basic::ZoneEra kZoneEraPacific_Pitcairn[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-08" /*format*/, -32 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8978,7 +8978,7 @@ static const basic::ZoneEra kZoneEraPacific_Pohnpei[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9012,7 +9012,7 @@ static const basic::ZoneEra kZoneEraPacific_Port_Moresby[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9046,7 +9046,7 @@ static const basic::ZoneEra kZoneEraPacific_Rarotonga[] ACE_TIME_PROGMEM = { &kPolicyCook /*zonePolicy*/, "-10/-0930" /*format*/, -40 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9080,7 +9080,7 @@ static const basic::ZoneEra kZoneEraPacific_Tahiti[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-10" /*format*/, -40 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9114,7 +9114,7 @@ static const basic::ZoneEra kZoneEraPacific_Tarawa[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9148,7 +9148,7 @@ static const basic::ZoneEra kZoneEraPacific_Tongatapu[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+13" /*format*/, 52 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, -1 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9160,7 +9160,7 @@ static const basic::ZoneEra kZoneEraPacific_Tongatapu[] ACE_TIME_PROGMEM = { &kPolicyTonga /*zonePolicy*/, "+13/+14" /*format*/, 52 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9194,7 +9194,7 @@ static const basic::ZoneEra kZoneEraPacific_Wake[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9228,7 +9228,7 @@ static const basic::ZoneEra kZoneEraPacific_Wallis[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9262,7 +9262,7 @@ static const basic::ZoneEra kZoneEraWET[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "WE%T" /*format*/, 0 /*offsetCode*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, diff --git a/src/ace_time/zonedb/zone_policies.cpp b/src/ace_time/zonedb/zone_policies.cpp index 1683a6823..15d62c89d 100644 --- a/src/ace_time/zonedb/zone_policies.cpp +++ b/src/ace_time/zonedb/zone_policies.cpp @@ -28,7 +28,7 @@ // Rules: 361 // Letter Size (bytes): 0 // Total Memory 8-bit (bytes): 3633 -// Total Memory 32-bit (bytes): 5132 +// Total Memory 32-bit (bytes): 5100 // // DO NOT EDIT @@ -55,7 +55,7 @@ static const basic::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule AN 1990 1995 - Mar Sun>=1 2:00s 0 S @@ -67,7 +67,7 @@ static const basic::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AN 1996 2005 - Mar lastSun 2:00s 0 S @@ -79,7 +79,7 @@ static const basic::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AN 2000 only - Aug lastSun 2:00s 1:00 D @@ -91,7 +91,7 @@ static const basic::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule AN 2001 2007 - Oct lastSun 2:00s 1:00 D @@ -103,7 +103,7 @@ static const basic::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule AN 2006 only - Apr Sun>=1 2:00s 0 S @@ -115,7 +115,7 @@ static const basic::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AN 2007 only - Mar lastSun 2:00s 0 S @@ -127,7 +127,7 @@ static const basic::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AN 2008 max - Apr Sun>=1 2:00s 0 S @@ -139,7 +139,7 @@ static const basic::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AN 2008 max - Oct Sun>=1 2:00s 1:00 D @@ -151,7 +151,7 @@ static const basic::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, @@ -183,7 +183,7 @@ static const basic::ZoneRule kZoneRulesAQ[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -215,7 +215,7 @@ static const basic::ZoneRule kZoneRulesAS[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule AS 1994 only - Mar 20 2:00s 0 S @@ -227,7 +227,7 @@ static const basic::ZoneRule kZoneRulesAS[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AS 1995 2005 - Mar lastSun 2:00s 0 S @@ -239,7 +239,7 @@ static const basic::ZoneRule kZoneRulesAS[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AS 2006 only - Apr 2 2:00s 0 S @@ -251,7 +251,7 @@ static const basic::ZoneRule kZoneRulesAS[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AS 2007 only - Mar lastSun 2:00s 0 S @@ -263,7 +263,7 @@ static const basic::ZoneRule kZoneRulesAS[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AS 2008 max - Apr Sun>=1 2:00s 0 S @@ -275,7 +275,7 @@ static const basic::ZoneRule kZoneRulesAS[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AS 2008 max - Oct Sun>=1 2:00s 1:00 D @@ -287,7 +287,7 @@ static const basic::ZoneRule kZoneRulesAS[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, @@ -319,7 +319,7 @@ static const basic::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule AT 1991 1999 - Oct Sun>=1 2:00s 1:00 D @@ -331,7 +331,7 @@ static const basic::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule AT 1991 2005 - Mar lastSun 2:00s 0 S @@ -343,7 +343,7 @@ static const basic::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AT 2000 only - Aug lastSun 2:00s 1:00 D @@ -355,7 +355,7 @@ static const basic::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule AT 2001 max - Oct Sun>=1 2:00s 1:00 D @@ -367,7 +367,7 @@ static const basic::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule AT 2006 only - Apr Sun>=1 2:00s 0 S @@ -379,7 +379,7 @@ static const basic::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AT 2007 only - Mar lastSun 2:00s 0 S @@ -391,7 +391,7 @@ static const basic::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AT 2008 max - Apr Sun>=1 2:00s 0 S @@ -403,7 +403,7 @@ static const basic::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -435,7 +435,7 @@ static const basic::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule AV 1991 1994 - Mar Sun>=1 2:00s 0 S @@ -447,7 +447,7 @@ static const basic::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AV 1995 2005 - Mar lastSun 2:00s 0 S @@ -459,7 +459,7 @@ static const basic::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AV 2000 only - Aug lastSun 2:00s 1:00 D @@ -471,7 +471,7 @@ static const basic::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule AV 2001 2007 - Oct lastSun 2:00s 1:00 D @@ -483,7 +483,7 @@ static const basic::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule AV 2006 only - Apr Sun>=1 2:00s 0 S @@ -495,7 +495,7 @@ static const basic::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AV 2007 only - Mar lastSun 2:00s 0 S @@ -507,7 +507,7 @@ static const basic::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AV 2008 max - Apr Sun>=1 2:00s 0 S @@ -519,7 +519,7 @@ static const basic::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AV 2008 max - Oct Sun>=1 2:00s 1:00 D @@ -531,7 +531,7 @@ static const basic::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, @@ -563,7 +563,7 @@ static const basic::ZoneRule kZoneRulesAW[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AW 2006 only - Dec 3 2:00s 1:00 D @@ -575,7 +575,7 @@ static const basic::ZoneRule kZoneRulesAW[] ACE_TIME_PROGMEM = { 3 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule AW 2007 2009 - Mar lastSun 2:00s 0 S @@ -587,7 +587,7 @@ static const basic::ZoneRule kZoneRulesAW[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule AW 2007 2008 - Oct lastSun 2:00s 1:00 D @@ -599,7 +599,7 @@ static const basic::ZoneRule kZoneRulesAW[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, @@ -631,7 +631,7 @@ static const basic::ZoneRule kZoneRulesArmenia[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Armenia 2011 only - Mar lastSun 2:00s 1:00 - @@ -643,7 +643,7 @@ static const basic::ZoneRule kZoneRulesArmenia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Armenia 2011 only - Oct lastSun 2:00s 0 - @@ -655,7 +655,7 @@ static const basic::ZoneRule kZoneRulesArmenia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -687,7 +687,7 @@ static const basic::ZoneRule kZoneRulesAus[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -719,7 +719,7 @@ static const basic::ZoneRule kZoneRulesAzer[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 16 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Azer 1997 2015 - Oct lastSun 5:00 0 - @@ -731,7 +731,7 @@ static const basic::ZoneRule kZoneRulesAzer[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 20 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -763,7 +763,7 @@ static const basic::ZoneRule kZoneRulesBarb[] ACE_TIME_PROGMEM = { 25 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -795,7 +795,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 11 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Brazil 1999 only - Feb 21 0:00 0 - @@ -807,7 +807,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Brazil 1999 only - Oct 3 0:00 1:00 - @@ -819,7 +819,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 3 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Brazil 2000 only - Feb 27 0:00 0 - @@ -831,7 +831,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 27 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Brazil 2000 2001 - Oct Sun>=8 0:00 1:00 - @@ -843,7 +843,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Brazil 2001 2006 - Feb Sun>=15 0:00 0 - @@ -855,7 +855,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Brazil 2002 only - Nov 3 0:00 1:00 - @@ -867,7 +867,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 3 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Brazil 2003 only - Oct 19 0:00 1:00 - @@ -879,7 +879,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 19 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Brazil 2004 only - Nov 2 0:00 1:00 - @@ -891,7 +891,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Brazil 2005 only - Oct 16 0:00 1:00 - @@ -903,7 +903,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 16 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Brazil 2006 only - Nov 5 0:00 1:00 - @@ -915,7 +915,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 5 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Brazil 2007 only - Feb 25 0:00 0 - @@ -927,7 +927,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 25 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Brazil 2007 only - Oct Sun>=8 0:00 1:00 - @@ -939,7 +939,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Brazil 2008 2017 - Oct Sun>=15 0:00 1:00 - @@ -951,7 +951,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Brazil 2008 2011 - Feb Sun>=15 0:00 0 - @@ -963,7 +963,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Brazil 2012 only - Feb Sun>=22 0:00 0 - @@ -975,7 +975,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Brazil 2013 2014 - Feb Sun>=15 0:00 0 - @@ -987,7 +987,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Brazil 2015 only - Feb Sun>=22 0:00 0 - @@ -999,7 +999,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Brazil 2016 2019 - Feb Sun>=15 0:00 0 - @@ -1011,7 +1011,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Brazil 2018 only - Nov Sun>=1 0:00 1:00 - @@ -1023,7 +1023,7 @@ static const basic::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, @@ -1055,7 +1055,7 @@ static const basic::ZoneRule kZoneRulesC_Eur[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule C-Eur 1981 max - Mar lastSun 2:00s 1:00 S @@ -1067,7 +1067,7 @@ static const basic::ZoneRule kZoneRulesC_Eur[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule C-Eur 1996 max - Oct lastSun 2:00s 0 - @@ -1079,7 +1079,7 @@ static const basic::ZoneRule kZoneRulesC_Eur[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -1111,7 +1111,7 @@ static const basic::ZoneRule kZoneRulesCO[] ACE_TIME_PROGMEM = { 4 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -1143,7 +1143,7 @@ static const basic::ZoneRule kZoneRulesCR[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -1175,7 +1175,7 @@ static const basic::ZoneRule kZoneRulesCanada[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Canada 1974 2006 - Oct lastSun 2:00 0 S @@ -1187,7 +1187,7 @@ static const basic::ZoneRule kZoneRulesCanada[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Canada 1987 2006 - Apr Sun>=1 2:00 1:00 D @@ -1199,7 +1199,7 @@ static const basic::ZoneRule kZoneRulesCanada[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Canada 2007 max - Mar Sun>=8 2:00 1:00 D @@ -1211,7 +1211,7 @@ static const basic::ZoneRule kZoneRulesCanada[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Canada 2007 max - Nov Sun>=1 2:00 0 S @@ -1223,7 +1223,7 @@ static const basic::ZoneRule kZoneRulesCanada[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -1255,7 +1255,7 @@ static const basic::ZoneRule kZoneRulesChatham[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 11 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Chatham 1990 2006 - Oct Sun>=1 2:45s 1:00 - @@ -1267,7 +1267,7 @@ static const basic::ZoneRule kZoneRulesChatham[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 11 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Chatham 1990 2007 - Mar Sun>=15 2:45s 0 - @@ -1279,7 +1279,7 @@ static const basic::ZoneRule kZoneRulesChatham[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 11 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Chatham 2007 max - Sep lastSun 2:45s 1:00 - @@ -1291,7 +1291,7 @@ static const basic::ZoneRule kZoneRulesChatham[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 11 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Chatham 2008 max - Apr Sun>=1 2:45s 0 - @@ -1303,7 +1303,7 @@ static const basic::ZoneRule kZoneRulesChatham[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 11 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -1335,7 +1335,7 @@ static const basic::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 27 /*onDayOfMonth*/, 16 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Chile 1999 only - Apr 4 3:00u 0 - @@ -1347,7 +1347,7 @@ static const basic::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 4 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Chile 1999 2010 - Oct Sun>=9 4:00u 1:00 - @@ -1359,7 +1359,7 @@ static const basic::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 16 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 - @@ -1371,7 +1371,7 @@ static const basic::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Chile 2008 only - Mar 30 3:00u 0 - @@ -1383,7 +1383,7 @@ static const basic::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Chile 2009 only - Mar Sun>=9 3:00u 0 - @@ -1395,7 +1395,7 @@ static const basic::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Chile 2010 only - Apr Sun>=1 3:00u 0 - @@ -1407,7 +1407,7 @@ static const basic::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Chile 2011 only - May Sun>=2 3:00u 0 - @@ -1419,7 +1419,7 @@ static const basic::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 - @@ -1431,7 +1431,7 @@ static const basic::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 16 /*onDayOfMonth*/, 16 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Chile 2012 2014 - Apr Sun>=23 3:00u 0 - @@ -1443,7 +1443,7 @@ static const basic::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 23 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Chile 2012 2014 - Sep Sun>=2 4:00u 1:00 - @@ -1455,7 +1455,7 @@ static const basic::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 16 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Chile 2016 2018 - May Sun>=9 3:00u 0 - @@ -1467,7 +1467,7 @@ static const basic::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Chile 2016 2018 - Aug Sun>=9 4:00u 1:00 - @@ -1479,7 +1479,7 @@ static const basic::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 16 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Chile 2019 max - Apr Sun>=2 3:00u 0 - @@ -1491,7 +1491,7 @@ static const basic::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Chile 2019 max - Sep Sun>=2 4:00u 1:00 - @@ -1503,7 +1503,7 @@ static const basic::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 16 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, @@ -1535,7 +1535,7 @@ static const basic::ZoneRule kZoneRulesCook[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -1567,7 +1567,7 @@ static const basic::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 12 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D @@ -1579,7 +1579,7 @@ static const basic::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S @@ -1591,7 +1591,7 @@ static const basic::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Cuba 2000 2003 - Apr Sun>=1 0:00s 1:00 D @@ -1603,7 +1603,7 @@ static const basic::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Cuba 2004 only - Mar lastSun 0:00s 1:00 D @@ -1615,7 +1615,7 @@ static const basic::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Cuba 2006 2010 - Oct lastSun 0:00s 0 S @@ -1627,7 +1627,7 @@ static const basic::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D @@ -1639,7 +1639,7 @@ static const basic::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D @@ -1651,7 +1651,7 @@ static const basic::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Cuba 2009 2010 - Mar Sun>=8 0:00s 1:00 D @@ -1663,7 +1663,7 @@ static const basic::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Cuba 2011 only - Mar Sun>=15 0:00s 1:00 D @@ -1675,7 +1675,7 @@ static const basic::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Cuba 2011 only - Nov 13 0:00s 0 S @@ -1687,7 +1687,7 @@ static const basic::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 13 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Cuba 2012 only - Apr 1 0:00s 1:00 D @@ -1699,7 +1699,7 @@ static const basic::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Cuba 2012 max - Nov Sun>=1 0:00s 0 S @@ -1711,7 +1711,7 @@ static const basic::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Cuba 2013 max - Mar Sun>=8 0:00s 1:00 D @@ -1723,7 +1723,7 @@ static const basic::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, @@ -1755,7 +1755,7 @@ static const basic::ZoneRule kZoneRulesDhaka[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Dhaka 2009 only - Jun 19 23:00 1:00 - @@ -1767,7 +1767,7 @@ static const basic::ZoneRule kZoneRulesDhaka[] ACE_TIME_PROGMEM = { 19 /*onDayOfMonth*/, 92 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Dhaka 2009 only - Dec 31 24:00 0 - @@ -1779,7 +1779,7 @@ static const basic::ZoneRule kZoneRulesDhaka[] ACE_TIME_PROGMEM = { 31 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -1811,7 +1811,7 @@ static const basic::ZoneRule kZoneRulesEU[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S @@ -1823,7 +1823,7 @@ static const basic::ZoneRule kZoneRulesEU[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule EU 1996 max - Oct lastSun 1:00u 0 - @@ -1835,7 +1835,7 @@ static const basic::ZoneRule kZoneRulesEU[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -1867,7 +1867,7 @@ static const basic::ZoneRule kZoneRulesEUAsia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule EUAsia 1979 1995 - Sep lastSun 1:00u 0 - @@ -1879,7 +1879,7 @@ static const basic::ZoneRule kZoneRulesEUAsia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule EUAsia 1996 max - Oct lastSun 1:00u 0 - @@ -1891,7 +1891,7 @@ static const basic::ZoneRule kZoneRulesEUAsia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -1923,7 +1923,7 @@ static const basic::ZoneRule kZoneRulesEcuador[] ACE_TIME_PROGMEM = { 5 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -1955,7 +1955,7 @@ static const basic::ZoneRule kZoneRulesEire[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Eire 1990 1995 - Oct Sun>=22 1:00u -1:00 - @@ -1967,7 +1967,7 @@ static const basic::ZoneRule kZoneRulesEire[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - -4 /*deltaCode (deltaMinute=-60/15)*/, + -4 /*deltaCode ((deltaMinutes=-60)/15)*/, '-' /*letter*/, }, // Rule Eire 1996 max - Oct lastSun 1:00u -1:00 - @@ -1979,7 +1979,7 @@ static const basic::ZoneRule kZoneRulesEire[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - -4 /*deltaCode (deltaMinute=-60/15)*/, + -4 /*deltaCode ((deltaMinutes=-60)/15)*/, '-' /*letter*/, }, @@ -2011,7 +2011,7 @@ static const basic::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - @@ -2023,7 +2023,7 @@ static const basic::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Fiji 2009 only - Nov 29 2:00 1:00 - @@ -2035,7 +2035,7 @@ static const basic::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 29 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Fiji 2010 only - Mar lastSun 3:00 0 - @@ -2047,7 +2047,7 @@ static const basic::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Fiji 2010 2013 - Oct Sun>=21 2:00 1:00 - @@ -2059,7 +2059,7 @@ static const basic::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - @@ -2071,7 +2071,7 @@ static const basic::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 - @@ -2083,7 +2083,7 @@ static const basic::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 18 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Fiji 2014 only - Jan Sun>=18 2:00 0 - @@ -2095,7 +2095,7 @@ static const basic::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 18 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Fiji 2014 2018 - Nov Sun>=1 2:00 1:00 - @@ -2107,7 +2107,7 @@ static const basic::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Fiji 2015 max - Jan Sun>=12 3:00 0 - @@ -2119,7 +2119,7 @@ static const basic::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 12 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Fiji 2019 only - Nov Sun>=8 2:00 1:00 - @@ -2131,7 +2131,7 @@ static const basic::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Fiji 2020 only - Dec 20 2:00 1:00 - @@ -2143,7 +2143,7 @@ static const basic::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Fiji 2021 max - Nov Sun>=8 2:00 1:00 - @@ -2155,7 +2155,7 @@ static const basic::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, @@ -2187,7 +2187,7 @@ static const basic::ZoneRule kZoneRulesGuat[] ACE_TIME_PROGMEM = { 7 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Guat 2006 only - Apr 30 0:00 1:00 D @@ -2199,7 +2199,7 @@ static const basic::ZoneRule kZoneRulesGuat[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Guat 2006 only - Oct 1 0:00 0 S @@ -2211,7 +2211,7 @@ static const basic::ZoneRule kZoneRulesGuat[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -2243,7 +2243,7 @@ static const basic::ZoneRule kZoneRulesHK[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 14 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -2275,7 +2275,7 @@ static const basic::ZoneRule kZoneRulesHaiti[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Haiti 2005 2006 - Apr Sun>=1 0:00 1:00 D @@ -2287,7 +2287,7 @@ static const basic::ZoneRule kZoneRulesHaiti[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Haiti 2005 2006 - Oct lastSun 0:00 0 S @@ -2299,7 +2299,7 @@ static const basic::ZoneRule kZoneRulesHaiti[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Haiti 2012 2015 - Mar Sun>=8 2:00 1:00 D @@ -2311,7 +2311,7 @@ static const basic::ZoneRule kZoneRulesHaiti[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Haiti 2012 2015 - Nov Sun>=1 2:00 0 S @@ -2323,7 +2323,7 @@ static const basic::ZoneRule kZoneRulesHaiti[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Haiti 2017 max - Mar Sun>=8 2:00 1:00 D @@ -2335,7 +2335,7 @@ static const basic::ZoneRule kZoneRulesHaiti[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Haiti 2017 max - Nov Sun>=1 2:00 0 S @@ -2347,7 +2347,7 @@ static const basic::ZoneRule kZoneRulesHaiti[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -2379,7 +2379,7 @@ static const basic::ZoneRule kZoneRulesHoliday[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -2411,7 +2411,7 @@ static const basic::ZoneRule kZoneRulesHond[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Hond 2006 only - May Sun>=1 0:00 1:00 D @@ -2423,7 +2423,7 @@ static const basic::ZoneRule kZoneRulesHond[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Hond 2006 only - Aug Mon>=1 0:00 0 S @@ -2435,7 +2435,7 @@ static const basic::ZoneRule kZoneRulesHond[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -2467,7 +2467,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 1997 1999 - Mar 21 24:00 1:00 - @@ -2479,7 +2479,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 1997 1999 - Sep 21 24:00 0 - @@ -2491,7 +2491,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2000 only - Mar 20 24:00 1:00 - @@ -2503,7 +2503,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2000 only - Sep 20 24:00 0 - @@ -2515,7 +2515,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2001 2003 - Mar 21 24:00 1:00 - @@ -2527,7 +2527,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2001 2003 - Sep 21 24:00 0 - @@ -2539,7 +2539,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2004 only - Mar 20 24:00 1:00 - @@ -2551,7 +2551,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2004 only - Sep 20 24:00 0 - @@ -2563,7 +2563,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2005 only - Mar 21 24:00 1:00 - @@ -2575,7 +2575,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2005 only - Sep 21 24:00 0 - @@ -2587,7 +2587,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2008 only - Mar 20 24:00 1:00 - @@ -2599,7 +2599,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2008 only - Sep 20 24:00 0 - @@ -2611,7 +2611,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2009 2011 - Mar 21 24:00 1:00 - @@ -2623,7 +2623,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2009 2011 - Sep 21 24:00 0 - @@ -2635,7 +2635,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2012 only - Mar 20 24:00 1:00 - @@ -2647,7 +2647,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2012 only - Sep 20 24:00 0 - @@ -2659,7 +2659,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2013 2015 - Mar 21 24:00 1:00 - @@ -2671,7 +2671,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2013 2015 - Sep 21 24:00 0 - @@ -2683,7 +2683,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2016 only - Mar 20 24:00 1:00 - @@ -2695,7 +2695,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2016 only - Sep 20 24:00 0 - @@ -2707,7 +2707,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2017 2019 - Mar 21 24:00 1:00 - @@ -2719,7 +2719,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2017 2019 - Sep 21 24:00 0 - @@ -2731,7 +2731,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2020 only - Mar 20 24:00 1:00 - @@ -2743,7 +2743,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2020 only - Sep 20 24:00 0 - @@ -2755,7 +2755,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2021 2023 - Mar 21 24:00 1:00 - @@ -2767,7 +2767,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2021 2023 - Sep 21 24:00 0 - @@ -2779,7 +2779,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2024 only - Mar 20 24:00 1:00 - @@ -2791,7 +2791,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2024 only - Sep 20 24:00 0 - @@ -2803,7 +2803,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2025 2027 - Mar 21 24:00 1:00 - @@ -2815,7 +2815,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2025 2027 - Sep 21 24:00 0 - @@ -2827,7 +2827,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2028 2029 - Mar 20 24:00 1:00 - @@ -2839,7 +2839,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2028 2029 - Sep 20 24:00 0 - @@ -2851,7 +2851,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2030 2031 - Mar 21 24:00 1:00 - @@ -2863,7 +2863,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2030 2031 - Sep 21 24:00 0 - @@ -2875,7 +2875,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2032 2033 - Mar 20 24:00 1:00 - @@ -2887,7 +2887,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2032 2033 - Sep 20 24:00 0 - @@ -2899,7 +2899,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2034 2035 - Mar 21 24:00 1:00 - @@ -2911,7 +2911,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2034 2035 - Sep 21 24:00 0 - @@ -2923,7 +2923,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2036 2037 - Mar 20 24:00 1:00 - @@ -2935,7 +2935,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2036 2037 - Sep 20 24:00 0 - @@ -2947,7 +2947,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2038 2039 - Mar 21 24:00 1:00 - @@ -2959,7 +2959,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2038 2039 - Sep 21 24:00 0 - @@ -2971,7 +2971,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2040 2041 - Mar 20 24:00 1:00 - @@ -2983,7 +2983,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2040 2041 - Sep 20 24:00 0 - @@ -2995,7 +2995,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2042 2043 - Mar 21 24:00 1:00 - @@ -3007,7 +3007,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2042 2043 - Sep 21 24:00 0 - @@ -3019,7 +3019,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2044 2045 - Mar 20 24:00 1:00 - @@ -3031,7 +3031,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2044 2045 - Sep 20 24:00 0 - @@ -3043,7 +3043,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2046 2047 - Mar 21 24:00 1:00 - @@ -3055,7 +3055,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2046 2047 - Sep 21 24:00 0 - @@ -3067,7 +3067,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2048 2049 - Mar 20 24:00 1:00 - @@ -3079,7 +3079,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2048 2049 - Sep 20 24:00 0 - @@ -3091,7 +3091,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iran 2050 2051 - Mar 21 24:00 1:00 - @@ -3103,7 +3103,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iran 2050 2051 - Sep 21 24:00 0 - @@ -3115,7 +3115,7 @@ static const basic::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -3147,7 +3147,7 @@ static const basic::ZoneRule kZoneRulesIraq[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Iraq 1991 2007 - Apr 1 3:00s 1:00 - @@ -3159,7 +3159,7 @@ static const basic::ZoneRule kZoneRulesIraq[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 12 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Iraq 1991 2007 - Oct 1 3:00s 0 - @@ -3171,7 +3171,7 @@ static const basic::ZoneRule kZoneRulesIraq[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 12 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -3203,7 +3203,7 @@ static const basic::ZoneRule kZoneRulesJapan[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 100 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -3235,7 +3235,7 @@ static const basic::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Jordan 1999 only - Jul 1 0:00s 1:00 S @@ -3247,7 +3247,7 @@ static const basic::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Jordan 1999 2002 - Sep lastFri 0:00s 0 - @@ -3259,7 +3259,7 @@ static const basic::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Jordan 2000 2001 - Mar lastThu 0:00s 1:00 S @@ -3271,7 +3271,7 @@ static const basic::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Jordan 2002 2012 - Mar lastThu 24:00 1:00 S @@ -3283,7 +3283,7 @@ static const basic::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Jordan 2003 only - Oct 24 0:00s 0 - @@ -3295,7 +3295,7 @@ static const basic::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 24 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Jordan 2004 only - Oct 15 0:00s 0 - @@ -3307,7 +3307,7 @@ static const basic::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Jordan 2005 only - Sep lastFri 0:00s 0 - @@ -3319,7 +3319,7 @@ static const basic::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 - @@ -3331,7 +3331,7 @@ static const basic::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Jordan 2013 only - Dec 20 0:00 0 - @@ -3343,7 +3343,7 @@ static const basic::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Jordan 2014 max - Mar lastThu 24:00 1:00 S @@ -3355,7 +3355,7 @@ static const basic::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Jordan 2014 max - Oct lastFri 0:00s 0 - @@ -3367,7 +3367,7 @@ static const basic::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -3399,7 +3399,7 @@ static const basic::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 2 /*deltaCode (deltaMinute=30/15)*/, + 2 /*deltaCode ((deltaMinutes=30)/15)*/, '-' /*letter*/, }, // Rule LH 1990 1995 - Mar Sun>=1 2:00 0 - @@ -3411,7 +3411,7 @@ static const basic::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule LH 1996 2005 - Mar lastSun 2:00 0 - @@ -3423,7 +3423,7 @@ static const basic::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule LH 2000 only - Aug lastSun 2:00 0:30 - @@ -3435,7 +3435,7 @@ static const basic::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 2 /*deltaCode (deltaMinute=30/15)*/, + 2 /*deltaCode ((deltaMinutes=30)/15)*/, '-' /*letter*/, }, // Rule LH 2001 2007 - Oct lastSun 2:00 0:30 - @@ -3447,7 +3447,7 @@ static const basic::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 2 /*deltaCode (deltaMinute=30/15)*/, + 2 /*deltaCode ((deltaMinutes=30)/15)*/, '-' /*letter*/, }, // Rule LH 2006 only - Apr Sun>=1 2:00 0 - @@ -3459,7 +3459,7 @@ static const basic::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule LH 2007 only - Mar lastSun 2:00 0 - @@ -3471,7 +3471,7 @@ static const basic::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule LH 2008 max - Apr Sun>=1 2:00 0 - @@ -3483,7 +3483,7 @@ static const basic::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule LH 2008 max - Oct Sun>=1 2:00 0:30 - @@ -3495,7 +3495,7 @@ static const basic::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 2 /*deltaCode (deltaMinute=30/15)*/, + 2 /*deltaCode ((deltaMinutes=30)/15)*/, '-' /*letter*/, }, @@ -3527,7 +3527,7 @@ static const basic::ZoneRule kZoneRulesLebanon[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Lebanon 1993 1998 - Sep lastSun 0:00 0 - @@ -3539,7 +3539,7 @@ static const basic::ZoneRule kZoneRulesLebanon[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Lebanon 1999 max - Oct lastSun 0:00 0 - @@ -3551,7 +3551,7 @@ static const basic::ZoneRule kZoneRulesLebanon[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -3583,7 +3583,7 @@ static const basic::ZoneRule kZoneRulesMacau[] ACE_TIME_PROGMEM = { 16 /*onDayOfMonth*/, 14 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -3615,7 +3615,7 @@ static const basic::ZoneRule kZoneRulesMauritius[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Mauritius 2008 only - Oct lastSun 2:00 1:00 - @@ -3627,7 +3627,7 @@ static const basic::ZoneRule kZoneRulesMauritius[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Mauritius 2009 only - Mar lastSun 2:00 0 - @@ -3639,7 +3639,7 @@ static const basic::ZoneRule kZoneRulesMauritius[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -3671,7 +3671,7 @@ static const basic::ZoneRule kZoneRulesMexico[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Mexico 1996 2000 - Apr Sun>=1 2:00 1:00 D @@ -3683,7 +3683,7 @@ static const basic::ZoneRule kZoneRulesMexico[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Mexico 1996 2000 - Oct lastSun 2:00 0 S @@ -3695,7 +3695,7 @@ static const basic::ZoneRule kZoneRulesMexico[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Mexico 2001 only - May Sun>=1 2:00 1:00 D @@ -3707,7 +3707,7 @@ static const basic::ZoneRule kZoneRulesMexico[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Mexico 2001 only - Sep lastSun 2:00 0 S @@ -3719,7 +3719,7 @@ static const basic::ZoneRule kZoneRulesMexico[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Mexico 2002 max - Apr Sun>=1 2:00 1:00 D @@ -3731,7 +3731,7 @@ static const basic::ZoneRule kZoneRulesMexico[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Mexico 2002 max - Oct lastSun 2:00 0 S @@ -3743,7 +3743,7 @@ static const basic::ZoneRule kZoneRulesMexico[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -3775,7 +3775,7 @@ static const basic::ZoneRule kZoneRulesMoldova[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Moldova 1997 max - Oct lastSun 3:00 0 - @@ -3787,7 +3787,7 @@ static const basic::ZoneRule kZoneRulesMoldova[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -3819,7 +3819,7 @@ static const basic::ZoneRule kZoneRulesMoncton[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Moncton 1993 2006 - Apr Sun>=1 0:01 1:00 D @@ -3831,7 +3831,7 @@ static const basic::ZoneRule kZoneRulesMoncton[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 1 /*atTimeModifier (kSuffixW + minute=1)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Moncton 1993 2006 - Oct lastSun 0:01 0 S @@ -3843,7 +3843,7 @@ static const basic::ZoneRule kZoneRulesMoncton[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 1 /*atTimeModifier (kSuffixW + minute=1)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -3875,7 +3875,7 @@ static const basic::ZoneRule kZoneRulesMongol[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Mongol 2001 only - Apr lastSat 2:00 1:00 - @@ -3887,7 +3887,7 @@ static const basic::ZoneRule kZoneRulesMongol[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Mongol 2001 2006 - Sep lastSat 2:00 0 - @@ -3899,7 +3899,7 @@ static const basic::ZoneRule kZoneRulesMongol[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Mongol 2002 2006 - Mar lastSat 2:00 1:00 - @@ -3911,7 +3911,7 @@ static const basic::ZoneRule kZoneRulesMongol[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Mongol 2015 2016 - Mar lastSat 2:00 1:00 - @@ -3923,7 +3923,7 @@ static const basic::ZoneRule kZoneRulesMongol[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Mongol 2015 2016 - Sep lastSat 0:00 0 - @@ -3935,7 +3935,7 @@ static const basic::ZoneRule kZoneRulesMongol[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -3967,7 +3967,7 @@ static const basic::ZoneRule kZoneRulesNC[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -3999,7 +3999,7 @@ static const basic::ZoneRule kZoneRulesNZ[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule NZ 1990 2006 - Oct Sun>=1 2:00s 1:00 D @@ -4011,7 +4011,7 @@ static const basic::ZoneRule kZoneRulesNZ[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule NZ 1990 2007 - Mar Sun>=15 2:00s 0 S @@ -4023,7 +4023,7 @@ static const basic::ZoneRule kZoneRulesNZ[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule NZ 2007 max - Sep lastSun 2:00s 1:00 D @@ -4035,7 +4035,7 @@ static const basic::ZoneRule kZoneRulesNZ[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule NZ 2008 max - Apr Sun>=1 2:00s 0 S @@ -4047,7 +4047,7 @@ static const basic::ZoneRule kZoneRulesNZ[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -4079,7 +4079,7 @@ static const basic::ZoneRule kZoneRulesNic[] ACE_TIME_PROGMEM = { 23 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Nic 2005 only - Apr 10 0:00 1:00 D @@ -4091,7 +4091,7 @@ static const basic::ZoneRule kZoneRulesNic[] ACE_TIME_PROGMEM = { 10 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Nic 2005 only - Oct Sun>=1 0:00 0 S @@ -4103,7 +4103,7 @@ static const basic::ZoneRule kZoneRulesNic[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Nic 2006 only - Apr 30 2:00 1:00 D @@ -4115,7 +4115,7 @@ static const basic::ZoneRule kZoneRulesNic[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Nic 2006 only - Oct Sun>=1 1:00 0 S @@ -4127,7 +4127,7 @@ static const basic::ZoneRule kZoneRulesNic[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -4159,7 +4159,7 @@ static const basic::ZoneRule kZoneRulesPRC[] ACE_TIME_PROGMEM = { 11 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -4191,7 +4191,7 @@ static const basic::ZoneRule kZoneRulesPakistan[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Pakistan 2002 only - Apr Sun>=2 0:00 1:00 S @@ -4203,7 +4203,7 @@ static const basic::ZoneRule kZoneRulesPakistan[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Pakistan 2002 only - Oct Sun>=2 0:00 0 - @@ -4215,7 +4215,7 @@ static const basic::ZoneRule kZoneRulesPakistan[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Pakistan 2008 only - Jun 1 0:00 1:00 S @@ -4227,7 +4227,7 @@ static const basic::ZoneRule kZoneRulesPakistan[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Pakistan 2008 2009 - Nov 1 0:00 0 - @@ -4239,7 +4239,7 @@ static const basic::ZoneRule kZoneRulesPakistan[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Pakistan 2009 only - Apr 15 0:00 1:00 S @@ -4251,7 +4251,7 @@ static const basic::ZoneRule kZoneRulesPakistan[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, @@ -4283,7 +4283,7 @@ static const basic::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Para 1997 only - Feb lastSun 0:00 0 - @@ -4295,7 +4295,7 @@ static const basic::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Para 1998 2001 - Mar Sun>=1 0:00 0 - @@ -4307,7 +4307,7 @@ static const basic::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Para 2002 2004 - Apr Sun>=1 0:00 0 - @@ -4319,7 +4319,7 @@ static const basic::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Para 2002 2003 - Sep Sun>=1 0:00 1:00 - @@ -4331,7 +4331,7 @@ static const basic::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Para 2004 2009 - Oct Sun>=15 0:00 1:00 - @@ -4343,7 +4343,7 @@ static const basic::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Para 2005 2009 - Mar Sun>=8 0:00 0 - @@ -4355,7 +4355,7 @@ static const basic::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Para 2010 max - Oct Sun>=1 0:00 1:00 - @@ -4367,7 +4367,7 @@ static const basic::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Para 2010 2012 - Apr Sun>=8 0:00 0 - @@ -4379,7 +4379,7 @@ static const basic::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Para 2013 max - Mar Sun>=22 0:00 0 - @@ -4391,7 +4391,7 @@ static const basic::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -4423,7 +4423,7 @@ static const basic::ZoneRule kZoneRulesPeru[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -4455,7 +4455,7 @@ static const basic::ZoneRule kZoneRulesPhil[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -4487,7 +4487,7 @@ static const basic::ZoneRule kZoneRulesROK[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -4519,7 +4519,7 @@ static const basic::ZoneRule kZoneRulesRussiaAsia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule RussiaAsia 1985 2010 - Mar lastSun 2:00s 1:00 - @@ -4531,7 +4531,7 @@ static const basic::ZoneRule kZoneRulesRussiaAsia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule RussiaAsia 1996 2010 - Oct lastSun 2:00s 0 - @@ -4543,7 +4543,7 @@ static const basic::ZoneRule kZoneRulesRussiaAsia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -4575,7 +4575,7 @@ static const basic::ZoneRule kZoneRulesSA[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -4607,7 +4607,7 @@ static const basic::ZoneRule kZoneRulesSalv[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -4639,7 +4639,7 @@ static const basic::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Syria 1997 1998 - Mar lastMon 0:00 1:00 S @@ -4651,7 +4651,7 @@ static const basic::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Syria 1999 2006 - Apr 1 0:00 1:00 S @@ -4663,7 +4663,7 @@ static const basic::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Syria 2006 only - Sep 22 0:00 0 - @@ -4675,7 +4675,7 @@ static const basic::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Syria 2007 only - Mar lastFri 0:00 1:00 S @@ -4687,7 +4687,7 @@ static const basic::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Syria 2007 only - Nov Fri>=1 0:00 0 - @@ -4699,7 +4699,7 @@ static const basic::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S @@ -4711,7 +4711,7 @@ static const basic::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Syria 2008 only - Nov 1 0:00 0 - @@ -4723,7 +4723,7 @@ static const basic::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Syria 2009 only - Mar lastFri 0:00 1:00 S @@ -4735,7 +4735,7 @@ static const basic::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Syria 2010 2011 - Apr Fri>=1 0:00 1:00 S @@ -4747,7 +4747,7 @@ static const basic::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Syria 2012 max - Mar lastFri 0:00 1:00 S @@ -4759,7 +4759,7 @@ static const basic::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Syria 2009 max - Oct lastFri 0:00 0 - @@ -4771,7 +4771,7 @@ static const basic::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -4803,7 +4803,7 @@ static const basic::ZoneRule kZoneRulesTaiwan[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -4835,7 +4835,7 @@ static const basic::ZoneRule kZoneRulesThule[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Thule 1993 2006 - Apr Sun>=1 2:00 1:00 D @@ -4847,7 +4847,7 @@ static const basic::ZoneRule kZoneRulesThule[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Thule 1993 2006 - Oct lastSun 2:00 0 S @@ -4859,7 +4859,7 @@ static const basic::ZoneRule kZoneRulesThule[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Thule 2007 max - Mar Sun>=8 2:00 1:00 D @@ -4871,7 +4871,7 @@ static const basic::ZoneRule kZoneRulesThule[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Thule 2007 max - Nov Sun>=1 2:00 0 S @@ -4883,7 +4883,7 @@ static const basic::ZoneRule kZoneRulesThule[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -4915,7 +4915,7 @@ static const basic::ZoneRule kZoneRulesTonga[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Tonga 1999 only - Oct 7 2:00s 1:00 - @@ -4927,7 +4927,7 @@ static const basic::ZoneRule kZoneRulesTonga[] ACE_TIME_PROGMEM = { 7 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Tonga 2000 only - Mar 19 2:00s 0 - @@ -4939,7 +4939,7 @@ static const basic::ZoneRule kZoneRulesTonga[] ACE_TIME_PROGMEM = { 19 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Tonga 2000 2001 - Nov Sun>=1 2:00 1:00 - @@ -4951,7 +4951,7 @@ static const basic::ZoneRule kZoneRulesTonga[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Tonga 2001 2002 - Jan lastSun 2:00 0 - @@ -4963,7 +4963,7 @@ static const basic::ZoneRule kZoneRulesTonga[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Tonga 2016 only - Nov Sun>=1 2:00 1:00 - @@ -4975,7 +4975,7 @@ static const basic::ZoneRule kZoneRulesTonga[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Tonga 2017 only - Jan Sun>=15 3:00 0 - @@ -4987,7 +4987,7 @@ static const basic::ZoneRule kZoneRulesTonga[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -5019,7 +5019,7 @@ static const basic::ZoneRule kZoneRulesTunisia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Tunisia 2005 only - May 1 0:00s 1:00 S @@ -5031,7 +5031,7 @@ static const basic::ZoneRule kZoneRulesTunisia[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Tunisia 2005 only - Sep 30 1:00s 0 - @@ -5043,7 +5043,7 @@ static const basic::ZoneRule kZoneRulesTunisia[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 4 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Tunisia 2006 2008 - Mar lastSun 2:00s 1:00 S @@ -5055,7 +5055,7 @@ static const basic::ZoneRule kZoneRulesTunisia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'S' /*letter*/, }, // Rule Tunisia 2006 2008 - Oct lastSun 2:00s 0 - @@ -5067,7 +5067,7 @@ static const basic::ZoneRule kZoneRulesTunisia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -5099,7 +5099,7 @@ static const basic::ZoneRule kZoneRulesUS[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule US 1976 1986 - Apr lastSun 2:00 1:00 D @@ -5111,7 +5111,7 @@ static const basic::ZoneRule kZoneRulesUS[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule US 1987 2006 - Apr Sun>=1 2:00 1:00 D @@ -5123,7 +5123,7 @@ static const basic::ZoneRule kZoneRulesUS[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule US 2007 max - Mar Sun>=8 2:00 1:00 D @@ -5135,7 +5135,7 @@ static const basic::ZoneRule kZoneRulesUS[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule US 2007 max - Nov Sun>=1 2:00 0 S @@ -5147,7 +5147,7 @@ static const basic::ZoneRule kZoneRulesUS[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, @@ -5179,7 +5179,7 @@ static const basic::ZoneRule kZoneRulesUruguay[] ACE_TIME_PROGMEM = { 28 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Uruguay 2004 only - Sep 19 0:00 1:00 - @@ -5191,7 +5191,7 @@ static const basic::ZoneRule kZoneRulesUruguay[] ACE_TIME_PROGMEM = { 19 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Uruguay 2005 only - Mar 27 2:00 0 - @@ -5203,7 +5203,7 @@ static const basic::ZoneRule kZoneRulesUruguay[] ACE_TIME_PROGMEM = { 27 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Uruguay 2005 only - Oct 9 2:00 1:00 - @@ -5215,7 +5215,7 @@ static const basic::ZoneRule kZoneRulesUruguay[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, // Rule Uruguay 2006 2015 - Mar Sun>=8 2:00 0 - @@ -5227,7 +5227,7 @@ static const basic::ZoneRule kZoneRulesUruguay[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, // Rule Uruguay 2006 2014 - Oct Sun>=1 2:00 1:00 - @@ -5239,7 +5239,7 @@ static const basic::ZoneRule kZoneRulesUruguay[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, '-' /*letter*/, }, @@ -5271,7 +5271,7 @@ static const basic::ZoneRule kZoneRulesVanuatu[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, '-' /*letter*/, }, @@ -5303,7 +5303,7 @@ static const basic::ZoneRule kZoneRulesWinn[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Winn 1966 2005 - Oct lastSun 2:00s 0 S @@ -5315,7 +5315,7 @@ static const basic::ZoneRule kZoneRulesWinn[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Winn 1987 2005 - Apr Sun>=1 2:00s 1:00 D @@ -5327,7 +5327,7 @@ static const basic::ZoneRule kZoneRulesWinn[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, @@ -5359,7 +5359,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 6 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Zion 1999 only - Apr 2 2:00 1:00 D @@ -5371,7 +5371,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Zion 1999 only - Sep 3 2:00 0 S @@ -5383,7 +5383,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 3 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Zion 2000 only - Apr 14 2:00 1:00 D @@ -5395,7 +5395,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 14 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Zion 2000 only - Oct 6 1:00 0 S @@ -5407,7 +5407,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 6 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Zion 2001 only - Apr 9 1:00 1:00 D @@ -5419,7 +5419,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Zion 2001 only - Sep 24 1:00 0 S @@ -5431,7 +5431,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 24 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Zion 2002 only - Mar 29 1:00 1:00 D @@ -5443,7 +5443,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 29 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Zion 2002 only - Oct 7 1:00 0 S @@ -5455,7 +5455,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 7 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Zion 2003 only - Mar 28 1:00 1:00 D @@ -5467,7 +5467,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 28 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Zion 2003 only - Oct 3 1:00 0 S @@ -5479,7 +5479,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 3 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Zion 2004 only - Apr 7 1:00 1:00 D @@ -5491,7 +5491,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 7 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Zion 2004 only - Sep 22 1:00 0 S @@ -5503,7 +5503,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Zion 2005 2012 - Apr Fri<=1 2:00 1:00 D @@ -5515,7 +5515,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { -1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Zion 2005 only - Oct 9 2:00 0 S @@ -5527,7 +5527,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Zion 2006 only - Oct 1 2:00 0 S @@ -5539,7 +5539,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Zion 2007 only - Sep 16 2:00 0 S @@ -5551,7 +5551,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 16 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Zion 2008 only - Oct 5 2:00 0 S @@ -5563,7 +5563,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 5 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Zion 2009 only - Sep 27 2:00 0 S @@ -5575,7 +5575,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 27 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Zion 2010 only - Sep 12 2:00 0 S @@ -5587,7 +5587,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 12 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Zion 2011 only - Oct 2 2:00 0 S @@ -5599,7 +5599,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Zion 2012 only - Sep 23 2:00 0 S @@ -5611,7 +5611,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 23 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, // Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D @@ -5623,7 +5623,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 23 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=60/15)*/, + 4 /*deltaCode ((deltaMinutes=60)/15)*/, 'D' /*letter*/, }, // Rule Zion 2013 max - Oct lastSun 2:00 0 S @@ -5635,7 +5635,7 @@ static const basic::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=0/15)*/, + 0 /*deltaCode ((deltaMinutes=0)/15)*/, 'S' /*letter*/, }, diff --git a/src/ace_time/zonedbx/zone_infos.cpp b/src/ace_time/zonedbx/zone_infos.cpp index 87bc45e96..5ed3f4587 100644 --- a/src/ace_time/zonedbx/zone_infos.cpp +++ b/src/ace_time/zonedbx/zone_infos.cpp @@ -99,7 +99,7 @@ static const extended::ZoneEra kZoneEraAfrica_Abidjan[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "GMT" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -133,7 +133,7 @@ static const extended::ZoneEra kZoneEraAfrica_Accra[] ACE_TIME_PROGMEM = { &kPolicyGhana /*zonePolicy*/, "%" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -167,7 +167,7 @@ static const extended::ZoneEra kZoneEraAfrica_Algiers[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "CET" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -201,7 +201,7 @@ static const extended::ZoneEra kZoneEraAfrica_Bissau[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "GMT" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -235,7 +235,7 @@ static const extended::ZoneEra kZoneEraAfrica_Cairo[] ACE_TIME_PROGMEM = { &kPolicyEgypt /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -269,7 +269,7 @@ static const extended::ZoneEra kZoneEraAfrica_Casablanca[] ACE_TIME_PROGMEM = { &kPolicyMorocco /*zonePolicy*/, "+00/+01" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 18 /*untilYearTiny*/, 10 /*untilMonth*/, 28 /*untilDay*/, @@ -281,7 +281,7 @@ static const extended::ZoneEra kZoneEraAfrica_Casablanca[] ACE_TIME_PROGMEM = { &kPolicyMorocco /*zonePolicy*/, "+01/+00" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -315,7 +315,7 @@ static const extended::ZoneEra kZoneEraAfrica_Ceuta[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -349,7 +349,7 @@ static const extended::ZoneEra kZoneEraAfrica_El_Aaiun[] ACE_TIME_PROGMEM = { &kPolicyMorocco /*zonePolicy*/, "+00/+01" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 18 /*untilYearTiny*/, 10 /*untilMonth*/, 28 /*untilDay*/, @@ -361,7 +361,7 @@ static const extended::ZoneEra kZoneEraAfrica_El_Aaiun[] ACE_TIME_PROGMEM = { &kPolicyMorocco /*zonePolicy*/, "+01/+00" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -395,7 +395,7 @@ static const extended::ZoneEra kZoneEraAfrica_Johannesburg[] ACE_TIME_PROGMEM = &kPolicySA /*zonePolicy*/, "SAST" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -429,7 +429,7 @@ static const extended::ZoneEra kZoneEraAfrica_Juba[] ACE_TIME_PROGMEM = { &kPolicySudan /*zonePolicy*/, "CA%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 1 /*untilMonth*/, 15 /*untilDay*/, @@ -441,7 +441,7 @@ static const extended::ZoneEra kZoneEraAfrica_Juba[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EAT" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -475,7 +475,7 @@ static const extended::ZoneEra kZoneEraAfrica_Khartoum[] ACE_TIME_PROGMEM = { &kPolicySudan /*zonePolicy*/, "CA%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 1 /*untilMonth*/, 15 /*untilDay*/, @@ -487,7 +487,7 @@ static const extended::ZoneEra kZoneEraAfrica_Khartoum[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EAT" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 17 /*untilYearTiny*/, 11 /*untilMonth*/, 1 /*untilDay*/, @@ -499,7 +499,7 @@ static const extended::ZoneEra kZoneEraAfrica_Khartoum[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "CAT" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -533,7 +533,7 @@ static const extended::ZoneEra kZoneEraAfrica_Lagos[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "WAT" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -567,7 +567,7 @@ static const extended::ZoneEra kZoneEraAfrica_Maputo[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "CAT" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -601,7 +601,7 @@ static const extended::ZoneEra kZoneEraAfrica_Monrovia[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "GMT" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -635,7 +635,7 @@ static const extended::ZoneEra kZoneEraAfrica_Nairobi[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EAT" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -669,7 +669,7 @@ static const extended::ZoneEra kZoneEraAfrica_Ndjamena[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "WAT" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -703,7 +703,7 @@ static const extended::ZoneEra kZoneEraAfrica_Sao_Tome[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "GMT" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 18 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -715,7 +715,7 @@ static const extended::ZoneEra kZoneEraAfrica_Sao_Tome[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "WAT" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 19 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -727,7 +727,7 @@ static const extended::ZoneEra kZoneEraAfrica_Sao_Tome[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "GMT" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -761,7 +761,7 @@ static const extended::ZoneEra kZoneEraAfrica_Tripoli[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EET" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 12 /*untilYearTiny*/, 11 /*untilMonth*/, 10 /*untilDay*/, @@ -773,7 +773,7 @@ static const extended::ZoneEra kZoneEraAfrica_Tripoli[] ACE_TIME_PROGMEM = { &kPolicyLibya /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 13 /*untilYearTiny*/, 10 /*untilMonth*/, 25 /*untilDay*/, @@ -785,7 +785,7 @@ static const extended::ZoneEra kZoneEraAfrica_Tripoli[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EET" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -819,7 +819,7 @@ static const extended::ZoneEra kZoneEraAfrica_Tunis[] ACE_TIME_PROGMEM = { &kPolicyTunisia /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -853,7 +853,7 @@ static const extended::ZoneEra kZoneEraAfrica_Windhoek[] ACE_TIME_PROGMEM = { &kPolicyNamibia /*zonePolicy*/, "%" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -887,7 +887,7 @@ static const extended::ZoneEra kZoneEraAmerica_Adak[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "H%T" /*format*/, -40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -921,7 +921,7 @@ static const extended::ZoneEra kZoneEraAmerica_Anchorage[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "AK%T" /*format*/, -36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -955,7 +955,7 @@ static const extended::ZoneEra kZoneEraAmerica_Araguaina[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 3 /*untilYearTiny*/, 9 /*untilMonth*/, 24 /*untilDay*/, @@ -967,7 +967,7 @@ static const extended::ZoneEra kZoneEraAmerica_Araguaina[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 12 /*untilYearTiny*/, 10 /*untilMonth*/, 21 /*untilDay*/, @@ -979,7 +979,7 @@ static const extended::ZoneEra kZoneEraAmerica_Araguaina[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 13 /*untilYearTiny*/, 9 /*untilMonth*/, 1 /*untilDay*/, @@ -991,7 +991,7 @@ static const extended::ZoneEra kZoneEraAmerica_Araguaina[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1025,7 +1025,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Buenos_Aires[] ACE_TIME &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 3 /*untilDay*/, @@ -1037,7 +1037,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Buenos_Aires[] ACE_TIME &kPolicyArg /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 3 /*untilMonth*/, 3 /*untilDay*/, @@ -1049,7 +1049,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Buenos_Aires[] ACE_TIME &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1083,7 +1083,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Catamarca[] ACE_TIME_PR &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 3 /*untilDay*/, @@ -1095,7 +1095,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Catamarca[] ACE_TIME_PR &kPolicyArg /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 3 /*untilMonth*/, 3 /*untilDay*/, @@ -1107,7 +1107,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Catamarca[] ACE_TIME_PR nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 6 /*untilMonth*/, 1 /*untilDay*/, @@ -1119,7 +1119,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Catamarca[] ACE_TIME_PR nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 6 /*untilMonth*/, 20 /*untilDay*/, @@ -1131,7 +1131,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Catamarca[] ACE_TIME_PR &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 8 /*untilYearTiny*/, 10 /*untilMonth*/, 18 /*untilDay*/, @@ -1143,7 +1143,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Catamarca[] ACE_TIME_PR nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1177,7 +1177,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Cordoba[] ACE_TIME_PROG &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 3 /*untilDay*/, @@ -1189,7 +1189,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Cordoba[] ACE_TIME_PROG &kPolicyArg /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 3 /*untilMonth*/, 3 /*untilDay*/, @@ -1201,7 +1201,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Cordoba[] ACE_TIME_PROG &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1235,7 +1235,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Jujuy[] ACE_TIME_PROGME &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 3 /*untilDay*/, @@ -1247,7 +1247,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Jujuy[] ACE_TIME_PROGME &kPolicyArg /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 3 /*untilMonth*/, 3 /*untilDay*/, @@ -1259,7 +1259,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Jujuy[] ACE_TIME_PROGME &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 8 /*untilYearTiny*/, 10 /*untilMonth*/, 18 /*untilDay*/, @@ -1271,7 +1271,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Jujuy[] ACE_TIME_PROGME nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1305,7 +1305,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_La_Rioja[] ACE_TIME_PRO &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 3 /*untilDay*/, @@ -1317,7 +1317,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_La_Rioja[] ACE_TIME_PRO &kPolicyArg /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 3 /*untilMonth*/, 3 /*untilDay*/, @@ -1329,7 +1329,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_La_Rioja[] ACE_TIME_PRO nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 6 /*untilMonth*/, 1 /*untilDay*/, @@ -1341,7 +1341,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_La_Rioja[] ACE_TIME_PRO nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 6 /*untilMonth*/, 20 /*untilDay*/, @@ -1353,7 +1353,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_La_Rioja[] ACE_TIME_PRO &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 8 /*untilYearTiny*/, 10 /*untilMonth*/, 18 /*untilDay*/, @@ -1365,7 +1365,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_La_Rioja[] ACE_TIME_PRO nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1399,7 +1399,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Mendoza[] ACE_TIME_PROG &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 3 /*untilDay*/, @@ -1411,7 +1411,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Mendoza[] ACE_TIME_PROG &kPolicyArg /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 3 /*untilMonth*/, 3 /*untilDay*/, @@ -1423,7 +1423,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Mendoza[] ACE_TIME_PROG nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 5 /*untilMonth*/, 23 /*untilDay*/, @@ -1435,7 +1435,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Mendoza[] ACE_TIME_PROG nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 9 /*untilMonth*/, 26 /*untilDay*/, @@ -1447,7 +1447,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Mendoza[] ACE_TIME_PROG &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 8 /*untilYearTiny*/, 10 /*untilMonth*/, 18 /*untilDay*/, @@ -1459,7 +1459,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Mendoza[] ACE_TIME_PROG nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1493,7 +1493,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Rio_Gallegos[] ACE_TIME &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 3 /*untilDay*/, @@ -1505,7 +1505,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Rio_Gallegos[] ACE_TIME &kPolicyArg /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 3 /*untilMonth*/, 3 /*untilDay*/, @@ -1517,7 +1517,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Rio_Gallegos[] ACE_TIME nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 6 /*untilMonth*/, 1 /*untilDay*/, @@ -1529,7 +1529,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Rio_Gallegos[] ACE_TIME nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 6 /*untilMonth*/, 20 /*untilDay*/, @@ -1541,7 +1541,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Rio_Gallegos[] ACE_TIME &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 8 /*untilYearTiny*/, 10 /*untilMonth*/, 18 /*untilDay*/, @@ -1553,7 +1553,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Rio_Gallegos[] ACE_TIME nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1587,7 +1587,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Salta[] ACE_TIME_PROGME &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 3 /*untilDay*/, @@ -1599,7 +1599,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Salta[] ACE_TIME_PROGME &kPolicyArg /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 3 /*untilMonth*/, 3 /*untilDay*/, @@ -1611,7 +1611,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Salta[] ACE_TIME_PROGME &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 8 /*untilYearTiny*/, 10 /*untilMonth*/, 18 /*untilDay*/, @@ -1623,7 +1623,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Salta[] ACE_TIME_PROGME nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1657,7 +1657,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Juan[] ACE_TIME_PRO &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 3 /*untilDay*/, @@ -1669,7 +1669,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Juan[] ACE_TIME_PRO &kPolicyArg /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 3 /*untilMonth*/, 3 /*untilDay*/, @@ -1681,7 +1681,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Juan[] ACE_TIME_PRO nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 5 /*untilMonth*/, 31 /*untilDay*/, @@ -1693,7 +1693,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Juan[] ACE_TIME_PRO nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 7 /*untilMonth*/, 25 /*untilDay*/, @@ -1705,7 +1705,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Juan[] ACE_TIME_PRO &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 8 /*untilYearTiny*/, 10 /*untilMonth*/, 18 /*untilDay*/, @@ -1717,7 +1717,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Juan[] ACE_TIME_PRO nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1751,7 +1751,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Luis[] ACE_TIME_PRO nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 3 /*untilDay*/, @@ -1763,7 +1763,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Luis[] ACE_TIME_PRO nullptr /*zonePolicy*/, "-03" /*format*/, -16 /*offsetCode*/, - 8 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=60/15 + 4))*/, + 8 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=60)/15 + 4))*/, 0 /*untilYearTiny*/, 3 /*untilMonth*/, 3 /*untilDay*/, @@ -1775,7 +1775,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Luis[] ACE_TIME_PRO nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 5 /*untilMonth*/, 31 /*untilDay*/, @@ -1787,7 +1787,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Luis[] ACE_TIME_PRO nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 7 /*untilMonth*/, 25 /*untilDay*/, @@ -1799,7 +1799,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Luis[] ACE_TIME_PRO &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 8 /*untilYearTiny*/, 1 /*untilMonth*/, 21 /*untilDay*/, @@ -1811,7 +1811,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Luis[] ACE_TIME_PRO &kPolicySanLuis /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 9 /*untilYearTiny*/, 10 /*untilMonth*/, 11 /*untilDay*/, @@ -1823,7 +1823,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_San_Luis[] ACE_TIME_PRO nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1857,7 +1857,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Tucuman[] ACE_TIME_PROG &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 3 /*untilDay*/, @@ -1869,7 +1869,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Tucuman[] ACE_TIME_PROG &kPolicyArg /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 3 /*untilMonth*/, 3 /*untilDay*/, @@ -1881,7 +1881,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Tucuman[] ACE_TIME_PROG nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 6 /*untilMonth*/, 1 /*untilDay*/, @@ -1893,7 +1893,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Tucuman[] ACE_TIME_PROG nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 6 /*untilMonth*/, 13 /*untilDay*/, @@ -1905,7 +1905,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Tucuman[] ACE_TIME_PROG &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -1939,7 +1939,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Ushuaia[] ACE_TIME_PROG &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 3 /*untilDay*/, @@ -1951,7 +1951,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Ushuaia[] ACE_TIME_PROG &kPolicyArg /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 3 /*untilMonth*/, 3 /*untilDay*/, @@ -1963,7 +1963,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Ushuaia[] ACE_TIME_PROG nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 5 /*untilMonth*/, 30 /*untilDay*/, @@ -1975,7 +1975,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Ushuaia[] ACE_TIME_PROG nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 6 /*untilMonth*/, 20 /*untilDay*/, @@ -1987,7 +1987,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Ushuaia[] ACE_TIME_PROG &kPolicyArg /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 8 /*untilYearTiny*/, 10 /*untilMonth*/, 18 /*untilDay*/, @@ -1999,7 +1999,7 @@ static const extended::ZoneEra kZoneEraAmerica_Argentina_Ushuaia[] ACE_TIME_PROG nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2033,7 +2033,7 @@ static const extended::ZoneEra kZoneEraAmerica_Asuncion[] ACE_TIME_PROGMEM = { &kPolicyPara /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2067,7 +2067,7 @@ static const extended::ZoneEra kZoneEraAmerica_Atikokan[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2101,7 +2101,7 @@ static const extended::ZoneEra kZoneEraAmerica_Bahia[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 3 /*untilYearTiny*/, 9 /*untilMonth*/, 24 /*untilDay*/, @@ -2113,7 +2113,7 @@ static const extended::ZoneEra kZoneEraAmerica_Bahia[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 10 /*untilMonth*/, 16 /*untilDay*/, @@ -2125,7 +2125,7 @@ static const extended::ZoneEra kZoneEraAmerica_Bahia[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 12 /*untilYearTiny*/, 10 /*untilMonth*/, 21 /*untilDay*/, @@ -2137,7 +2137,7 @@ static const extended::ZoneEra kZoneEraAmerica_Bahia[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2171,7 +2171,7 @@ static const extended::ZoneEra kZoneEraAmerica_Bahia_Banderas[] ACE_TIME_PROGMEM &kPolicyMexico /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 10 /*untilYearTiny*/, 4 /*untilMonth*/, 4 /*untilDay*/, @@ -2183,7 +2183,7 @@ static const extended::ZoneEra kZoneEraAmerica_Bahia_Banderas[] ACE_TIME_PROGMEM &kPolicyMexico /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2217,7 +2217,7 @@ static const extended::ZoneEra kZoneEraAmerica_Barbados[] ACE_TIME_PROGMEM = { &kPolicyBarb /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2251,7 +2251,7 @@ static const extended::ZoneEra kZoneEraAmerica_Belem[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2285,7 +2285,7 @@ static const extended::ZoneEra kZoneEraAmerica_Belize[] ACE_TIME_PROGMEM = { &kPolicyBelize /*zonePolicy*/, "%" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2319,7 +2319,7 @@ static const extended::ZoneEra kZoneEraAmerica_Blanc_Sablon[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "AST" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2353,7 +2353,7 @@ static const extended::ZoneEra kZoneEraAmerica_Boa_Vista[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 9 /*untilMonth*/, 30 /*untilDay*/, @@ -2365,7 +2365,7 @@ static const extended::ZoneEra kZoneEraAmerica_Boa_Vista[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 10 /*untilMonth*/, 15 /*untilDay*/, @@ -2377,7 +2377,7 @@ static const extended::ZoneEra kZoneEraAmerica_Boa_Vista[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2411,7 +2411,7 @@ static const extended::ZoneEra kZoneEraAmerica_Bogota[] ACE_TIME_PROGMEM = { &kPolicyCO /*zonePolicy*/, "-05/-04" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2445,7 +2445,7 @@ static const extended::ZoneEra kZoneEraAmerica_Boise[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2479,7 +2479,7 @@ static const extended::ZoneEra kZoneEraAmerica_Cambridge_Bay[] ACE_TIME_PROGMEM &kPolicyNT_YK /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 31 /*untilDay*/, @@ -2491,7 +2491,7 @@ static const extended::ZoneEra kZoneEraAmerica_Cambridge_Bay[] ACE_TIME_PROGMEM &kPolicyCanada /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 10 /*untilMonth*/, 29 /*untilDay*/, @@ -2503,7 +2503,7 @@ static const extended::ZoneEra kZoneEraAmerica_Cambridge_Bay[] ACE_TIME_PROGMEM nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 11 /*untilMonth*/, 5 /*untilDay*/, @@ -2515,7 +2515,7 @@ static const extended::ZoneEra kZoneEraAmerica_Cambridge_Bay[] ACE_TIME_PROGMEM nullptr /*zonePolicy*/, "CST" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 1 /*untilYearTiny*/, 4 /*untilMonth*/, 1 /*untilDay*/, @@ -2527,7 +2527,7 @@ static const extended::ZoneEra kZoneEraAmerica_Cambridge_Bay[] ACE_TIME_PROGMEM &kPolicyCanada /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2561,7 +2561,7 @@ static const extended::ZoneEra kZoneEraAmerica_Campo_Grande[] ACE_TIME_PROGMEM = &kPolicyBrazil /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2595,7 +2595,7 @@ static const extended::ZoneEra kZoneEraAmerica_Cancun[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 15 /*untilYearTiny*/, 2 /*untilMonth*/, 1 /*untilDay*/, @@ -2607,7 +2607,7 @@ static const extended::ZoneEra kZoneEraAmerica_Cancun[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2641,7 +2641,7 @@ static const extended::ZoneEra kZoneEraAmerica_Caracas[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 7 /*untilYearTiny*/, 12 /*untilMonth*/, 9 /*untilDay*/, @@ -2653,7 +2653,7 @@ static const extended::ZoneEra kZoneEraAmerica_Caracas[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-0430" /*format*/, -18 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 16 /*untilYearTiny*/, 5 /*untilMonth*/, 1 /*untilDay*/, @@ -2665,7 +2665,7 @@ static const extended::ZoneEra kZoneEraAmerica_Caracas[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2699,7 +2699,7 @@ static const extended::ZoneEra kZoneEraAmerica_Cayenne[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2733,7 +2733,7 @@ static const extended::ZoneEra kZoneEraAmerica_Chicago[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2767,7 +2767,7 @@ static const extended::ZoneEra kZoneEraAmerica_Chihuahua[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2801,7 +2801,7 @@ static const extended::ZoneEra kZoneEraAmerica_Costa_Rica[] ACE_TIME_PROGMEM = { &kPolicyCR /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2835,7 +2835,7 @@ static const extended::ZoneEra kZoneEraAmerica_Creston[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "MST" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2869,7 +2869,7 @@ static const extended::ZoneEra kZoneEraAmerica_Cuiaba[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 3 /*untilYearTiny*/, 9 /*untilMonth*/, 24 /*untilDay*/, @@ -2881,7 +2881,7 @@ static const extended::ZoneEra kZoneEraAmerica_Cuiaba[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 10 /*untilMonth*/, 1 /*untilDay*/, @@ -2893,7 +2893,7 @@ static const extended::ZoneEra kZoneEraAmerica_Cuiaba[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2927,7 +2927,7 @@ static const extended::ZoneEra kZoneEraAmerica_Curacao[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "AST" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2961,7 +2961,7 @@ static const extended::ZoneEra kZoneEraAmerica_Danmarkshavn[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "GMT" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -2995,7 +2995,7 @@ static const extended::ZoneEra kZoneEraAmerica_Dawson[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "P%T" /*format*/, -32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 20 /*untilYearTiny*/, 11 /*untilMonth*/, 1 /*untilDay*/, @@ -3007,7 +3007,7 @@ static const extended::ZoneEra kZoneEraAmerica_Dawson[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "MST" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3041,7 +3041,7 @@ static const extended::ZoneEra kZoneEraAmerica_Dawson_Creek[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "MST" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3075,7 +3075,7 @@ static const extended::ZoneEra kZoneEraAmerica_Denver[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3109,7 +3109,7 @@ static const extended::ZoneEra kZoneEraAmerica_Detroit[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3143,7 +3143,7 @@ static const extended::ZoneEra kZoneEraAmerica_Edmonton[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3177,7 +3177,7 @@ static const extended::ZoneEra kZoneEraAmerica_Eirunepe[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-05" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 8 /*untilYearTiny*/, 6 /*untilMonth*/, 24 /*untilDay*/, @@ -3189,7 +3189,7 @@ static const extended::ZoneEra kZoneEraAmerica_Eirunepe[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 13 /*untilYearTiny*/, 11 /*untilMonth*/, 10 /*untilDay*/, @@ -3201,7 +3201,7 @@ static const extended::ZoneEra kZoneEraAmerica_Eirunepe[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-05" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3235,7 +3235,7 @@ static const extended::ZoneEra kZoneEraAmerica_El_Salvador[] ACE_TIME_PROGMEM = &kPolicySalv /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3269,7 +3269,7 @@ static const extended::ZoneEra kZoneEraAmerica_Fort_Nelson[] ACE_TIME_PROGMEM = &kPolicyCanada /*zonePolicy*/, "P%T" /*format*/, -32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 15 /*untilYearTiny*/, 3 /*untilMonth*/, 8 /*untilDay*/, @@ -3281,7 +3281,7 @@ static const extended::ZoneEra kZoneEraAmerica_Fort_Nelson[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "MST" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3315,7 +3315,7 @@ static const extended::ZoneEra kZoneEraAmerica_Fortaleza[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 9 /*untilMonth*/, 30 /*untilDay*/, @@ -3327,7 +3327,7 @@ static const extended::ZoneEra kZoneEraAmerica_Fortaleza[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 10 /*untilMonth*/, 22 /*untilDay*/, @@ -3339,7 +3339,7 @@ static const extended::ZoneEra kZoneEraAmerica_Fortaleza[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 1 /*untilYearTiny*/, 9 /*untilMonth*/, 13 /*untilDay*/, @@ -3351,7 +3351,7 @@ static const extended::ZoneEra kZoneEraAmerica_Fortaleza[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 2 /*untilYearTiny*/, 10 /*untilMonth*/, 1 /*untilDay*/, @@ -3363,7 +3363,7 @@ static const extended::ZoneEra kZoneEraAmerica_Fortaleza[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3397,7 +3397,7 @@ static const extended::ZoneEra kZoneEraAmerica_Glace_Bay[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3431,7 +3431,7 @@ static const extended::ZoneEra kZoneEraAmerica_Goose_Bay[] ACE_TIME_PROGMEM = { &kPolicyStJohns /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 11 /*untilMonth*/, 1 /*untilDay*/, @@ -3443,7 +3443,7 @@ static const extended::ZoneEra kZoneEraAmerica_Goose_Bay[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3477,7 +3477,7 @@ static const extended::ZoneEra kZoneEraAmerica_Grand_Turk[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 15 /*untilYearTiny*/, 3 /*untilMonth*/, 8 /*untilDay*/, @@ -3489,7 +3489,7 @@ static const extended::ZoneEra kZoneEraAmerica_Grand_Turk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "AST" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 18 /*untilYearTiny*/, 3 /*untilMonth*/, 11 /*untilDay*/, @@ -3501,7 +3501,7 @@ static const extended::ZoneEra kZoneEraAmerica_Grand_Turk[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3535,7 +3535,7 @@ static const extended::ZoneEra kZoneEraAmerica_Guatemala[] ACE_TIME_PROGMEM = { &kPolicyGuat /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3569,7 +3569,7 @@ static const extended::ZoneEra kZoneEraAmerica_Guayaquil[] ACE_TIME_PROGMEM = { &kPolicyEcuador /*zonePolicy*/, "-05/-04" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3603,7 +3603,7 @@ static const extended::ZoneEra kZoneEraAmerica_Guyana[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3637,7 +3637,7 @@ static const extended::ZoneEra kZoneEraAmerica_Halifax[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3671,7 +3671,7 @@ static const extended::ZoneEra kZoneEraAmerica_Havana[] ACE_TIME_PROGMEM = { &kPolicyCuba /*zonePolicy*/, "C%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3705,7 +3705,7 @@ static const extended::ZoneEra kZoneEraAmerica_Hermosillo[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3717,7 +3717,7 @@ static const extended::ZoneEra kZoneEraAmerica_Hermosillo[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "MST" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3751,7 +3751,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Indianapolis[] ACE_TIME_P nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 6 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3763,7 +3763,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Indianapolis[] ACE_TIME_P &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3797,7 +3797,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Knox[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 6 /*untilYearTiny*/, 4 /*untilMonth*/, 2 /*untilDay*/, @@ -3809,7 +3809,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Knox[] ACE_TIME_PROGMEM = &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3843,7 +3843,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Marengo[] ACE_TIME_PROGME nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 6 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3855,7 +3855,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Marengo[] ACE_TIME_PROGME &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3889,7 +3889,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Petersburg[] ACE_TIME_PRO nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 6 /*untilYearTiny*/, 4 /*untilMonth*/, 2 /*untilDay*/, @@ -3901,7 +3901,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Petersburg[] ACE_TIME_PRO &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 7 /*untilYearTiny*/, 11 /*untilMonth*/, 4 /*untilDay*/, @@ -3913,7 +3913,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Petersburg[] ACE_TIME_PRO &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3947,7 +3947,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Tell_City[] ACE_TIME_PROG nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 6 /*untilYearTiny*/, 4 /*untilMonth*/, 2 /*untilDay*/, @@ -3959,7 +3959,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Tell_City[] ACE_TIME_PROG &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -3993,7 +3993,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Vevay[] ACE_TIME_PROGMEM nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 6 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4005,7 +4005,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Vevay[] ACE_TIME_PROGMEM &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4039,7 +4039,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Vincennes[] ACE_TIME_PROG nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 6 /*untilYearTiny*/, 4 /*untilMonth*/, 2 /*untilDay*/, @@ -4051,7 +4051,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Vincennes[] ACE_TIME_PROG &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 7 /*untilYearTiny*/, 11 /*untilMonth*/, 4 /*untilDay*/, @@ -4063,7 +4063,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Vincennes[] ACE_TIME_PROG &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4097,7 +4097,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Winamac[] ACE_TIME_PROGME nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 6 /*untilYearTiny*/, 4 /*untilMonth*/, 2 /*untilDay*/, @@ -4109,7 +4109,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Winamac[] ACE_TIME_PROGME &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 7 /*untilYearTiny*/, 3 /*untilMonth*/, 11 /*untilDay*/, @@ -4121,7 +4121,7 @@ static const extended::ZoneEra kZoneEraAmerica_Indiana_Winamac[] ACE_TIME_PROGME &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4155,7 +4155,7 @@ static const extended::ZoneEra kZoneEraAmerica_Inuvik[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4189,7 +4189,7 @@ static const extended::ZoneEra kZoneEraAmerica_Iqaluit[] ACE_TIME_PROGMEM = { &kPolicyNT_YK /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 31 /*untilDay*/, @@ -4201,7 +4201,7 @@ static const extended::ZoneEra kZoneEraAmerica_Iqaluit[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 10 /*untilMonth*/, 29 /*untilDay*/, @@ -4213,7 +4213,7 @@ static const extended::ZoneEra kZoneEraAmerica_Iqaluit[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4247,7 +4247,7 @@ static const extended::ZoneEra kZoneEraAmerica_Jamaica[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4281,7 +4281,7 @@ static const extended::ZoneEra kZoneEraAmerica_Juneau[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "AK%T" /*format*/, -36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4315,7 +4315,7 @@ static const extended::ZoneEra kZoneEraAmerica_Kentucky_Louisville[] ACE_TIME_PR &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4349,7 +4349,7 @@ static const extended::ZoneEra kZoneEraAmerica_Kentucky_Monticello[] ACE_TIME_PR &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 10 /*untilMonth*/, 29 /*untilDay*/, @@ -4361,7 +4361,7 @@ static const extended::ZoneEra kZoneEraAmerica_Kentucky_Monticello[] ACE_TIME_PR &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4395,7 +4395,7 @@ static const extended::ZoneEra kZoneEraAmerica_La_Paz[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4429,7 +4429,7 @@ static const extended::ZoneEra kZoneEraAmerica_Lima[] ACE_TIME_PROGMEM = { &kPolicyPeru /*zonePolicy*/, "-05/-04" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4463,7 +4463,7 @@ static const extended::ZoneEra kZoneEraAmerica_Los_Angeles[] ACE_TIME_PROGMEM = &kPolicyUS /*zonePolicy*/, "P%T" /*format*/, -32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4497,7 +4497,7 @@ static const extended::ZoneEra kZoneEraAmerica_Maceio[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 9 /*untilMonth*/, 30 /*untilDay*/, @@ -4509,7 +4509,7 @@ static const extended::ZoneEra kZoneEraAmerica_Maceio[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 10 /*untilMonth*/, 22 /*untilDay*/, @@ -4521,7 +4521,7 @@ static const extended::ZoneEra kZoneEraAmerica_Maceio[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 1 /*untilYearTiny*/, 9 /*untilMonth*/, 13 /*untilDay*/, @@ -4533,7 +4533,7 @@ static const extended::ZoneEra kZoneEraAmerica_Maceio[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 2 /*untilYearTiny*/, 10 /*untilMonth*/, 1 /*untilDay*/, @@ -4545,7 +4545,7 @@ static const extended::ZoneEra kZoneEraAmerica_Maceio[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4579,7 +4579,7 @@ static const extended::ZoneEra kZoneEraAmerica_Managua[] ACE_TIME_PROGMEM = { &kPolicyNic /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4613,7 +4613,7 @@ static const extended::ZoneEra kZoneEraAmerica_Manaus[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4647,7 +4647,7 @@ static const extended::ZoneEra kZoneEraAmerica_Martinique[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "AST" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4681,7 +4681,7 @@ static const extended::ZoneEra kZoneEraAmerica_Matamoros[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 10 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4693,7 +4693,7 @@ static const extended::ZoneEra kZoneEraAmerica_Matamoros[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4727,7 +4727,7 @@ static const extended::ZoneEra kZoneEraAmerica_Mazatlan[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4761,7 +4761,7 @@ static const extended::ZoneEra kZoneEraAmerica_Menominee[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4795,7 +4795,7 @@ static const extended::ZoneEra kZoneEraAmerica_Merida[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4829,7 +4829,7 @@ static const extended::ZoneEra kZoneEraAmerica_Metlakatla[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "PST" /*format*/, -32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 15 /*untilYearTiny*/, 11 /*untilMonth*/, 1 /*untilDay*/, @@ -4841,7 +4841,7 @@ static const extended::ZoneEra kZoneEraAmerica_Metlakatla[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "AK%T" /*format*/, -36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 18 /*untilYearTiny*/, 11 /*untilMonth*/, 4 /*untilDay*/, @@ -4853,7 +4853,7 @@ static const extended::ZoneEra kZoneEraAmerica_Metlakatla[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "PST" /*format*/, -32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 19 /*untilYearTiny*/, 1 /*untilMonth*/, 20 /*untilDay*/, @@ -4865,7 +4865,7 @@ static const extended::ZoneEra kZoneEraAmerica_Metlakatla[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "AK%T" /*format*/, -36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4899,7 +4899,7 @@ static const extended::ZoneEra kZoneEraAmerica_Mexico_City[] ACE_TIME_PROGMEM = &kPolicyMexico /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 1 /*untilYearTiny*/, 9 /*untilMonth*/, 30 /*untilDay*/, @@ -4911,7 +4911,7 @@ static const extended::ZoneEra kZoneEraAmerica_Mexico_City[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "CST" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 2 /*untilYearTiny*/, 2 /*untilMonth*/, 20 /*untilDay*/, @@ -4923,7 +4923,7 @@ static const extended::ZoneEra kZoneEraAmerica_Mexico_City[] ACE_TIME_PROGMEM = &kPolicyMexico /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4957,7 +4957,7 @@ static const extended::ZoneEra kZoneEraAmerica_Miquelon[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -4991,7 +4991,7 @@ static const extended::ZoneEra kZoneEraAmerica_Moncton[] ACE_TIME_PROGMEM = { &kPolicyMoncton /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 7 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5003,7 +5003,7 @@ static const extended::ZoneEra kZoneEraAmerica_Moncton[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5037,7 +5037,7 @@ static const extended::ZoneEra kZoneEraAmerica_Monterrey[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5071,7 +5071,7 @@ static const extended::ZoneEra kZoneEraAmerica_Montevideo[] ACE_TIME_PROGMEM = { &kPolicyUruguay /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5105,7 +5105,7 @@ static const extended::ZoneEra kZoneEraAmerica_Nassau[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5139,7 +5139,7 @@ static const extended::ZoneEra kZoneEraAmerica_New_York[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5173,7 +5173,7 @@ static const extended::ZoneEra kZoneEraAmerica_Nipigon[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5207,7 +5207,7 @@ static const extended::ZoneEra kZoneEraAmerica_Nome[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "AK%T" /*format*/, -36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5241,7 +5241,7 @@ static const extended::ZoneEra kZoneEraAmerica_Noronha[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-02" /*format*/, -8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 9 /*untilMonth*/, 30 /*untilDay*/, @@ -5253,7 +5253,7 @@ static const extended::ZoneEra kZoneEraAmerica_Noronha[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-02/-01" /*format*/, -8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 10 /*untilMonth*/, 15 /*untilDay*/, @@ -5265,7 +5265,7 @@ static const extended::ZoneEra kZoneEraAmerica_Noronha[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-02" /*format*/, -8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 1 /*untilYearTiny*/, 9 /*untilMonth*/, 13 /*untilDay*/, @@ -5277,7 +5277,7 @@ static const extended::ZoneEra kZoneEraAmerica_Noronha[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-02/-01" /*format*/, -8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 2 /*untilYearTiny*/, 10 /*untilMonth*/, 1 /*untilDay*/, @@ -5289,7 +5289,7 @@ static const extended::ZoneEra kZoneEraAmerica_Noronha[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-02" /*format*/, -8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5323,7 +5323,7 @@ static const extended::ZoneEra kZoneEraAmerica_North_Dakota_Beulah[] ACE_TIME_PR &kPolicyUS /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 10 /*untilYearTiny*/, 11 /*untilMonth*/, 7 /*untilDay*/, @@ -5335,7 +5335,7 @@ static const extended::ZoneEra kZoneEraAmerica_North_Dakota_Beulah[] ACE_TIME_PR &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5369,7 +5369,7 @@ static const extended::ZoneEra kZoneEraAmerica_North_Dakota_Center[] ACE_TIME_PR &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5403,7 +5403,7 @@ static const extended::ZoneEra kZoneEraAmerica_North_Dakota_New_Salem[] ACE_TIME &kPolicyUS /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 3 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -5415,7 +5415,7 @@ static const extended::ZoneEra kZoneEraAmerica_North_Dakota_New_Salem[] ACE_TIME &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5449,7 +5449,7 @@ static const extended::ZoneEra kZoneEraAmerica_Nuuk[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5483,7 +5483,7 @@ static const extended::ZoneEra kZoneEraAmerica_Ojinaga[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 10 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5495,7 +5495,7 @@ static const extended::ZoneEra kZoneEraAmerica_Ojinaga[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5529,7 +5529,7 @@ static const extended::ZoneEra kZoneEraAmerica_Panama[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5563,7 +5563,7 @@ static const extended::ZoneEra kZoneEraAmerica_Pangnirtung[] ACE_TIME_PROGMEM = &kPolicyCanada /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 31 /*untilDay*/, @@ -5575,7 +5575,7 @@ static const extended::ZoneEra kZoneEraAmerica_Pangnirtung[] ACE_TIME_PROGMEM = &kPolicyCanada /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 10 /*untilMonth*/, 29 /*untilDay*/, @@ -5587,7 +5587,7 @@ static const extended::ZoneEra kZoneEraAmerica_Pangnirtung[] ACE_TIME_PROGMEM = &kPolicyCanada /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5621,7 +5621,7 @@ static const extended::ZoneEra kZoneEraAmerica_Paramaribo[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5655,7 +5655,7 @@ static const extended::ZoneEra kZoneEraAmerica_Phoenix[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "MST" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5689,7 +5689,7 @@ static const extended::ZoneEra kZoneEraAmerica_Port_au_Prince[] ACE_TIME_PROGMEM &kPolicyHaiti /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5723,7 +5723,7 @@ static const extended::ZoneEra kZoneEraAmerica_Port_of_Spain[] ACE_TIME_PROGMEM nullptr /*zonePolicy*/, "AST" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5757,7 +5757,7 @@ static const extended::ZoneEra kZoneEraAmerica_Porto_Velho[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5791,7 +5791,7 @@ static const extended::ZoneEra kZoneEraAmerica_Puerto_Rico[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "AST" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5825,7 +5825,7 @@ static const extended::ZoneEra kZoneEraAmerica_Punta_Arenas[] ACE_TIME_PROGMEM = &kPolicyChile /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 16 /*untilYearTiny*/, 12 /*untilMonth*/, 4 /*untilDay*/, @@ -5837,7 +5837,7 @@ static const extended::ZoneEra kZoneEraAmerica_Punta_Arenas[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5871,7 +5871,7 @@ static const extended::ZoneEra kZoneEraAmerica_Rainy_River[] ACE_TIME_PROGMEM = &kPolicyCanada /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5905,7 +5905,7 @@ static const extended::ZoneEra kZoneEraAmerica_Rankin_Inlet[] ACE_TIME_PROGMEM = &kPolicyNT_YK /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 10 /*untilMonth*/, 29 /*untilDay*/, @@ -5917,7 +5917,7 @@ static const extended::ZoneEra kZoneEraAmerica_Rankin_Inlet[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 1 /*untilYearTiny*/, 4 /*untilMonth*/, 1 /*untilDay*/, @@ -5929,7 +5929,7 @@ static const extended::ZoneEra kZoneEraAmerica_Rankin_Inlet[] ACE_TIME_PROGMEM = &kPolicyCanada /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5963,7 +5963,7 @@ static const extended::ZoneEra kZoneEraAmerica_Recife[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 9 /*untilMonth*/, 30 /*untilDay*/, @@ -5975,7 +5975,7 @@ static const extended::ZoneEra kZoneEraAmerica_Recife[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 10 /*untilMonth*/, 15 /*untilDay*/, @@ -5987,7 +5987,7 @@ static const extended::ZoneEra kZoneEraAmerica_Recife[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 1 /*untilYearTiny*/, 9 /*untilMonth*/, 13 /*untilDay*/, @@ -5999,7 +5999,7 @@ static const extended::ZoneEra kZoneEraAmerica_Recife[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 2 /*untilYearTiny*/, 10 /*untilMonth*/, 1 /*untilDay*/, @@ -6011,7 +6011,7 @@ static const extended::ZoneEra kZoneEraAmerica_Recife[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6045,7 +6045,7 @@ static const extended::ZoneEra kZoneEraAmerica_Regina[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "CST" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6079,7 +6079,7 @@ static const extended::ZoneEra kZoneEraAmerica_Resolute[] ACE_TIME_PROGMEM = { &kPolicyNT_YK /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 10 /*untilMonth*/, 29 /*untilDay*/, @@ -6091,7 +6091,7 @@ static const extended::ZoneEra kZoneEraAmerica_Resolute[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 1 /*untilYearTiny*/, 4 /*untilMonth*/, 1 /*untilDay*/, @@ -6103,7 +6103,7 @@ static const extended::ZoneEra kZoneEraAmerica_Resolute[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 6 /*untilYearTiny*/, 10 /*untilMonth*/, 29 /*untilDay*/, @@ -6115,7 +6115,7 @@ static const extended::ZoneEra kZoneEraAmerica_Resolute[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 7 /*untilYearTiny*/, 3 /*untilMonth*/, 11 /*untilDay*/, @@ -6127,7 +6127,7 @@ static const extended::ZoneEra kZoneEraAmerica_Resolute[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6161,7 +6161,7 @@ static const extended::ZoneEra kZoneEraAmerica_Rio_Branco[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-05" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 8 /*untilYearTiny*/, 6 /*untilMonth*/, 24 /*untilDay*/, @@ -6173,7 +6173,7 @@ static const extended::ZoneEra kZoneEraAmerica_Rio_Branco[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 13 /*untilYearTiny*/, 11 /*untilMonth*/, 10 /*untilDay*/, @@ -6185,7 +6185,7 @@ static const extended::ZoneEra kZoneEraAmerica_Rio_Branco[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-05" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6219,7 +6219,7 @@ static const extended::ZoneEra kZoneEraAmerica_Santarem[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 8 /*untilYearTiny*/, 6 /*untilMonth*/, 24 /*untilDay*/, @@ -6231,7 +6231,7 @@ static const extended::ZoneEra kZoneEraAmerica_Santarem[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6265,7 +6265,7 @@ static const extended::ZoneEra kZoneEraAmerica_Santiago[] ACE_TIME_PROGMEM = { &kPolicyChile /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6299,7 +6299,7 @@ static const extended::ZoneEra kZoneEraAmerica_Santo_Domingo[] ACE_TIME_PROGMEM nullptr /*zonePolicy*/, "AST" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 10 /*untilMonth*/, 29 /*untilDay*/, @@ -6311,7 +6311,7 @@ static const extended::ZoneEra kZoneEraAmerica_Santo_Domingo[] ACE_TIME_PROGMEM &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 12 /*untilMonth*/, 3 /*untilDay*/, @@ -6323,7 +6323,7 @@ static const extended::ZoneEra kZoneEraAmerica_Santo_Domingo[] ACE_TIME_PROGMEM nullptr /*zonePolicy*/, "AST" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6357,7 +6357,7 @@ static const extended::ZoneEra kZoneEraAmerica_Sao_Paulo[] ACE_TIME_PROGMEM = { &kPolicyBrazil /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6391,7 +6391,7 @@ static const extended::ZoneEra kZoneEraAmerica_Scoresbysund[] ACE_TIME_PROGMEM = &kPolicyEU /*zonePolicy*/, "-01/+00" /*format*/, -4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6425,7 +6425,7 @@ static const extended::ZoneEra kZoneEraAmerica_Sitka[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "AK%T" /*format*/, -36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6459,7 +6459,7 @@ static const extended::ZoneEra kZoneEraAmerica_St_Johns[] ACE_TIME_PROGMEM = { &kPolicyStJohns /*zonePolicy*/, "N%T" /*format*/, -14 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 11 /*untilMonth*/, 1 /*untilDay*/, @@ -6471,7 +6471,7 @@ static const extended::ZoneEra kZoneEraAmerica_St_Johns[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "N%T" /*format*/, -14 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6505,7 +6505,7 @@ static const extended::ZoneEra kZoneEraAmerica_Swift_Current[] ACE_TIME_PROGMEM nullptr /*zonePolicy*/, "CST" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6539,7 +6539,7 @@ static const extended::ZoneEra kZoneEraAmerica_Tegucigalpa[] ACE_TIME_PROGMEM = &kPolicyHond /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6573,7 +6573,7 @@ static const extended::ZoneEra kZoneEraAmerica_Thule[] ACE_TIME_PROGMEM = { &kPolicyThule /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6607,7 +6607,7 @@ static const extended::ZoneEra kZoneEraAmerica_Thunder_Bay[] ACE_TIME_PROGMEM = &kPolicyCanada /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6641,7 +6641,7 @@ static const extended::ZoneEra kZoneEraAmerica_Tijuana[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "P%T" /*format*/, -32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 1 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6653,7 +6653,7 @@ static const extended::ZoneEra kZoneEraAmerica_Tijuana[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "P%T" /*format*/, -32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 2 /*untilYearTiny*/, 2 /*untilMonth*/, 20 /*untilDay*/, @@ -6665,7 +6665,7 @@ static const extended::ZoneEra kZoneEraAmerica_Tijuana[] ACE_TIME_PROGMEM = { &kPolicyMexico /*zonePolicy*/, "P%T" /*format*/, -32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 10 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6677,7 +6677,7 @@ static const extended::ZoneEra kZoneEraAmerica_Tijuana[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "P%T" /*format*/, -32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6711,7 +6711,7 @@ static const extended::ZoneEra kZoneEraAmerica_Toronto[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6745,7 +6745,7 @@ static const extended::ZoneEra kZoneEraAmerica_Vancouver[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "P%T" /*format*/, -32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6779,7 +6779,7 @@ static const extended::ZoneEra kZoneEraAmerica_Whitehorse[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "P%T" /*format*/, -32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 20 /*untilYearTiny*/, 11 /*untilMonth*/, 1 /*untilDay*/, @@ -6791,7 +6791,7 @@ static const extended::ZoneEra kZoneEraAmerica_Whitehorse[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "MST" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6825,7 +6825,7 @@ static const extended::ZoneEra kZoneEraAmerica_Winnipeg[] ACE_TIME_PROGMEM = { &kPolicyWinn /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 6 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6837,7 +6837,7 @@ static const extended::ZoneEra kZoneEraAmerica_Winnipeg[] ACE_TIME_PROGMEM = { &kPolicyCanada /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6871,7 +6871,7 @@ static const extended::ZoneEra kZoneEraAmerica_Yakutat[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "AK%T" /*format*/, -36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6905,7 +6905,7 @@ static const extended::ZoneEra kZoneEraAmerica_Yellowknife[] ACE_TIME_PROGMEM = &kPolicyCanada /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6939,7 +6939,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 9 /*untilYearTiny*/, 10 /*untilMonth*/, 18 /*untilDay*/, @@ -6951,7 +6951,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 10 /*untilYearTiny*/, 3 /*untilMonth*/, 5 /*untilDay*/, @@ -6963,7 +6963,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 10 /*untilMonth*/, 28 /*untilDay*/, @@ -6975,7 +6975,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 12 /*untilYearTiny*/, 2 /*untilMonth*/, 21 /*untilDay*/, @@ -6987,7 +6987,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 16 /*untilYearTiny*/, 10 /*untilMonth*/, 22 /*untilDay*/, @@ -6999,7 +6999,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 18 /*untilYearTiny*/, 3 /*untilMonth*/, 11 /*untilDay*/, @@ -7011,7 +7011,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 18 /*untilYearTiny*/, 10 /*untilMonth*/, 7 /*untilDay*/, @@ -7023,7 +7023,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 19 /*untilYearTiny*/, 3 /*untilMonth*/, 17 /*untilDay*/, @@ -7035,7 +7035,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 19 /*untilYearTiny*/, 10 /*untilMonth*/, 4 /*untilDay*/, @@ -7047,7 +7047,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 20 /*untilYearTiny*/, 3 /*untilMonth*/, 8 /*untilDay*/, @@ -7059,7 +7059,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 20 /*untilYearTiny*/, 10 /*untilMonth*/, 4 /*untilDay*/, @@ -7071,7 +7071,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7105,7 +7105,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Davis[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 9 /*untilYearTiny*/, 10 /*untilMonth*/, 18 /*untilDay*/, @@ -7117,7 +7117,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Davis[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 10 /*untilYearTiny*/, 3 /*untilMonth*/, 10 /*untilDay*/, @@ -7129,7 +7129,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Davis[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 10 /*untilMonth*/, 28 /*untilDay*/, @@ -7141,7 +7141,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Davis[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 12 /*untilYearTiny*/, 2 /*untilMonth*/, 21 /*untilDay*/, @@ -7153,7 +7153,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Davis[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7187,7 +7187,7 @@ static const extended::ZoneEra kZoneEraAntarctica_DumontDUrville[] ACE_TIME_PROG nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7221,7 +7221,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Macquarie[] ACE_TIME_PROGMEM = &kPolicyAT /*zonePolicy*/, "AE%T" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 10 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7233,7 +7233,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Macquarie[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "AEDT" /*format*/, 40 /*offsetCode*/, - 8 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=60/15 + 4))*/, + 8 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=60)/15 + 4))*/, 11 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7245,7 +7245,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Macquarie[] ACE_TIME_PROGMEM = &kPolicyAT /*zonePolicy*/, "AE%T" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7279,7 +7279,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Mawson[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 9 /*untilYearTiny*/, 10 /*untilMonth*/, 18 /*untilDay*/, @@ -7291,7 +7291,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Mawson[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7325,7 +7325,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Palmer[] ACE_TIME_PROGMEM = { &kPolicyChile /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 16 /*untilYearTiny*/, 12 /*untilMonth*/, 4 /*untilDay*/, @@ -7337,7 +7337,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Palmer[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7371,7 +7371,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Rothera[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7405,7 +7405,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Syowa[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7439,7 +7439,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Troll[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-00" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 5 /*untilYearTiny*/, 2 /*untilMonth*/, 12 /*untilDay*/, @@ -7451,7 +7451,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Troll[] ACE_TIME_PROGMEM = { &kPolicyTroll /*zonePolicy*/, "%" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7485,7 +7485,7 @@ static const extended::ZoneEra kZoneEraAntarctica_Vostok[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7519,7 +7519,7 @@ static const extended::ZoneEra kZoneEraAsia_Almaty[] ACE_TIME_PROGMEM = { &kPolicyRussiaAsia /*zonePolicy*/, "+06/+07" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 10 /*untilMonth*/, 31 /*untilDay*/, @@ -7531,7 +7531,7 @@ static const extended::ZoneEra kZoneEraAsia_Almaty[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7565,7 +7565,7 @@ static const extended::ZoneEra kZoneEraAsia_Amman[] ACE_TIME_PROGMEM = { &kPolicyJordan /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7599,7 +7599,7 @@ static const extended::ZoneEra kZoneEraAsia_Anadyr[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+12/+13" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 10 /*untilYearTiny*/, 3 /*untilMonth*/, 28 /*untilDay*/, @@ -7611,7 +7611,7 @@ static const extended::ZoneEra kZoneEraAsia_Anadyr[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+11/+12" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -7623,7 +7623,7 @@ static const extended::ZoneEra kZoneEraAsia_Anadyr[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7657,7 +7657,7 @@ static const extended::ZoneEra kZoneEraAsia_Aqtau[] ACE_TIME_PROGMEM = { &kPolicyRussiaAsia /*zonePolicy*/, "+04/+05" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 10 /*untilMonth*/, 31 /*untilDay*/, @@ -7669,7 +7669,7 @@ static const extended::ZoneEra kZoneEraAsia_Aqtau[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7703,7 +7703,7 @@ static const extended::ZoneEra kZoneEraAsia_Aqtobe[] ACE_TIME_PROGMEM = { &kPolicyRussiaAsia /*zonePolicy*/, "+05/+06" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 10 /*untilMonth*/, 31 /*untilDay*/, @@ -7715,7 +7715,7 @@ static const extended::ZoneEra kZoneEraAsia_Aqtobe[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7749,7 +7749,7 @@ static const extended::ZoneEra kZoneEraAsia_Ashgabat[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7783,7 +7783,7 @@ static const extended::ZoneEra kZoneEraAsia_Atyrau[] ACE_TIME_PROGMEM = { &kPolicyRussiaAsia /*zonePolicy*/, "+05/+06" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 3 /*untilMonth*/, 28 /*untilDay*/, @@ -7795,7 +7795,7 @@ static const extended::ZoneEra kZoneEraAsia_Atyrau[] ACE_TIME_PROGMEM = { &kPolicyRussiaAsia /*zonePolicy*/, "+04/+05" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 10 /*untilMonth*/, 31 /*untilDay*/, @@ -7807,7 +7807,7 @@ static const extended::ZoneEra kZoneEraAsia_Atyrau[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7841,7 +7841,7 @@ static const extended::ZoneEra kZoneEraAsia_Baghdad[] ACE_TIME_PROGMEM = { &kPolicyIraq /*zonePolicy*/, "+03/+04" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7875,7 +7875,7 @@ static const extended::ZoneEra kZoneEraAsia_Baku[] ACE_TIME_PROGMEM = { &kPolicyAzer /*zonePolicy*/, "+04/+05" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7909,7 +7909,7 @@ static const extended::ZoneEra kZoneEraAsia_Bangkok[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -7943,7 +7943,7 @@ static const extended::ZoneEra kZoneEraAsia_Barnaul[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+06/+07" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -7955,7 +7955,7 @@ static const extended::ZoneEra kZoneEraAsia_Barnaul[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -7967,7 +7967,7 @@ static const extended::ZoneEra kZoneEraAsia_Barnaul[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 16 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -7979,7 +7979,7 @@ static const extended::ZoneEra kZoneEraAsia_Barnaul[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8013,7 +8013,7 @@ static const extended::ZoneEra kZoneEraAsia_Beirut[] ACE_TIME_PROGMEM = { &kPolicyLebanon /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8047,7 +8047,7 @@ static const extended::ZoneEra kZoneEraAsia_Bishkek[] ACE_TIME_PROGMEM = { &kPolicyKyrgyz /*zonePolicy*/, "+05/+06" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 5 /*untilYearTiny*/, 8 /*untilMonth*/, 12 /*untilDay*/, @@ -8059,7 +8059,7 @@ static const extended::ZoneEra kZoneEraAsia_Bishkek[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8093,7 +8093,7 @@ static const extended::ZoneEra kZoneEraAsia_Brunei[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8127,7 +8127,7 @@ static const extended::ZoneEra kZoneEraAsia_Chita[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+09/+10" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -8139,7 +8139,7 @@ static const extended::ZoneEra kZoneEraAsia_Chita[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -8151,7 +8151,7 @@ static const extended::ZoneEra kZoneEraAsia_Chita[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 16 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -8163,7 +8163,7 @@ static const extended::ZoneEra kZoneEraAsia_Chita[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+09" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8197,7 +8197,7 @@ static const extended::ZoneEra kZoneEraAsia_Choibalsan[] ACE_TIME_PROGMEM = { &kPolicyMongol /*zonePolicy*/, "+09/+10" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 8 /*untilYearTiny*/, 3 /*untilMonth*/, 31 /*untilDay*/, @@ -8209,7 +8209,7 @@ static const extended::ZoneEra kZoneEraAsia_Choibalsan[] ACE_TIME_PROGMEM = { &kPolicyMongol /*zonePolicy*/, "+08/+09" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8243,7 +8243,7 @@ static const extended::ZoneEra kZoneEraAsia_Colombo[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 6 /*untilYearTiny*/, 4 /*untilMonth*/, 15 /*untilDay*/, @@ -8255,7 +8255,7 @@ static const extended::ZoneEra kZoneEraAsia_Colombo[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+0530" /*format*/, 22 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8289,7 +8289,7 @@ static const extended::ZoneEra kZoneEraAsia_Damascus[] ACE_TIME_PROGMEM = { &kPolicySyria /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8323,7 +8323,7 @@ static const extended::ZoneEra kZoneEraAsia_Dhaka[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 9 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8335,7 +8335,7 @@ static const extended::ZoneEra kZoneEraAsia_Dhaka[] ACE_TIME_PROGMEM = { &kPolicyDhaka /*zonePolicy*/, "+06/+07" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8369,7 +8369,7 @@ static const extended::ZoneEra kZoneEraAsia_Dili[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 9 /*untilMonth*/, 17 /*untilDay*/, @@ -8381,7 +8381,7 @@ static const extended::ZoneEra kZoneEraAsia_Dili[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+09" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8415,7 +8415,7 @@ static const extended::ZoneEra kZoneEraAsia_Dubai[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8449,7 +8449,7 @@ static const extended::ZoneEra kZoneEraAsia_Dushanbe[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8483,7 +8483,7 @@ static const extended::ZoneEra kZoneEraAsia_Famagusta[] ACE_TIME_PROGMEM = { &kPolicyEUAsia /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 16 /*untilYearTiny*/, 9 /*untilMonth*/, 8 /*untilDay*/, @@ -8495,7 +8495,7 @@ static const extended::ZoneEra kZoneEraAsia_Famagusta[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 17 /*untilYearTiny*/, 10 /*untilMonth*/, 29 /*untilDay*/, @@ -8507,7 +8507,7 @@ static const extended::ZoneEra kZoneEraAsia_Famagusta[] ACE_TIME_PROGMEM = { &kPolicyEUAsia /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8541,7 +8541,7 @@ static const extended::ZoneEra kZoneEraAsia_Gaza[] ACE_TIME_PROGMEM = { &kPolicyJordan /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8553,7 +8553,7 @@ static const extended::ZoneEra kZoneEraAsia_Gaza[] ACE_TIME_PROGMEM = { &kPolicyPalestine /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 8 /*untilYearTiny*/, 8 /*untilMonth*/, 29 /*untilDay*/, @@ -8565,7 +8565,7 @@ static const extended::ZoneEra kZoneEraAsia_Gaza[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EET" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 8 /*untilYearTiny*/, 9 /*untilMonth*/, 1 /*untilDay*/, @@ -8577,7 +8577,7 @@ static const extended::ZoneEra kZoneEraAsia_Gaza[] ACE_TIME_PROGMEM = { &kPolicyPalestine /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 10 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8589,7 +8589,7 @@ static const extended::ZoneEra kZoneEraAsia_Gaza[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EET" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 10 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -8601,7 +8601,7 @@ static const extended::ZoneEra kZoneEraAsia_Gaza[] ACE_TIME_PROGMEM = { &kPolicyPalestine /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 8 /*untilMonth*/, 1 /*untilDay*/, @@ -8613,7 +8613,7 @@ static const extended::ZoneEra kZoneEraAsia_Gaza[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EET" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 12 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8625,7 +8625,7 @@ static const extended::ZoneEra kZoneEraAsia_Gaza[] ACE_TIME_PROGMEM = { &kPolicyPalestine /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8659,7 +8659,7 @@ static const extended::ZoneEra kZoneEraAsia_Hebron[] ACE_TIME_PROGMEM = { &kPolicyJordan /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8671,7 +8671,7 @@ static const extended::ZoneEra kZoneEraAsia_Hebron[] ACE_TIME_PROGMEM = { &kPolicyPalestine /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8705,7 +8705,7 @@ static const extended::ZoneEra kZoneEraAsia_Ho_Chi_Minh[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8739,7 +8739,7 @@ static const extended::ZoneEra kZoneEraAsia_Hong_Kong[] ACE_TIME_PROGMEM = { &kPolicyHK /*zonePolicy*/, "HK%T" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8773,7 +8773,7 @@ static const extended::ZoneEra kZoneEraAsia_Hovd[] ACE_TIME_PROGMEM = { &kPolicyMongol /*zonePolicy*/, "+07/+08" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8807,7 +8807,7 @@ static const extended::ZoneEra kZoneEraAsia_Irkutsk[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+08/+09" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -8819,7 +8819,7 @@ static const extended::ZoneEra kZoneEraAsia_Irkutsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+09" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -8831,7 +8831,7 @@ static const extended::ZoneEra kZoneEraAsia_Irkutsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8865,7 +8865,7 @@ static const extended::ZoneEra kZoneEraAsia_Jakarta[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "WIB" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8899,7 +8899,7 @@ static const extended::ZoneEra kZoneEraAsia_Jayapura[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "WIT" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8933,7 +8933,7 @@ static const extended::ZoneEra kZoneEraAsia_Jerusalem[] ACE_TIME_PROGMEM = { &kPolicyZion /*zonePolicy*/, "I%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -8967,7 +8967,7 @@ static const extended::ZoneEra kZoneEraAsia_Kabul[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+0430" /*format*/, 18 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9001,7 +9001,7 @@ static const extended::ZoneEra kZoneEraAsia_Kamchatka[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+12/+13" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 10 /*untilYearTiny*/, 3 /*untilMonth*/, 28 /*untilDay*/, @@ -9013,7 +9013,7 @@ static const extended::ZoneEra kZoneEraAsia_Kamchatka[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+11/+12" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -9025,7 +9025,7 @@ static const extended::ZoneEra kZoneEraAsia_Kamchatka[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9059,7 +9059,7 @@ static const extended::ZoneEra kZoneEraAsia_Karachi[] ACE_TIME_PROGMEM = { &kPolicyPakistan /*zonePolicy*/, "PK%T" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9093,7 +9093,7 @@ static const extended::ZoneEra kZoneEraAsia_Kathmandu[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+0545" /*format*/, 23 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9127,7 +9127,7 @@ static const extended::ZoneEra kZoneEraAsia_Khandyga[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+09/+10" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9139,7 +9139,7 @@ static const extended::ZoneEra kZoneEraAsia_Khandyga[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+10/+11" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -9151,7 +9151,7 @@ static const extended::ZoneEra kZoneEraAsia_Khandyga[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 9 /*untilMonth*/, 13 /*untilDay*/, @@ -9163,7 +9163,7 @@ static const extended::ZoneEra kZoneEraAsia_Khandyga[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -9175,7 +9175,7 @@ static const extended::ZoneEra kZoneEraAsia_Khandyga[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+09" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9209,7 +9209,7 @@ static const extended::ZoneEra kZoneEraAsia_Kolkata[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "IST" /*format*/, 22 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9243,7 +9243,7 @@ static const extended::ZoneEra kZoneEraAsia_Krasnoyarsk[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+07/+08" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -9255,7 +9255,7 @@ static const extended::ZoneEra kZoneEraAsia_Krasnoyarsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -9267,7 +9267,7 @@ static const extended::ZoneEra kZoneEraAsia_Krasnoyarsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9301,7 +9301,7 @@ static const extended::ZoneEra kZoneEraAsia_Kuala_Lumpur[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9335,7 +9335,7 @@ static const extended::ZoneEra kZoneEraAsia_Kuching[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9369,7 +9369,7 @@ static const extended::ZoneEra kZoneEraAsia_Macau[] ACE_TIME_PROGMEM = { &kPolicyMacau /*zonePolicy*/, "C%T" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9403,7 +9403,7 @@ static const extended::ZoneEra kZoneEraAsia_Magadan[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+11/+12" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -9415,7 +9415,7 @@ static const extended::ZoneEra kZoneEraAsia_Magadan[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -9427,7 +9427,7 @@ static const extended::ZoneEra kZoneEraAsia_Magadan[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 16 /*untilYearTiny*/, 4 /*untilMonth*/, 24 /*untilDay*/, @@ -9439,7 +9439,7 @@ static const extended::ZoneEra kZoneEraAsia_Magadan[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9473,7 +9473,7 @@ static const extended::ZoneEra kZoneEraAsia_Makassar[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "WITA" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9507,7 +9507,7 @@ static const extended::ZoneEra kZoneEraAsia_Manila[] ACE_TIME_PROGMEM = { &kPolicyPhil /*zonePolicy*/, "P%T" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9541,7 +9541,7 @@ static const extended::ZoneEra kZoneEraAsia_Nicosia[] ACE_TIME_PROGMEM = { &kPolicyEUAsia /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9575,7 +9575,7 @@ static const extended::ZoneEra kZoneEraAsia_Novokuznetsk[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+07/+08" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 10 /*untilYearTiny*/, 3 /*untilMonth*/, 28 /*untilDay*/, @@ -9587,7 +9587,7 @@ static const extended::ZoneEra kZoneEraAsia_Novokuznetsk[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+06/+07" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -9599,7 +9599,7 @@ static const extended::ZoneEra kZoneEraAsia_Novokuznetsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9633,7 +9633,7 @@ static const extended::ZoneEra kZoneEraAsia_Novosibirsk[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+06/+07" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -9645,7 +9645,7 @@ static const extended::ZoneEra kZoneEraAsia_Novosibirsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -9657,7 +9657,7 @@ static const extended::ZoneEra kZoneEraAsia_Novosibirsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 16 /*untilYearTiny*/, 7 /*untilMonth*/, 24 /*untilDay*/, @@ -9669,7 +9669,7 @@ static const extended::ZoneEra kZoneEraAsia_Novosibirsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9703,7 +9703,7 @@ static const extended::ZoneEra kZoneEraAsia_Omsk[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+06/+07" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -9715,7 +9715,7 @@ static const extended::ZoneEra kZoneEraAsia_Omsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -9727,7 +9727,7 @@ static const extended::ZoneEra kZoneEraAsia_Omsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9761,7 +9761,7 @@ static const extended::ZoneEra kZoneEraAsia_Oral[] ACE_TIME_PROGMEM = { &kPolicyRussiaAsia /*zonePolicy*/, "+04/+05" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 10 /*untilMonth*/, 31 /*untilDay*/, @@ -9773,7 +9773,7 @@ static const extended::ZoneEra kZoneEraAsia_Oral[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9807,7 +9807,7 @@ static const extended::ZoneEra kZoneEraAsia_Pontianak[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "WIB" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9841,7 +9841,7 @@ static const extended::ZoneEra kZoneEraAsia_Pyongyang[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "KST" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 15 /*untilYearTiny*/, 8 /*untilMonth*/, 15 /*untilDay*/, @@ -9853,7 +9853,7 @@ static const extended::ZoneEra kZoneEraAsia_Pyongyang[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "KST" /*format*/, 34 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 18 /*untilYearTiny*/, 5 /*untilMonth*/, 4 /*untilDay*/, @@ -9865,7 +9865,7 @@ static const extended::ZoneEra kZoneEraAsia_Pyongyang[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "KST" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9899,7 +9899,7 @@ static const extended::ZoneEra kZoneEraAsia_Qatar[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9933,7 +9933,7 @@ static const extended::ZoneEra kZoneEraAsia_Qostanay[] ACE_TIME_PROGMEM = { &kPolicyRussiaAsia /*zonePolicy*/, "+05/+06" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 10 /*untilMonth*/, 31 /*untilDay*/, @@ -9945,7 +9945,7 @@ static const extended::ZoneEra kZoneEraAsia_Qostanay[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -9979,7 +9979,7 @@ static const extended::ZoneEra kZoneEraAsia_Qyzylorda[] ACE_TIME_PROGMEM = { &kPolicyRussiaAsia /*zonePolicy*/, "+05/+06" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 10 /*untilMonth*/, 31 /*untilDay*/, @@ -9991,7 +9991,7 @@ static const extended::ZoneEra kZoneEraAsia_Qyzylorda[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 18 /*untilYearTiny*/, 12 /*untilMonth*/, 21 /*untilDay*/, @@ -10003,7 +10003,7 @@ static const extended::ZoneEra kZoneEraAsia_Qyzylorda[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10037,7 +10037,7 @@ static const extended::ZoneEra kZoneEraAsia_Riyadh[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10071,7 +10071,7 @@ static const extended::ZoneEra kZoneEraAsia_Sakhalin[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+10/+11" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -10083,7 +10083,7 @@ static const extended::ZoneEra kZoneEraAsia_Sakhalin[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -10095,7 +10095,7 @@ static const extended::ZoneEra kZoneEraAsia_Sakhalin[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 16 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -10107,7 +10107,7 @@ static const extended::ZoneEra kZoneEraAsia_Sakhalin[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10141,7 +10141,7 @@ static const extended::ZoneEra kZoneEraAsia_Samarkand[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10175,7 +10175,7 @@ static const extended::ZoneEra kZoneEraAsia_Seoul[] ACE_TIME_PROGMEM = { &kPolicyROK /*zonePolicy*/, "K%T" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10209,7 +10209,7 @@ static const extended::ZoneEra kZoneEraAsia_Shanghai[] ACE_TIME_PROGMEM = { &kPolicyPRC /*zonePolicy*/, "C%T" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10243,7 +10243,7 @@ static const extended::ZoneEra kZoneEraAsia_Singapore[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10277,7 +10277,7 @@ static const extended::ZoneEra kZoneEraAsia_Srednekolymsk[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+11/+12" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -10289,7 +10289,7 @@ static const extended::ZoneEra kZoneEraAsia_Srednekolymsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -10301,7 +10301,7 @@ static const extended::ZoneEra kZoneEraAsia_Srednekolymsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10335,7 +10335,7 @@ static const extended::ZoneEra kZoneEraAsia_Taipei[] ACE_TIME_PROGMEM = { &kPolicyTaiwan /*zonePolicy*/, "C%T" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10369,7 +10369,7 @@ static const extended::ZoneEra kZoneEraAsia_Tashkent[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10403,7 +10403,7 @@ static const extended::ZoneEra kZoneEraAsia_Tbilisi[] ACE_TIME_PROGMEM = { &kPolicyE_EurAsia /*zonePolicy*/, "+04/+05" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 4 /*untilYearTiny*/, 6 /*untilMonth*/, 27 /*untilDay*/, @@ -10415,7 +10415,7 @@ static const extended::ZoneEra kZoneEraAsia_Tbilisi[] ACE_TIME_PROGMEM = { &kPolicyRussiaAsia /*zonePolicy*/, "+03/+04" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 5 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -10427,7 +10427,7 @@ static const extended::ZoneEra kZoneEraAsia_Tbilisi[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10461,7 +10461,7 @@ static const extended::ZoneEra kZoneEraAsia_Tehran[] ACE_TIME_PROGMEM = { &kPolicyIran /*zonePolicy*/, "+0330/+0430" /*format*/, 14 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10495,7 +10495,7 @@ static const extended::ZoneEra kZoneEraAsia_Thimphu[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10529,7 +10529,7 @@ static const extended::ZoneEra kZoneEraAsia_Tokyo[] ACE_TIME_PROGMEM = { &kPolicyJapan /*zonePolicy*/, "J%T" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10563,7 +10563,7 @@ static const extended::ZoneEra kZoneEraAsia_Tomsk[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+07/+08" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 2 /*untilYearTiny*/, 5 /*untilMonth*/, 1 /*untilDay*/, @@ -10575,7 +10575,7 @@ static const extended::ZoneEra kZoneEraAsia_Tomsk[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+06/+07" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -10587,7 +10587,7 @@ static const extended::ZoneEra kZoneEraAsia_Tomsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -10599,7 +10599,7 @@ static const extended::ZoneEra kZoneEraAsia_Tomsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 16 /*untilYearTiny*/, 5 /*untilMonth*/, 29 /*untilDay*/, @@ -10611,7 +10611,7 @@ static const extended::ZoneEra kZoneEraAsia_Tomsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10645,7 +10645,7 @@ static const extended::ZoneEra kZoneEraAsia_Ulaanbaatar[] ACE_TIME_PROGMEM = { &kPolicyMongol /*zonePolicy*/, "+08/+09" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10679,7 +10679,7 @@ static const extended::ZoneEra kZoneEraAsia_Urumqi[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10713,7 +10713,7 @@ static const extended::ZoneEra kZoneEraAsia_Ust_Nera[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+11/+12" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -10725,7 +10725,7 @@ static const extended::ZoneEra kZoneEraAsia_Ust_Nera[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 9 /*untilMonth*/, 13 /*untilDay*/, @@ -10737,7 +10737,7 @@ static const extended::ZoneEra kZoneEraAsia_Ust_Nera[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -10749,7 +10749,7 @@ static const extended::ZoneEra kZoneEraAsia_Ust_Nera[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10783,7 +10783,7 @@ static const extended::ZoneEra kZoneEraAsia_Vladivostok[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+10/+11" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -10795,7 +10795,7 @@ static const extended::ZoneEra kZoneEraAsia_Vladivostok[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -10807,7 +10807,7 @@ static const extended::ZoneEra kZoneEraAsia_Vladivostok[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10841,7 +10841,7 @@ static const extended::ZoneEra kZoneEraAsia_Yakutsk[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+09/+10" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -10853,7 +10853,7 @@ static const extended::ZoneEra kZoneEraAsia_Yakutsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -10865,7 +10865,7 @@ static const extended::ZoneEra kZoneEraAsia_Yakutsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+09" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10899,7 +10899,7 @@ static const extended::ZoneEra kZoneEraAsia_Yangon[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+0630" /*format*/, 26 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10933,7 +10933,7 @@ static const extended::ZoneEra kZoneEraAsia_Yekaterinburg[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+05/+06" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -10945,7 +10945,7 @@ static const extended::ZoneEra kZoneEraAsia_Yekaterinburg[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -10957,7 +10957,7 @@ static const extended::ZoneEra kZoneEraAsia_Yekaterinburg[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -10991,7 +10991,7 @@ static const extended::ZoneEra kZoneEraAsia_Yerevan[] ACE_TIME_PROGMEM = { &kPolicyRussiaAsia /*zonePolicy*/, "+04/+05" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11003,7 +11003,7 @@ static const extended::ZoneEra kZoneEraAsia_Yerevan[] ACE_TIME_PROGMEM = { &kPolicyArmenia /*zonePolicy*/, "+04/+05" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11037,7 +11037,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Azores[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "-01/+00" /*format*/, -4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11071,7 +11071,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Bermuda[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "A%T" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11105,7 +11105,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Canary[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "WE%T" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11139,7 +11139,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Cape_Verde[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "-01" /*format*/, -4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11173,7 +11173,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Faroe[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "WE%T" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11207,7 +11207,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Madeira[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "WE%T" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11241,7 +11241,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Reykjavik[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "GMT" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11275,7 +11275,7 @@ static const extended::ZoneEra kZoneEraAtlantic_South_Georgia[] ACE_TIME_PROGMEM nullptr /*zonePolicy*/, "-02" /*format*/, -8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11309,7 +11309,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Stanley[] ACE_TIME_PROGMEM = { &kPolicyFalk /*zonePolicy*/, "-04/-03" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 10 /*untilYearTiny*/, 9 /*untilMonth*/, 5 /*untilDay*/, @@ -11321,7 +11321,7 @@ static const extended::ZoneEra kZoneEraAtlantic_Stanley[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11355,7 +11355,7 @@ static const extended::ZoneEra kZoneEraAustralia_Adelaide[] ACE_TIME_PROGMEM = { &kPolicyAS /*zonePolicy*/, "AC%T" /*format*/, 38 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11389,7 +11389,7 @@ static const extended::ZoneEra kZoneEraAustralia_Brisbane[] ACE_TIME_PROGMEM = { &kPolicyAQ /*zonePolicy*/, "AE%T" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11423,7 +11423,7 @@ static const extended::ZoneEra kZoneEraAustralia_Broken_Hill[] ACE_TIME_PROGMEM &kPolicyAN /*zonePolicy*/, "AC%T" /*format*/, 38 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11435,7 +11435,7 @@ static const extended::ZoneEra kZoneEraAustralia_Broken_Hill[] ACE_TIME_PROGMEM &kPolicyAS /*zonePolicy*/, "AC%T" /*format*/, 38 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11469,7 +11469,7 @@ static const extended::ZoneEra kZoneEraAustralia_Darwin[] ACE_TIME_PROGMEM = { &kPolicyAus /*zonePolicy*/, "AC%T" /*format*/, 38 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11503,7 +11503,7 @@ static const extended::ZoneEra kZoneEraAustralia_Eucla[] ACE_TIME_PROGMEM = { &kPolicyAW /*zonePolicy*/, "+0845/+0945" /*format*/, 35 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11537,7 +11537,7 @@ static const extended::ZoneEra kZoneEraAustralia_Hobart[] ACE_TIME_PROGMEM = { &kPolicyAT /*zonePolicy*/, "AE%T" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11571,7 +11571,7 @@ static const extended::ZoneEra kZoneEraAustralia_Lindeman[] ACE_TIME_PROGMEM = { &kPolicyHoliday /*zonePolicy*/, "AE%T" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11605,7 +11605,7 @@ static const extended::ZoneEra kZoneEraAustralia_Lord_Howe[] ACE_TIME_PROGMEM = &kPolicyLH /*zonePolicy*/, "+1030/+11" /*format*/, 42 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11639,7 +11639,7 @@ static const extended::ZoneEra kZoneEraAustralia_Melbourne[] ACE_TIME_PROGMEM = &kPolicyAV /*zonePolicy*/, "AE%T" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11673,7 +11673,7 @@ static const extended::ZoneEra kZoneEraAustralia_Perth[] ACE_TIME_PROGMEM = { &kPolicyAW /*zonePolicy*/, "AW%T" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11707,7 +11707,7 @@ static const extended::ZoneEra kZoneEraAustralia_Sydney[] ACE_TIME_PROGMEM = { &kPolicyAN /*zonePolicy*/, "AE%T" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11741,7 +11741,7 @@ static const extended::ZoneEra kZoneEraCET[] ACE_TIME_PROGMEM = { &kPolicyC_Eur /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11775,7 +11775,7 @@ static const extended::ZoneEra kZoneEraCST6CDT[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "C%T" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11809,7 +11809,7 @@ static const extended::ZoneEra kZoneEraEET[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11843,7 +11843,7 @@ static const extended::ZoneEra kZoneEraEST[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EST" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11877,7 +11877,7 @@ static const extended::ZoneEra kZoneEraEST5EDT[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "E%T" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11911,7 +11911,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "GMT" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11945,7 +11945,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_1[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-01" /*format*/, -4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -11979,7 +11979,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_10[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-10" /*format*/, -40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12013,7 +12013,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_11[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-11" /*format*/, -44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12047,7 +12047,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_12[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-12" /*format*/, -48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12081,7 +12081,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_2[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-02" /*format*/, -8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12115,7 +12115,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_3[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-03" /*format*/, -12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12149,7 +12149,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_4[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-04" /*format*/, -16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12183,7 +12183,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_5[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-05" /*format*/, -20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12217,7 +12217,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_6[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-06" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12251,7 +12251,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_7[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-07" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12285,7 +12285,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_8[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-08" /*format*/, -32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12319,7 +12319,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_PLUS_9[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-09" /*format*/, -36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12353,7 +12353,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_1[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+01" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12387,7 +12387,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_10[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12421,7 +12421,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_11[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12455,7 +12455,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_12[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12489,7 +12489,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_13[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+13" /*format*/, 52 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12523,7 +12523,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_14[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+14" /*format*/, 56 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12557,7 +12557,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_2[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+02" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12591,7 +12591,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_3[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12625,7 +12625,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_4[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12659,7 +12659,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_5[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12693,7 +12693,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_6[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12727,7 +12727,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_7[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12761,7 +12761,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_8[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+08" /*format*/, 32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12795,7 +12795,7 @@ static const extended::ZoneEra kZoneEraEtc_GMT_9[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+09" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12829,7 +12829,7 @@ static const extended::ZoneEra kZoneEraEtc_UTC[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "UTC" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12863,7 +12863,7 @@ static const extended::ZoneEra kZoneEraEurope_Amsterdam[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12897,7 +12897,7 @@ static const extended::ZoneEra kZoneEraEurope_Andorra[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -12931,7 +12931,7 @@ static const extended::ZoneEra kZoneEraEurope_Astrakhan[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+03/+04" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -12943,7 +12943,7 @@ static const extended::ZoneEra kZoneEraEurope_Astrakhan[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -12955,7 +12955,7 @@ static const extended::ZoneEra kZoneEraEurope_Astrakhan[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 16 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -12967,7 +12967,7 @@ static const extended::ZoneEra kZoneEraEurope_Astrakhan[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13001,7 +13001,7 @@ static const extended::ZoneEra kZoneEraEurope_Athens[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13035,7 +13035,7 @@ static const extended::ZoneEra kZoneEraEurope_Belgrade[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13069,7 +13069,7 @@ static const extended::ZoneEra kZoneEraEurope_Berlin[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13103,7 +13103,7 @@ static const extended::ZoneEra kZoneEraEurope_Brussels[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13137,7 +13137,7 @@ static const extended::ZoneEra kZoneEraEurope_Bucharest[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13171,7 +13171,7 @@ static const extended::ZoneEra kZoneEraEurope_Budapest[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13205,7 +13205,7 @@ static const extended::ZoneEra kZoneEraEurope_Chisinau[] ACE_TIME_PROGMEM = { &kPolicyMoldova /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13239,7 +13239,7 @@ static const extended::ZoneEra kZoneEraEurope_Copenhagen[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13273,7 +13273,7 @@ static const extended::ZoneEra kZoneEraEurope_Dublin[] ACE_TIME_PROGMEM = { &kPolicyEire /*zonePolicy*/, "IST/GMT" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13307,7 +13307,7 @@ static const extended::ZoneEra kZoneEraEurope_Gibraltar[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13341,7 +13341,7 @@ static const extended::ZoneEra kZoneEraEurope_Helsinki[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13375,7 +13375,7 @@ static const extended::ZoneEra kZoneEraEurope_Istanbul[] ACE_TIME_PROGMEM = { &kPolicyTurkey /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 7 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13387,7 +13387,7 @@ static const extended::ZoneEra kZoneEraEurope_Istanbul[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -13399,7 +13399,7 @@ static const extended::ZoneEra kZoneEraEurope_Istanbul[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EET" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 28 /*untilDay*/, @@ -13411,7 +13411,7 @@ static const extended::ZoneEra kZoneEraEurope_Istanbul[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 3 /*untilMonth*/, 30 /*untilDay*/, @@ -13423,7 +13423,7 @@ static const extended::ZoneEra kZoneEraEurope_Istanbul[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EET" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 3 /*untilMonth*/, 31 /*untilDay*/, @@ -13435,7 +13435,7 @@ static const extended::ZoneEra kZoneEraEurope_Istanbul[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 15 /*untilYearTiny*/, 10 /*untilMonth*/, 25 /*untilDay*/, @@ -13447,7 +13447,7 @@ static const extended::ZoneEra kZoneEraEurope_Istanbul[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EEST" /*format*/, 8 /*offsetCode*/, - 8 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=60/15 + 4))*/, + 8 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=60)/15 + 4))*/, 15 /*untilYearTiny*/, 11 /*untilMonth*/, 8 /*untilDay*/, @@ -13459,7 +13459,7 @@ static const extended::ZoneEra kZoneEraEurope_Istanbul[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 16 /*untilYearTiny*/, 9 /*untilMonth*/, 7 /*untilDay*/, @@ -13471,7 +13471,7 @@ static const extended::ZoneEra kZoneEraEurope_Istanbul[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13505,7 +13505,7 @@ static const extended::ZoneEra kZoneEraEurope_Kaliningrad[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -13517,7 +13517,7 @@ static const extended::ZoneEra kZoneEraEurope_Kaliningrad[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -13529,7 +13529,7 @@ static const extended::ZoneEra kZoneEraEurope_Kaliningrad[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EET" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13563,7 +13563,7 @@ static const extended::ZoneEra kZoneEraEurope_Kiev[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13597,7 +13597,7 @@ static const extended::ZoneEra kZoneEraEurope_Kirov[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+03/+04" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -13609,7 +13609,7 @@ static const extended::ZoneEra kZoneEraEurope_Kirov[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -13621,7 +13621,7 @@ static const extended::ZoneEra kZoneEraEurope_Kirov[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13655,7 +13655,7 @@ static const extended::ZoneEra kZoneEraEurope_Lisbon[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "WE%T" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13689,7 +13689,7 @@ static const extended::ZoneEra kZoneEraEurope_London[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "GMT/BST" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13723,7 +13723,7 @@ static const extended::ZoneEra kZoneEraEurope_Luxembourg[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13757,7 +13757,7 @@ static const extended::ZoneEra kZoneEraEurope_Madrid[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13791,7 +13791,7 @@ static const extended::ZoneEra kZoneEraEurope_Malta[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13825,7 +13825,7 @@ static const extended::ZoneEra kZoneEraEurope_Minsk[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -13837,7 +13837,7 @@ static const extended::ZoneEra kZoneEraEurope_Minsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13871,7 +13871,7 @@ static const extended::ZoneEra kZoneEraEurope_Monaco[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13905,7 +13905,7 @@ static const extended::ZoneEra kZoneEraEurope_Moscow[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "MSK/MSD" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -13917,7 +13917,7 @@ static const extended::ZoneEra kZoneEraEurope_Moscow[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "MSK" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -13929,7 +13929,7 @@ static const extended::ZoneEra kZoneEraEurope_Moscow[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "MSK" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13963,7 +13963,7 @@ static const extended::ZoneEra kZoneEraEurope_Oslo[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13997,7 +13997,7 @@ static const extended::ZoneEra kZoneEraEurope_Paris[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14031,7 +14031,7 @@ static const extended::ZoneEra kZoneEraEurope_Prague[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14065,7 +14065,7 @@ static const extended::ZoneEra kZoneEraEurope_Riga[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 2 /*untilMonth*/, 29 /*untilDay*/, @@ -14077,7 +14077,7 @@ static const extended::ZoneEra kZoneEraEurope_Riga[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EET" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 1 /*untilYearTiny*/, 1 /*untilMonth*/, 2 /*untilDay*/, @@ -14089,7 +14089,7 @@ static const extended::ZoneEra kZoneEraEurope_Riga[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14123,7 +14123,7 @@ static const extended::ZoneEra kZoneEraEurope_Rome[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14157,7 +14157,7 @@ static const extended::ZoneEra kZoneEraEurope_Samara[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+04/+05" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 10 /*untilYearTiny*/, 3 /*untilMonth*/, 28 /*untilDay*/, @@ -14169,7 +14169,7 @@ static const extended::ZoneEra kZoneEraEurope_Samara[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+03/+04" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -14181,7 +14181,7 @@ static const extended::ZoneEra kZoneEraEurope_Samara[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14215,7 +14215,7 @@ static const extended::ZoneEra kZoneEraEurope_Saratov[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+03/+04" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -14227,7 +14227,7 @@ static const extended::ZoneEra kZoneEraEurope_Saratov[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -14239,7 +14239,7 @@ static const extended::ZoneEra kZoneEraEurope_Saratov[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 16 /*untilYearTiny*/, 12 /*untilMonth*/, 4 /*untilDay*/, @@ -14251,7 +14251,7 @@ static const extended::ZoneEra kZoneEraEurope_Saratov[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14285,7 +14285,7 @@ static const extended::ZoneEra kZoneEraEurope_Simferopol[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 3 /*untilMonth*/, 30 /*untilDay*/, @@ -14297,7 +14297,7 @@ static const extended::ZoneEra kZoneEraEurope_Simferopol[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "MSK" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -14309,7 +14309,7 @@ static const extended::ZoneEra kZoneEraEurope_Simferopol[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "MSK" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14343,7 +14343,7 @@ static const extended::ZoneEra kZoneEraEurope_Sofia[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14377,7 +14377,7 @@ static const extended::ZoneEra kZoneEraEurope_Stockholm[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14411,7 +14411,7 @@ static const extended::ZoneEra kZoneEraEurope_Tallinn[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 31 /*untilDay*/, @@ -14423,7 +14423,7 @@ static const extended::ZoneEra kZoneEraEurope_Tallinn[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EET" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 2 /*untilYearTiny*/, 2 /*untilMonth*/, 21 /*untilDay*/, @@ -14435,7 +14435,7 @@ static const extended::ZoneEra kZoneEraEurope_Tallinn[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14469,7 +14469,7 @@ static const extended::ZoneEra kZoneEraEurope_Tirane[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14503,7 +14503,7 @@ static const extended::ZoneEra kZoneEraEurope_Ulyanovsk[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+03/+04" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -14515,7 +14515,7 @@ static const extended::ZoneEra kZoneEraEurope_Ulyanovsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -14527,7 +14527,7 @@ static const extended::ZoneEra kZoneEraEurope_Ulyanovsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 16 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -14539,7 +14539,7 @@ static const extended::ZoneEra kZoneEraEurope_Ulyanovsk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14573,7 +14573,7 @@ static const extended::ZoneEra kZoneEraEurope_Uzhgorod[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14607,7 +14607,7 @@ static const extended::ZoneEra kZoneEraEurope_Vienna[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14641,7 +14641,7 @@ static const extended::ZoneEra kZoneEraEurope_Vilnius[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 10 /*untilMonth*/, 31 /*untilDay*/, @@ -14653,7 +14653,7 @@ static const extended::ZoneEra kZoneEraEurope_Vilnius[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "EET" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 3 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14665,7 +14665,7 @@ static const extended::ZoneEra kZoneEraEurope_Vilnius[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14699,7 +14699,7 @@ static const extended::ZoneEra kZoneEraEurope_Volgograd[] ACE_TIME_PROGMEM = { &kPolicyRussia /*zonePolicy*/, "+03/+04" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 3 /*untilMonth*/, 27 /*untilDay*/, @@ -14711,7 +14711,7 @@ static const extended::ZoneEra kZoneEraEurope_Volgograd[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 10 /*untilMonth*/, 26 /*untilDay*/, @@ -14723,7 +14723,7 @@ static const extended::ZoneEra kZoneEraEurope_Volgograd[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 18 /*untilYearTiny*/, 10 /*untilMonth*/, 28 /*untilDay*/, @@ -14735,7 +14735,7 @@ static const extended::ZoneEra kZoneEraEurope_Volgograd[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 20 /*untilYearTiny*/, 12 /*untilMonth*/, 27 /*untilDay*/, @@ -14747,7 +14747,7 @@ static const extended::ZoneEra kZoneEraEurope_Volgograd[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+03" /*format*/, 12 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14781,7 +14781,7 @@ static const extended::ZoneEra kZoneEraEurope_Warsaw[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14815,7 +14815,7 @@ static const extended::ZoneEra kZoneEraEurope_Zaporozhye[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "EE%T" /*format*/, 8 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14849,7 +14849,7 @@ static const extended::ZoneEra kZoneEraEurope_Zurich[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "CE%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14883,7 +14883,7 @@ static const extended::ZoneEra kZoneEraHST[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "HST" /*format*/, -40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14917,7 +14917,7 @@ static const extended::ZoneEra kZoneEraIndian_Chagos[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+06" /*format*/, 24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14951,7 +14951,7 @@ static const extended::ZoneEra kZoneEraIndian_Christmas[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+07" /*format*/, 28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14985,7 +14985,7 @@ static const extended::ZoneEra kZoneEraIndian_Cocos[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+0630" /*format*/, 26 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15019,7 +15019,7 @@ static const extended::ZoneEra kZoneEraIndian_Kerguelen[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15053,7 +15053,7 @@ static const extended::ZoneEra kZoneEraIndian_Mahe[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15087,7 +15087,7 @@ static const extended::ZoneEra kZoneEraIndian_Maldives[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+05" /*format*/, 20 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15121,7 +15121,7 @@ static const extended::ZoneEra kZoneEraIndian_Mauritius[] ACE_TIME_PROGMEM = { &kPolicyMauritius /*zonePolicy*/, "+04/+05" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15155,7 +15155,7 @@ static const extended::ZoneEra kZoneEraIndian_Reunion[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+04" /*format*/, 16 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15189,7 +15189,7 @@ static const extended::ZoneEra kZoneEraMET[] ACE_TIME_PROGMEM = { &kPolicyC_Eur /*zonePolicy*/, "ME%T" /*format*/, 4 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15223,7 +15223,7 @@ static const extended::ZoneEra kZoneEraMST[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "MST" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15257,7 +15257,7 @@ static const extended::ZoneEra kZoneEraMST7MDT[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "M%T" /*format*/, -28 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15291,7 +15291,7 @@ static const extended::ZoneEra kZoneEraPST8PDT[] ACE_TIME_PROGMEM = { &kPolicyUS /*zonePolicy*/, "P%T" /*format*/, -32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15325,7 +15325,7 @@ static const extended::ZoneEra kZoneEraPacific_Apia[] ACE_TIME_PROGMEM = { &kPolicyWS /*zonePolicy*/, "-11/-10" /*format*/, -44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 12 /*untilMonth*/, 29 /*untilDay*/, @@ -15337,7 +15337,7 @@ static const extended::ZoneEra kZoneEraPacific_Apia[] ACE_TIME_PROGMEM = { &kPolicyWS /*zonePolicy*/, "+13/+14" /*format*/, 52 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15371,7 +15371,7 @@ static const extended::ZoneEra kZoneEraPacific_Auckland[] ACE_TIME_PROGMEM = { &kPolicyNZ /*zonePolicy*/, "NZ%T" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15405,7 +15405,7 @@ static const extended::ZoneEra kZoneEraPacific_Bougainville[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 14 /*untilYearTiny*/, 12 /*untilMonth*/, 28 /*untilDay*/, @@ -15417,7 +15417,7 @@ static const extended::ZoneEra kZoneEraPacific_Bougainville[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15451,7 +15451,7 @@ static const extended::ZoneEra kZoneEraPacific_Chatham[] ACE_TIME_PROGMEM = { &kPolicyChatham /*zonePolicy*/, "+1245/+1345" /*format*/, 51 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15485,7 +15485,7 @@ static const extended::ZoneEra kZoneEraPacific_Chuuk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15519,7 +15519,7 @@ static const extended::ZoneEra kZoneEraPacific_Easter[] ACE_TIME_PROGMEM = { &kPolicyChile /*zonePolicy*/, "-06/-05" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15553,7 +15553,7 @@ static const extended::ZoneEra kZoneEraPacific_Efate[] ACE_TIME_PROGMEM = { &kPolicyVanuatu /*zonePolicy*/, "+11/+12" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15587,7 +15587,7 @@ static const extended::ZoneEra kZoneEraPacific_Enderbury[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+13" /*format*/, 52 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15621,7 +15621,7 @@ static const extended::ZoneEra kZoneEraPacific_Fakaofo[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-11" /*format*/, -44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 11 /*untilYearTiny*/, 12 /*untilMonth*/, 30 /*untilDay*/, @@ -15633,7 +15633,7 @@ static const extended::ZoneEra kZoneEraPacific_Fakaofo[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+13" /*format*/, 52 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15667,7 +15667,7 @@ static const extended::ZoneEra kZoneEraPacific_Fiji[] ACE_TIME_PROGMEM = { &kPolicyFiji /*zonePolicy*/, "+12/+13" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15701,7 +15701,7 @@ static const extended::ZoneEra kZoneEraPacific_Funafuti[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15735,7 +15735,7 @@ static const extended::ZoneEra kZoneEraPacific_Galapagos[] ACE_TIME_PROGMEM = { &kPolicyEcuador /*zonePolicy*/, "-06/-05" /*format*/, -24 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15769,7 +15769,7 @@ static const extended::ZoneEra kZoneEraPacific_Gambier[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-09" /*format*/, -36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15803,7 +15803,7 @@ static const extended::ZoneEra kZoneEraPacific_Guadalcanal[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15837,7 +15837,7 @@ static const extended::ZoneEra kZoneEraPacific_Guam[] ACE_TIME_PROGMEM = { &kPolicyGuam /*zonePolicy*/, "G%T" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 0 /*untilYearTiny*/, 12 /*untilMonth*/, 23 /*untilDay*/, @@ -15849,7 +15849,7 @@ static const extended::ZoneEra kZoneEraPacific_Guam[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "ChST" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15883,7 +15883,7 @@ static const extended::ZoneEra kZoneEraPacific_Honolulu[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "HST" /*format*/, -40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15917,7 +15917,7 @@ static const extended::ZoneEra kZoneEraPacific_Kiritimati[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+14" /*format*/, 56 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15951,7 +15951,7 @@ static const extended::ZoneEra kZoneEraPacific_Kosrae[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15963,7 +15963,7 @@ static const extended::ZoneEra kZoneEraPacific_Kosrae[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -15997,7 +15997,7 @@ static const extended::ZoneEra kZoneEraPacific_Kwajalein[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16031,7 +16031,7 @@ static const extended::ZoneEra kZoneEraPacific_Majuro[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16065,7 +16065,7 @@ static const extended::ZoneEra kZoneEraPacific_Marquesas[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-0930" /*format*/, -38 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16099,7 +16099,7 @@ static const extended::ZoneEra kZoneEraPacific_Nauru[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16133,7 +16133,7 @@ static const extended::ZoneEra kZoneEraPacific_Niue[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-11" /*format*/, -44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16167,7 +16167,7 @@ static const extended::ZoneEra kZoneEraPacific_Norfolk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+1130" /*format*/, 46 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 15 /*untilYearTiny*/, 10 /*untilMonth*/, 4 /*untilDay*/, @@ -16179,7 +16179,7 @@ static const extended::ZoneEra kZoneEraPacific_Norfolk[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 19 /*untilYearTiny*/, 7 /*untilMonth*/, 1 /*untilDay*/, @@ -16191,7 +16191,7 @@ static const extended::ZoneEra kZoneEraPacific_Norfolk[] ACE_TIME_PROGMEM = { &kPolicyAN /*zonePolicy*/, "+11/+12" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16225,7 +16225,7 @@ static const extended::ZoneEra kZoneEraPacific_Noumea[] ACE_TIME_PROGMEM = { &kPolicyNC /*zonePolicy*/, "+11/+12" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16259,7 +16259,7 @@ static const extended::ZoneEra kZoneEraPacific_Pago_Pago[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "SST" /*format*/, -44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16293,7 +16293,7 @@ static const extended::ZoneEra kZoneEraPacific_Palau[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+09" /*format*/, 36 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16327,7 +16327,7 @@ static const extended::ZoneEra kZoneEraPacific_Pitcairn[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-08" /*format*/, -32 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16361,7 +16361,7 @@ static const extended::ZoneEra kZoneEraPacific_Pohnpei[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16395,7 +16395,7 @@ static const extended::ZoneEra kZoneEraPacific_Port_Moresby[] ACE_TIME_PROGMEM = nullptr /*zonePolicy*/, "+10" /*format*/, 40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16429,7 +16429,7 @@ static const extended::ZoneEra kZoneEraPacific_Rarotonga[] ACE_TIME_PROGMEM = { &kPolicyCook /*zonePolicy*/, "-10/-0930" /*format*/, -40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16463,7 +16463,7 @@ static const extended::ZoneEra kZoneEraPacific_Tahiti[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "-10" /*format*/, -40 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16497,7 +16497,7 @@ static const extended::ZoneEra kZoneEraPacific_Tarawa[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16531,7 +16531,7 @@ static const extended::ZoneEra kZoneEraPacific_Tongatapu[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+13" /*format*/, 52 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -1 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16543,7 +16543,7 @@ static const extended::ZoneEra kZoneEraPacific_Tongatapu[] ACE_TIME_PROGMEM = { &kPolicyTonga /*zonePolicy*/, "+13/+14" /*format*/, 52 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16577,7 +16577,7 @@ static const extended::ZoneEra kZoneEraPacific_Wake[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16611,7 +16611,7 @@ static const extended::ZoneEra kZoneEraPacific_Wallis[] ACE_TIME_PROGMEM = { nullptr /*zonePolicy*/, "+12" /*format*/, 48 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -16645,7 +16645,7 @@ static const extended::ZoneEra kZoneEraWET[] ACE_TIME_PROGMEM = { &kPolicyEU /*zonePolicy*/, "WE%T" /*format*/, 0 /*offsetCode*/, - 4 /*deltaCode ((offsetMinute=0 << 4) + (deltaMinute=0/15 + 4))*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, diff --git a/src/ace_time/zonedbx/zone_policies.cpp b/src/ace_time/zonedbx/zone_policies.cpp index 86a505962..af45ed866 100644 --- a/src/ace_time/zonedbx/zone_policies.cpp +++ b/src/ace_time/zonedbx/zone_policies.cpp @@ -28,7 +28,7 @@ // Rules: 551 // Letter Size (bytes): 27 // Total Memory 8-bit (bytes): 5504 -// Total Memory 32-bit (bytes): 7707 +// Total Memory 32-bit (bytes): 7675 // // DO NOT EDIT @@ -55,7 +55,7 @@ static const extended::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule AN 1990 1995 - Mar Sun>=1 2:00s 0 S @@ -67,7 +67,7 @@ static const extended::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AN 1996 2005 - Mar lastSun 2:00s 0 S @@ -79,7 +79,7 @@ static const extended::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AN 2000 only - Aug lastSun 2:00s 1:00 D @@ -91,7 +91,7 @@ static const extended::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule AN 2001 2007 - Oct lastSun 2:00s 1:00 D @@ -103,7 +103,7 @@ static const extended::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule AN 2006 only - Apr Sun>=1 2:00s 0 S @@ -115,7 +115,7 @@ static const extended::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AN 2007 only - Mar lastSun 2:00s 0 S @@ -127,7 +127,7 @@ static const extended::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AN 2008 max - Apr Sun>=1 2:00s 0 S @@ -139,7 +139,7 @@ static const extended::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AN 2008 max - Oct Sun>=1 2:00s 1:00 D @@ -151,7 +151,7 @@ static const extended::ZoneRule kZoneRulesAN[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, @@ -183,7 +183,7 @@ static const extended::ZoneRule kZoneRulesAQ[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -215,7 +215,7 @@ static const extended::ZoneRule kZoneRulesAS[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule AS 1994 only - Mar 20 2:00s 0 S @@ -227,7 +227,7 @@ static const extended::ZoneRule kZoneRulesAS[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AS 1995 2005 - Mar lastSun 2:00s 0 S @@ -239,7 +239,7 @@ static const extended::ZoneRule kZoneRulesAS[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AS 2006 only - Apr 2 2:00s 0 S @@ -251,7 +251,7 @@ static const extended::ZoneRule kZoneRulesAS[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AS 2007 only - Mar lastSun 2:00s 0 S @@ -263,7 +263,7 @@ static const extended::ZoneRule kZoneRulesAS[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AS 2008 max - Apr Sun>=1 2:00s 0 S @@ -275,7 +275,7 @@ static const extended::ZoneRule kZoneRulesAS[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AS 2008 max - Oct Sun>=1 2:00s 1:00 D @@ -287,7 +287,7 @@ static const extended::ZoneRule kZoneRulesAS[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, @@ -319,7 +319,7 @@ static const extended::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule AT 1991 1999 - Oct Sun>=1 2:00s 1:00 D @@ -331,7 +331,7 @@ static const extended::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule AT 1991 2005 - Mar lastSun 2:00s 0 S @@ -343,7 +343,7 @@ static const extended::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AT 2000 only - Aug lastSun 2:00s 1:00 D @@ -355,7 +355,7 @@ static const extended::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule AT 2001 max - Oct Sun>=1 2:00s 1:00 D @@ -367,7 +367,7 @@ static const extended::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule AT 2006 only - Apr Sun>=1 2:00s 0 S @@ -379,7 +379,7 @@ static const extended::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AT 2007 only - Mar lastSun 2:00s 0 S @@ -391,7 +391,7 @@ static const extended::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AT 2008 max - Apr Sun>=1 2:00s 0 S @@ -403,7 +403,7 @@ static const extended::ZoneRule kZoneRulesAT[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -435,7 +435,7 @@ static const extended::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule AV 1991 1994 - Mar Sun>=1 2:00s 0 S @@ -447,7 +447,7 @@ static const extended::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AV 1995 2005 - Mar lastSun 2:00s 0 S @@ -459,7 +459,7 @@ static const extended::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AV 2000 only - Aug lastSun 2:00s 1:00 D @@ -471,7 +471,7 @@ static const extended::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule AV 2001 2007 - Oct lastSun 2:00s 1:00 D @@ -483,7 +483,7 @@ static const extended::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule AV 2006 only - Apr Sun>=1 2:00s 0 S @@ -495,7 +495,7 @@ static const extended::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AV 2007 only - Mar lastSun 2:00s 0 S @@ -507,7 +507,7 @@ static const extended::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AV 2008 max - Apr Sun>=1 2:00s 0 S @@ -519,7 +519,7 @@ static const extended::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AV 2008 max - Oct Sun>=1 2:00s 1:00 D @@ -531,7 +531,7 @@ static const extended::ZoneRule kZoneRulesAV[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, @@ -563,7 +563,7 @@ static const extended::ZoneRule kZoneRulesAW[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AW 2006 only - Dec 3 2:00s 1:00 D @@ -575,7 +575,7 @@ static const extended::ZoneRule kZoneRulesAW[] ACE_TIME_PROGMEM = { 3 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule AW 2007 2009 - Mar lastSun 2:00s 0 S @@ -587,7 +587,7 @@ static const extended::ZoneRule kZoneRulesAW[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule AW 2007 2008 - Oct lastSun 2:00s 1:00 D @@ -599,7 +599,7 @@ static const extended::ZoneRule kZoneRulesAW[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, @@ -631,7 +631,7 @@ static const extended::ZoneRule kZoneRulesArg[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Arg 1999 only - Oct Sun>=1 0:00 1:00 - @@ -643,7 +643,7 @@ static const extended::ZoneRule kZoneRulesArg[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Arg 2000 only - Mar 3 0:00 0 - @@ -655,7 +655,7 @@ static const extended::ZoneRule kZoneRulesArg[] ACE_TIME_PROGMEM = { 3 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Arg 2007 only - Dec 30 0:00 1:00 - @@ -667,7 +667,7 @@ static const extended::ZoneRule kZoneRulesArg[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Arg 2008 2009 - Mar Sun>=15 0:00 0 - @@ -679,7 +679,7 @@ static const extended::ZoneRule kZoneRulesArg[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 - @@ -691,7 +691,7 @@ static const extended::ZoneRule kZoneRulesArg[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, @@ -723,7 +723,7 @@ static const extended::ZoneRule kZoneRulesArmenia[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Armenia 2011 only - Mar lastSun 2:00s 1:00 - @@ -735,7 +735,7 @@ static const extended::ZoneRule kZoneRulesArmenia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Armenia 2011 only - Oct lastSun 2:00s 0 - @@ -747,7 +747,7 @@ static const extended::ZoneRule kZoneRulesArmenia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -779,7 +779,7 @@ static const extended::ZoneRule kZoneRulesAus[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -811,7 +811,7 @@ static const extended::ZoneRule kZoneRulesAzer[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 16 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Azer 1997 2015 - Oct lastSun 5:00 0 - @@ -823,7 +823,7 @@ static const extended::ZoneRule kZoneRulesAzer[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 20 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -855,7 +855,7 @@ static const extended::ZoneRule kZoneRulesBarb[] ACE_TIME_PROGMEM = { 25 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -887,7 +887,7 @@ static const extended::ZoneRule kZoneRulesBelize[] ACE_TIME_PROGMEM = { 12 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 0 /*letter (index to "CST")*/, }, @@ -923,7 +923,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 11 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 1999 only - Feb 21 0:00 0 - @@ -935,7 +935,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 1999 only - Oct 3 0:00 1:00 - @@ -947,7 +947,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 3 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2000 only - Feb 27 0:00 0 - @@ -959,7 +959,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 27 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2000 2001 - Oct Sun>=8 0:00 1:00 - @@ -971,7 +971,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2001 2006 - Feb Sun>=15 0:00 0 - @@ -983,7 +983,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2002 only - Nov 3 0:00 1:00 - @@ -995,7 +995,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 3 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2003 only - Oct 19 0:00 1:00 - @@ -1007,7 +1007,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 19 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2004 only - Nov 2 0:00 1:00 - @@ -1019,7 +1019,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2005 only - Oct 16 0:00 1:00 - @@ -1031,7 +1031,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 16 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2006 only - Nov 5 0:00 1:00 - @@ -1043,7 +1043,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 5 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2007 only - Feb 25 0:00 0 - @@ -1055,7 +1055,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 25 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2007 only - Oct Sun>=8 0:00 1:00 - @@ -1067,7 +1067,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2008 2017 - Oct Sun>=15 0:00 1:00 - @@ -1079,7 +1079,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2008 2011 - Feb Sun>=15 0:00 0 - @@ -1091,7 +1091,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2012 only - Feb Sun>=22 0:00 0 - @@ -1103,7 +1103,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2013 2014 - Feb Sun>=15 0:00 0 - @@ -1115,7 +1115,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2015 only - Feb Sun>=22 0:00 0 - @@ -1127,7 +1127,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2016 2019 - Feb Sun>=15 0:00 0 - @@ -1139,7 +1139,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Brazil 2018 only - Nov Sun>=1 0:00 1:00 - @@ -1151,7 +1151,7 @@ static const extended::ZoneRule kZoneRulesBrazil[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, @@ -1183,7 +1183,7 @@ static const extended::ZoneRule kZoneRulesC_Eur[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule C-Eur 1981 max - Mar lastSun 2:00s 1:00 S @@ -1195,7 +1195,7 @@ static const extended::ZoneRule kZoneRulesC_Eur[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule C-Eur 1996 max - Oct lastSun 2:00s 0 - @@ -1207,7 +1207,7 @@ static const extended::ZoneRule kZoneRulesC_Eur[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -1239,7 +1239,7 @@ static const extended::ZoneRule kZoneRulesCO[] ACE_TIME_PROGMEM = { 4 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -1271,7 +1271,7 @@ static const extended::ZoneRule kZoneRulesCR[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -1303,7 +1303,7 @@ static const extended::ZoneRule kZoneRulesCanada[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Canada 1974 2006 - Oct lastSun 2:00 0 S @@ -1315,7 +1315,7 @@ static const extended::ZoneRule kZoneRulesCanada[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Canada 1987 2006 - Apr Sun>=1 2:00 1:00 D @@ -1327,7 +1327,7 @@ static const extended::ZoneRule kZoneRulesCanada[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Canada 2007 max - Mar Sun>=8 2:00 1:00 D @@ -1339,7 +1339,7 @@ static const extended::ZoneRule kZoneRulesCanada[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Canada 2007 max - Nov Sun>=1 2:00 0 S @@ -1351,7 +1351,7 @@ static const extended::ZoneRule kZoneRulesCanada[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -1383,7 +1383,7 @@ static const extended::ZoneRule kZoneRulesChatham[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 11 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Chatham 1990 2006 - Oct Sun>=1 2:45s 1:00 - @@ -1395,7 +1395,7 @@ static const extended::ZoneRule kZoneRulesChatham[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 11 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Chatham 1990 2007 - Mar Sun>=15 2:45s 0 - @@ -1407,7 +1407,7 @@ static const extended::ZoneRule kZoneRulesChatham[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 11 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Chatham 2007 max - Sep lastSun 2:45s 1:00 - @@ -1419,7 +1419,7 @@ static const extended::ZoneRule kZoneRulesChatham[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 11 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Chatham 2008 max - Apr Sun>=1 2:45s 0 - @@ -1431,7 +1431,7 @@ static const extended::ZoneRule kZoneRulesChatham[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 11 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -1463,7 +1463,7 @@ static const extended::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 27 /*onDayOfMonth*/, 16 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Chile 1999 only - Apr 4 3:00u 0 - @@ -1475,7 +1475,7 @@ static const extended::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 4 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Chile 1999 2010 - Oct Sun>=9 4:00u 1:00 - @@ -1487,7 +1487,7 @@ static const extended::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 16 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 - @@ -1499,7 +1499,7 @@ static const extended::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Chile 2008 only - Mar 30 3:00u 0 - @@ -1511,7 +1511,7 @@ static const extended::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Chile 2009 only - Mar Sun>=9 3:00u 0 - @@ -1523,7 +1523,7 @@ static const extended::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Chile 2010 only - Apr Sun>=1 3:00u 0 - @@ -1535,7 +1535,7 @@ static const extended::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Chile 2011 only - May Sun>=2 3:00u 0 - @@ -1547,7 +1547,7 @@ static const extended::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 - @@ -1559,7 +1559,7 @@ static const extended::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 16 /*onDayOfMonth*/, 16 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Chile 2012 2014 - Apr Sun>=23 3:00u 0 - @@ -1571,7 +1571,7 @@ static const extended::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 23 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Chile 2012 2014 - Sep Sun>=2 4:00u 1:00 - @@ -1583,7 +1583,7 @@ static const extended::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 16 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Chile 2016 2018 - May Sun>=9 3:00u 0 - @@ -1595,7 +1595,7 @@ static const extended::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Chile 2016 2018 - Aug Sun>=9 4:00u 1:00 - @@ -1607,7 +1607,7 @@ static const extended::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 16 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Chile 2019 max - Apr Sun>=2 3:00u 0 - @@ -1619,7 +1619,7 @@ static const extended::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 12 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Chile 2019 max - Sep Sun>=2 4:00u 1:00 - @@ -1631,7 +1631,7 @@ static const extended::ZoneRule kZoneRulesChile[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 16 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, @@ -1663,7 +1663,7 @@ static const extended::ZoneRule kZoneRulesCook[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -1695,7 +1695,7 @@ static const extended::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 12 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D @@ -1707,7 +1707,7 @@ static const extended::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S @@ -1719,7 +1719,7 @@ static const extended::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Cuba 2000 2003 - Apr Sun>=1 0:00s 1:00 D @@ -1731,7 +1731,7 @@ static const extended::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Cuba 2004 only - Mar lastSun 0:00s 1:00 D @@ -1743,7 +1743,7 @@ static const extended::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Cuba 2006 2010 - Oct lastSun 0:00s 0 S @@ -1755,7 +1755,7 @@ static const extended::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D @@ -1767,7 +1767,7 @@ static const extended::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D @@ -1779,7 +1779,7 @@ static const extended::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Cuba 2009 2010 - Mar Sun>=8 0:00s 1:00 D @@ -1791,7 +1791,7 @@ static const extended::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Cuba 2011 only - Mar Sun>=15 0:00s 1:00 D @@ -1803,7 +1803,7 @@ static const extended::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Cuba 2011 only - Nov 13 0:00s 0 S @@ -1815,7 +1815,7 @@ static const extended::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 13 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Cuba 2012 only - Apr 1 0:00s 1:00 D @@ -1827,7 +1827,7 @@ static const extended::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Cuba 2012 max - Nov Sun>=1 0:00s 0 S @@ -1839,7 +1839,7 @@ static const extended::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Cuba 2013 max - Mar Sun>=8 0:00s 1:00 D @@ -1851,7 +1851,7 @@ static const extended::ZoneRule kZoneRulesCuba[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, @@ -1883,7 +1883,7 @@ static const extended::ZoneRule kZoneRulesDhaka[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Dhaka 2009 only - Jun 19 23:00 1:00 - @@ -1895,7 +1895,7 @@ static const extended::ZoneRule kZoneRulesDhaka[] ACE_TIME_PROGMEM = { 19 /*onDayOfMonth*/, 92 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Dhaka 2009 only - Dec 31 24:00 0 - @@ -1907,7 +1907,7 @@ static const extended::ZoneRule kZoneRulesDhaka[] ACE_TIME_PROGMEM = { 31 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -1939,7 +1939,7 @@ static const extended::ZoneRule kZoneRulesE_EurAsia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule E-EurAsia 1979 1995 - Sep lastSun 0:00 0 - @@ -1951,7 +1951,7 @@ static const extended::ZoneRule kZoneRulesE_EurAsia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule E-EurAsia 1996 max - Oct lastSun 0:00 0 - @@ -1963,7 +1963,7 @@ static const extended::ZoneRule kZoneRulesE_EurAsia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -1995,7 +1995,7 @@ static const extended::ZoneRule kZoneRulesEU[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S @@ -2007,7 +2007,7 @@ static const extended::ZoneRule kZoneRulesEU[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule EU 1996 max - Oct lastSun 1:00u 0 - @@ -2019,7 +2019,7 @@ static const extended::ZoneRule kZoneRulesEU[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -2051,7 +2051,7 @@ static const extended::ZoneRule kZoneRulesEUAsia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule EUAsia 1979 1995 - Sep lastSun 1:00u 0 - @@ -2063,7 +2063,7 @@ static const extended::ZoneRule kZoneRulesEUAsia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule EUAsia 1996 max - Oct lastSun 1:00u 0 - @@ -2075,7 +2075,7 @@ static const extended::ZoneRule kZoneRulesEUAsia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -2107,7 +2107,7 @@ static const extended::ZoneRule kZoneRulesEcuador[] ACE_TIME_PROGMEM = { 5 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -2139,7 +2139,7 @@ static const extended::ZoneRule kZoneRulesEgypt[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Egypt 1995 2010 - Apr lastFri 0:00s 1:00 S @@ -2151,7 +2151,7 @@ static const extended::ZoneRule kZoneRulesEgypt[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Egypt 1995 2005 - Sep lastThu 24:00 0 - @@ -2163,7 +2163,7 @@ static const extended::ZoneRule kZoneRulesEgypt[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Egypt 2006 only - Sep 21 24:00 0 - @@ -2175,7 +2175,7 @@ static const extended::ZoneRule kZoneRulesEgypt[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - @@ -2187,7 +2187,7 @@ static const extended::ZoneRule kZoneRulesEgypt[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Egypt 2008 only - Aug lastThu 24:00 0 - @@ -2199,7 +2199,7 @@ static const extended::ZoneRule kZoneRulesEgypt[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Egypt 2009 only - Aug 20 24:00 0 - @@ -2211,7 +2211,7 @@ static const extended::ZoneRule kZoneRulesEgypt[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Egypt 2010 only - Aug 10 24:00 0 - @@ -2223,7 +2223,7 @@ static const extended::ZoneRule kZoneRulesEgypt[] ACE_TIME_PROGMEM = { 10 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Egypt 2010 only - Sep 9 24:00 1:00 S @@ -2235,7 +2235,7 @@ static const extended::ZoneRule kZoneRulesEgypt[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Egypt 2010 only - Sep lastThu 24:00 0 - @@ -2247,7 +2247,7 @@ static const extended::ZoneRule kZoneRulesEgypt[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Egypt 2014 only - May 15 24:00 1:00 S @@ -2259,7 +2259,7 @@ static const extended::ZoneRule kZoneRulesEgypt[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Egypt 2014 only - Jun 26 24:00 0 - @@ -2271,7 +2271,7 @@ static const extended::ZoneRule kZoneRulesEgypt[] ACE_TIME_PROGMEM = { 26 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Egypt 2014 only - Jul 31 24:00 1:00 S @@ -2283,7 +2283,7 @@ static const extended::ZoneRule kZoneRulesEgypt[] ACE_TIME_PROGMEM = { 31 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Egypt 2014 only - Sep lastThu 24:00 0 - @@ -2295,7 +2295,7 @@ static const extended::ZoneRule kZoneRulesEgypt[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -2327,7 +2327,7 @@ static const extended::ZoneRule kZoneRulesEire[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Eire 1990 1995 - Oct Sun>=22 1:00u -1:00 - @@ -2339,7 +2339,7 @@ static const extended::ZoneRule kZoneRulesEire[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Eire 1996 max - Oct lastSun 1:00u -1:00 - @@ -2351,7 +2351,7 @@ static const extended::ZoneRule kZoneRulesEire[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, @@ -2383,7 +2383,7 @@ static const extended::ZoneRule kZoneRulesFalk[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Falk 1985 2000 - Sep Sun>=9 0:00 1:00 - @@ -2395,7 +2395,7 @@ static const extended::ZoneRule kZoneRulesFalk[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Falk 1986 2000 - Apr Sun>=16 0:00 0 - @@ -2407,7 +2407,7 @@ static const extended::ZoneRule kZoneRulesFalk[] ACE_TIME_PROGMEM = { 16 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Falk 2001 2010 - Apr Sun>=15 2:00 0 - @@ -2419,7 +2419,7 @@ static const extended::ZoneRule kZoneRulesFalk[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Falk 2001 2010 - Sep Sun>=1 2:00 1:00 - @@ -2431,7 +2431,7 @@ static const extended::ZoneRule kZoneRulesFalk[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, @@ -2463,7 +2463,7 @@ static const extended::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - @@ -2475,7 +2475,7 @@ static const extended::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Fiji 2009 only - Nov 29 2:00 1:00 - @@ -2487,7 +2487,7 @@ static const extended::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 29 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Fiji 2010 only - Mar lastSun 3:00 0 - @@ -2499,7 +2499,7 @@ static const extended::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Fiji 2010 2013 - Oct Sun>=21 2:00 1:00 - @@ -2511,7 +2511,7 @@ static const extended::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - @@ -2523,7 +2523,7 @@ static const extended::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 - @@ -2535,7 +2535,7 @@ static const extended::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 18 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Fiji 2014 only - Jan Sun>=18 2:00 0 - @@ -2547,7 +2547,7 @@ static const extended::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 18 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Fiji 2014 2018 - Nov Sun>=1 2:00 1:00 - @@ -2559,7 +2559,7 @@ static const extended::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Fiji 2015 max - Jan Sun>=12 3:00 0 - @@ -2571,7 +2571,7 @@ static const extended::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 12 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Fiji 2019 only - Nov Sun>=8 2:00 1:00 - @@ -2583,7 +2583,7 @@ static const extended::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Fiji 2020 only - Dec 20 2:00 1:00 - @@ -2595,7 +2595,7 @@ static const extended::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Fiji 2021 max - Nov Sun>=8 2:00 1:00 - @@ -2607,7 +2607,7 @@ static const extended::ZoneRule kZoneRulesFiji[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, @@ -2639,7 +2639,7 @@ static const extended::ZoneRule kZoneRulesGhana[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 0 /*letter (index to "GMT")*/, }, @@ -2675,7 +2675,7 @@ static const extended::ZoneRule kZoneRulesGuam[] ACE_TIME_PROGMEM = { 28 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -2707,7 +2707,7 @@ static const extended::ZoneRule kZoneRulesGuat[] ACE_TIME_PROGMEM = { 7 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Guat 2006 only - Apr 30 0:00 1:00 D @@ -2719,7 +2719,7 @@ static const extended::ZoneRule kZoneRulesGuat[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Guat 2006 only - Oct 1 0:00 0 S @@ -2731,7 +2731,7 @@ static const extended::ZoneRule kZoneRulesGuat[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -2763,7 +2763,7 @@ static const extended::ZoneRule kZoneRulesHK[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 14 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -2795,7 +2795,7 @@ static const extended::ZoneRule kZoneRulesHaiti[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Haiti 2005 2006 - Apr Sun>=1 0:00 1:00 D @@ -2807,7 +2807,7 @@ static const extended::ZoneRule kZoneRulesHaiti[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Haiti 2005 2006 - Oct lastSun 0:00 0 S @@ -2819,7 +2819,7 @@ static const extended::ZoneRule kZoneRulesHaiti[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Haiti 2012 2015 - Mar Sun>=8 2:00 1:00 D @@ -2831,7 +2831,7 @@ static const extended::ZoneRule kZoneRulesHaiti[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Haiti 2012 2015 - Nov Sun>=1 2:00 0 S @@ -2843,7 +2843,7 @@ static const extended::ZoneRule kZoneRulesHaiti[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Haiti 2017 max - Mar Sun>=8 2:00 1:00 D @@ -2855,7 +2855,7 @@ static const extended::ZoneRule kZoneRulesHaiti[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Haiti 2017 max - Nov Sun>=1 2:00 0 S @@ -2867,7 +2867,7 @@ static const extended::ZoneRule kZoneRulesHaiti[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -2899,7 +2899,7 @@ static const extended::ZoneRule kZoneRulesHoliday[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -2931,7 +2931,7 @@ static const extended::ZoneRule kZoneRulesHond[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Hond 2006 only - May Sun>=1 0:00 1:00 D @@ -2943,7 +2943,7 @@ static const extended::ZoneRule kZoneRulesHond[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Hond 2006 only - Aug Mon>=1 0:00 0 S @@ -2955,7 +2955,7 @@ static const extended::ZoneRule kZoneRulesHond[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -2987,7 +2987,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 1997 1999 - Mar 21 24:00 1:00 - @@ -2999,7 +2999,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 1997 1999 - Sep 21 24:00 0 - @@ -3011,7 +3011,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2000 only - Mar 20 24:00 1:00 - @@ -3023,7 +3023,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2000 only - Sep 20 24:00 0 - @@ -3035,7 +3035,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2001 2003 - Mar 21 24:00 1:00 - @@ -3047,7 +3047,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2001 2003 - Sep 21 24:00 0 - @@ -3059,7 +3059,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2004 only - Mar 20 24:00 1:00 - @@ -3071,7 +3071,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2004 only - Sep 20 24:00 0 - @@ -3083,7 +3083,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2005 only - Mar 21 24:00 1:00 - @@ -3095,7 +3095,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2005 only - Sep 21 24:00 0 - @@ -3107,7 +3107,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2008 only - Mar 20 24:00 1:00 - @@ -3119,7 +3119,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2008 only - Sep 20 24:00 0 - @@ -3131,7 +3131,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2009 2011 - Mar 21 24:00 1:00 - @@ -3143,7 +3143,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2009 2011 - Sep 21 24:00 0 - @@ -3155,7 +3155,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2012 only - Mar 20 24:00 1:00 - @@ -3167,7 +3167,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2012 only - Sep 20 24:00 0 - @@ -3179,7 +3179,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2013 2015 - Mar 21 24:00 1:00 - @@ -3191,7 +3191,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2013 2015 - Sep 21 24:00 0 - @@ -3203,7 +3203,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2016 only - Mar 20 24:00 1:00 - @@ -3215,7 +3215,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2016 only - Sep 20 24:00 0 - @@ -3227,7 +3227,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2017 2019 - Mar 21 24:00 1:00 - @@ -3239,7 +3239,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2017 2019 - Sep 21 24:00 0 - @@ -3251,7 +3251,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2020 only - Mar 20 24:00 1:00 - @@ -3263,7 +3263,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2020 only - Sep 20 24:00 0 - @@ -3275,7 +3275,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2021 2023 - Mar 21 24:00 1:00 - @@ -3287,7 +3287,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2021 2023 - Sep 21 24:00 0 - @@ -3299,7 +3299,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2024 only - Mar 20 24:00 1:00 - @@ -3311,7 +3311,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2024 only - Sep 20 24:00 0 - @@ -3323,7 +3323,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2025 2027 - Mar 21 24:00 1:00 - @@ -3335,7 +3335,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2025 2027 - Sep 21 24:00 0 - @@ -3347,7 +3347,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2028 2029 - Mar 20 24:00 1:00 - @@ -3359,7 +3359,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2028 2029 - Sep 20 24:00 0 - @@ -3371,7 +3371,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2030 2031 - Mar 21 24:00 1:00 - @@ -3383,7 +3383,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2030 2031 - Sep 21 24:00 0 - @@ -3395,7 +3395,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2032 2033 - Mar 20 24:00 1:00 - @@ -3407,7 +3407,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2032 2033 - Sep 20 24:00 0 - @@ -3419,7 +3419,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2034 2035 - Mar 21 24:00 1:00 - @@ -3431,7 +3431,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2034 2035 - Sep 21 24:00 0 - @@ -3443,7 +3443,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2036 2037 - Mar 20 24:00 1:00 - @@ -3455,7 +3455,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2036 2037 - Sep 20 24:00 0 - @@ -3467,7 +3467,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2038 2039 - Mar 21 24:00 1:00 - @@ -3479,7 +3479,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2038 2039 - Sep 21 24:00 0 - @@ -3491,7 +3491,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2040 2041 - Mar 20 24:00 1:00 - @@ -3503,7 +3503,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2040 2041 - Sep 20 24:00 0 - @@ -3515,7 +3515,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2042 2043 - Mar 21 24:00 1:00 - @@ -3527,7 +3527,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2042 2043 - Sep 21 24:00 0 - @@ -3539,7 +3539,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2044 2045 - Mar 20 24:00 1:00 - @@ -3551,7 +3551,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2044 2045 - Sep 20 24:00 0 - @@ -3563,7 +3563,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2046 2047 - Mar 21 24:00 1:00 - @@ -3575,7 +3575,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2046 2047 - Sep 21 24:00 0 - @@ -3587,7 +3587,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2048 2049 - Mar 20 24:00 1:00 - @@ -3599,7 +3599,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2048 2049 - Sep 20 24:00 0 - @@ -3611,7 +3611,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2050 2051 - Mar 21 24:00 1:00 - @@ -3623,7 +3623,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iran 2050 2051 - Sep 21 24:00 0 - @@ -3635,7 +3635,7 @@ static const extended::ZoneRule kZoneRulesIran[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -3667,7 +3667,7 @@ static const extended::ZoneRule kZoneRulesIraq[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Iraq 1991 2007 - Apr 1 3:00s 1:00 - @@ -3679,7 +3679,7 @@ static const extended::ZoneRule kZoneRulesIraq[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 12 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Iraq 1991 2007 - Oct 1 3:00s 0 - @@ -3691,7 +3691,7 @@ static const extended::ZoneRule kZoneRulesIraq[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 12 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -3723,7 +3723,7 @@ static const extended::ZoneRule kZoneRulesJapan[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 100 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -3755,7 +3755,7 @@ static const extended::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Jordan 1999 only - Jul 1 0:00s 1:00 S @@ -3767,7 +3767,7 @@ static const extended::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Jordan 1999 2002 - Sep lastFri 0:00s 0 - @@ -3779,7 +3779,7 @@ static const extended::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Jordan 2000 2001 - Mar lastThu 0:00s 1:00 S @@ -3791,7 +3791,7 @@ static const extended::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Jordan 2002 2012 - Mar lastThu 24:00 1:00 S @@ -3803,7 +3803,7 @@ static const extended::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Jordan 2003 only - Oct 24 0:00s 0 - @@ -3815,7 +3815,7 @@ static const extended::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 24 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Jordan 2004 only - Oct 15 0:00s 0 - @@ -3827,7 +3827,7 @@ static const extended::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Jordan 2005 only - Sep lastFri 0:00s 0 - @@ -3839,7 +3839,7 @@ static const extended::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 - @@ -3851,7 +3851,7 @@ static const extended::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Jordan 2013 only - Dec 20 0:00 0 - @@ -3863,7 +3863,7 @@ static const extended::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Jordan 2014 max - Mar lastThu 24:00 1:00 S @@ -3875,7 +3875,7 @@ static const extended::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Jordan 2014 max - Oct lastFri 0:00s 0 - @@ -3887,7 +3887,7 @@ static const extended::ZoneRule kZoneRulesJordan[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -3919,7 +3919,7 @@ static const extended::ZoneRule kZoneRulesKyrgyz[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Kyrgyz 1997 2005 - Mar lastSun 2:30 1:00 - @@ -3931,7 +3931,7 @@ static const extended::ZoneRule kZoneRulesKyrgyz[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 10 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Kyrgyz 1997 2004 - Oct lastSun 2:30 0 - @@ -3943,7 +3943,7 @@ static const extended::ZoneRule kZoneRulesKyrgyz[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 10 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -3975,7 +3975,7 @@ static const extended::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 6 /*deltaCode (deltaMinute=30/15 + 4)*/, + 6 /*deltaCode ((deltaMinutes=30)/15 + 4)*/, '-' /*letter*/, }, // Rule LH 1990 1995 - Mar Sun>=1 2:00 0 - @@ -3987,7 +3987,7 @@ static const extended::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule LH 1996 2005 - Mar lastSun 2:00 0 - @@ -3999,7 +3999,7 @@ static const extended::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule LH 2000 only - Aug lastSun 2:00 0:30 - @@ -4011,7 +4011,7 @@ static const extended::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 6 /*deltaCode (deltaMinute=30/15 + 4)*/, + 6 /*deltaCode ((deltaMinutes=30)/15 + 4)*/, '-' /*letter*/, }, // Rule LH 2001 2007 - Oct lastSun 2:00 0:30 - @@ -4023,7 +4023,7 @@ static const extended::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 6 /*deltaCode (deltaMinute=30/15 + 4)*/, + 6 /*deltaCode ((deltaMinutes=30)/15 + 4)*/, '-' /*letter*/, }, // Rule LH 2006 only - Apr Sun>=1 2:00 0 - @@ -4035,7 +4035,7 @@ static const extended::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule LH 2007 only - Mar lastSun 2:00 0 - @@ -4047,7 +4047,7 @@ static const extended::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule LH 2008 max - Apr Sun>=1 2:00 0 - @@ -4059,7 +4059,7 @@ static const extended::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule LH 2008 max - Oct Sun>=1 2:00 0:30 - @@ -4071,7 +4071,7 @@ static const extended::ZoneRule kZoneRulesLH[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 6 /*deltaCode (deltaMinute=30/15 + 4)*/, + 6 /*deltaCode ((deltaMinutes=30)/15 + 4)*/, '-' /*letter*/, }, @@ -4103,7 +4103,7 @@ static const extended::ZoneRule kZoneRulesLebanon[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Lebanon 1993 1998 - Sep lastSun 0:00 0 - @@ -4115,7 +4115,7 @@ static const extended::ZoneRule kZoneRulesLebanon[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Lebanon 1999 max - Oct lastSun 0:00 0 - @@ -4127,7 +4127,7 @@ static const extended::ZoneRule kZoneRulesLebanon[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -4159,7 +4159,7 @@ static const extended::ZoneRule kZoneRulesLibya[] ACE_TIME_PROGMEM = { 4 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Libya 2013 only - Mar lastFri 1:00 1:00 S @@ -4171,7 +4171,7 @@ static const extended::ZoneRule kZoneRulesLibya[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Libya 2013 only - Oct lastFri 2:00 0 - @@ -4183,7 +4183,7 @@ static const extended::ZoneRule kZoneRulesLibya[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -4215,7 +4215,7 @@ static const extended::ZoneRule kZoneRulesMacau[] ACE_TIME_PROGMEM = { 16 /*onDayOfMonth*/, 14 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -4247,7 +4247,7 @@ static const extended::ZoneRule kZoneRulesMauritius[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Mauritius 2008 only - Oct lastSun 2:00 1:00 - @@ -4259,7 +4259,7 @@ static const extended::ZoneRule kZoneRulesMauritius[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Mauritius 2009 only - Mar lastSun 2:00 0 - @@ -4271,7 +4271,7 @@ static const extended::ZoneRule kZoneRulesMauritius[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -4303,7 +4303,7 @@ static const extended::ZoneRule kZoneRulesMexico[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Mexico 1996 2000 - Apr Sun>=1 2:00 1:00 D @@ -4315,7 +4315,7 @@ static const extended::ZoneRule kZoneRulesMexico[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Mexico 1996 2000 - Oct lastSun 2:00 0 S @@ -4327,7 +4327,7 @@ static const extended::ZoneRule kZoneRulesMexico[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Mexico 2001 only - May Sun>=1 2:00 1:00 D @@ -4339,7 +4339,7 @@ static const extended::ZoneRule kZoneRulesMexico[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Mexico 2001 only - Sep lastSun 2:00 0 S @@ -4351,7 +4351,7 @@ static const extended::ZoneRule kZoneRulesMexico[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Mexico 2002 max - Apr Sun>=1 2:00 1:00 D @@ -4363,7 +4363,7 @@ static const extended::ZoneRule kZoneRulesMexico[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Mexico 2002 max - Oct lastSun 2:00 0 S @@ -4375,7 +4375,7 @@ static const extended::ZoneRule kZoneRulesMexico[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -4407,7 +4407,7 @@ static const extended::ZoneRule kZoneRulesMoldova[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Moldova 1997 max - Oct lastSun 3:00 0 - @@ -4419,7 +4419,7 @@ static const extended::ZoneRule kZoneRulesMoldova[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -4451,7 +4451,7 @@ static const extended::ZoneRule kZoneRulesMoncton[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Moncton 1993 2006 - Apr Sun>=1 0:01 1:00 D @@ -4463,7 +4463,7 @@ static const extended::ZoneRule kZoneRulesMoncton[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 1 /*atTimeModifier (kSuffixW + minute=1)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Moncton 1993 2006 - Oct lastSun 0:01 0 S @@ -4475,7 +4475,7 @@ static const extended::ZoneRule kZoneRulesMoncton[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 1 /*atTimeModifier (kSuffixW + minute=1)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -4507,7 +4507,7 @@ static const extended::ZoneRule kZoneRulesMongol[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Mongol 2001 only - Apr lastSat 2:00 1:00 - @@ -4519,7 +4519,7 @@ static const extended::ZoneRule kZoneRulesMongol[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Mongol 2001 2006 - Sep lastSat 2:00 0 - @@ -4531,7 +4531,7 @@ static const extended::ZoneRule kZoneRulesMongol[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Mongol 2002 2006 - Mar lastSat 2:00 1:00 - @@ -4543,7 +4543,7 @@ static const extended::ZoneRule kZoneRulesMongol[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Mongol 2015 2016 - Mar lastSat 2:00 1:00 - @@ -4555,7 +4555,7 @@ static const extended::ZoneRule kZoneRulesMongol[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Mongol 2015 2016 - Sep lastSat 0:00 0 - @@ -4567,7 +4567,7 @@ static const extended::ZoneRule kZoneRulesMongol[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -4599,7 +4599,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 4 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2008 only - Jun 1 0:00 1:00 - @@ -4611,7 +4611,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2008 only - Sep 1 0:00 0 - @@ -4623,7 +4623,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2009 only - Jun 1 0:00 1:00 - @@ -4635,7 +4635,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2009 only - Aug 21 0:00 0 - @@ -4647,7 +4647,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2010 only - May 2 0:00 1:00 - @@ -4659,7 +4659,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2010 only - Aug 8 0:00 0 - @@ -4671,7 +4671,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2011 only - Apr 3 0:00 1:00 - @@ -4683,7 +4683,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 3 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2011 only - Jul 31 0:00 0 - @@ -4695,7 +4695,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 31 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 - @@ -4707,7 +4707,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2012 only - Jul 20 3:00 0 - @@ -4719,7 +4719,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2012 only - Aug 20 2:00 1:00 - @@ -4731,7 +4731,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2012 only - Sep 30 3:00 0 - @@ -4743,7 +4743,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2013 only - Jul 7 3:00 0 - @@ -4755,7 +4755,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 7 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2013 only - Aug 10 2:00 1:00 - @@ -4767,7 +4767,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 10 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2013 2018 - Oct lastSun 3:00 0 - @@ -4779,7 +4779,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2014 2018 - Mar lastSun 2:00 1:00 - @@ -4791,7 +4791,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2014 only - Jun 28 3:00 0 - @@ -4803,7 +4803,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 28 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2014 only - Aug 2 2:00 1:00 - @@ -4815,7 +4815,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2015 only - Jun 14 3:00 0 - @@ -4827,7 +4827,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 14 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2015 only - Jul 19 2:00 1:00 - @@ -4839,7 +4839,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 19 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2016 only - Jun 5 3:00 0 - @@ -4851,7 +4851,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 5 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2016 only - Jul 10 2:00 1:00 - @@ -4863,7 +4863,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 10 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2017 only - May 21 3:00 0 - @@ -4875,7 +4875,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2017 only - Jul 2 2:00 1:00 - @@ -4887,7 +4887,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2018 only - May 13 3:00 0 - @@ -4899,7 +4899,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 13 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2018 only - Jun 17 2:00 1:00 - @@ -4911,7 +4911,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 17 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2019 only - May 5 3:00 -1:00 - @@ -4923,7 +4923,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 5 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2019 only - Jun 9 2:00 0 - @@ -4935,7 +4935,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2020 only - Apr 19 3:00 -1:00 - @@ -4947,7 +4947,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 19 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2020 only - May 31 2:00 0 - @@ -4959,7 +4959,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 31 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2021 only - Apr 11 3:00 -1:00 - @@ -4971,7 +4971,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 11 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2021 only - May 16 2:00 0 - @@ -4983,7 +4983,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 16 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2022 only - Mar 27 3:00 -1:00 - @@ -4995,7 +4995,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 27 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2022 only - May 8 2:00 0 - @@ -5007,7 +5007,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2023 only - Mar 19 3:00 -1:00 - @@ -5019,7 +5019,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 19 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2023 only - Apr 30 2:00 0 - @@ -5031,7 +5031,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2024 only - Mar 10 3:00 -1:00 - @@ -5043,7 +5043,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 10 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2024 only - Apr 14 2:00 0 - @@ -5055,7 +5055,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 14 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2025 only - Feb 23 3:00 -1:00 - @@ -5067,7 +5067,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 23 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2025 only - Apr 6 2:00 0 - @@ -5079,7 +5079,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 6 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2026 only - Feb 15 3:00 -1:00 - @@ -5091,7 +5091,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2026 only - Mar 22 2:00 0 - @@ -5103,7 +5103,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2027 only - Feb 7 3:00 -1:00 - @@ -5115,7 +5115,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 7 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2027 only - Mar 14 2:00 0 - @@ -5127,7 +5127,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 14 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2028 only - Jan 23 3:00 -1:00 - @@ -5139,7 +5139,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 23 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2028 only - Mar 5 2:00 0 - @@ -5151,7 +5151,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 5 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2029 only - Jan 14 3:00 -1:00 - @@ -5163,7 +5163,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 14 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2029 only - Feb 18 2:00 0 - @@ -5175,7 +5175,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 18 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2029 only - Dec 30 3:00 -1:00 - @@ -5187,7 +5187,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2030 only - Feb 10 2:00 0 - @@ -5199,7 +5199,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 10 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2030 only - Dec 22 3:00 -1:00 - @@ -5211,7 +5211,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2031 only - Feb 2 2:00 0 - @@ -5223,7 +5223,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2031 only - Dec 14 3:00 -1:00 - @@ -5235,7 +5235,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 14 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2032 only - Jan 18 2:00 0 - @@ -5247,7 +5247,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 18 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2032 only - Nov 28 3:00 -1:00 - @@ -5259,7 +5259,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 28 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2033 only - Jan 9 2:00 0 - @@ -5271,7 +5271,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2033 only - Nov 20 3:00 -1:00 - @@ -5283,7 +5283,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2033 only - Dec 25 2:00 0 - @@ -5295,7 +5295,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 25 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2034 only - Nov 5 3:00 -1:00 - @@ -5307,7 +5307,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 5 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2034 only - Dec 17 2:00 0 - @@ -5319,7 +5319,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 17 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2035 only - Oct 28 3:00 -1:00 - @@ -5331,7 +5331,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 28 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2035 only - Dec 9 2:00 0 - @@ -5343,7 +5343,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2036 only - Oct 19 3:00 -1:00 - @@ -5355,7 +5355,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 19 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2036 only - Nov 23 2:00 0 - @@ -5367,7 +5367,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 23 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2037 only - Oct 4 3:00 -1:00 - @@ -5379,7 +5379,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 4 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2037 only - Nov 15 2:00 0 - @@ -5391,7 +5391,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2038 only - Sep 26 3:00 -1:00 - @@ -5403,7 +5403,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 26 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2038 only - Nov 7 2:00 0 - @@ -5415,7 +5415,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 7 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2039 only - Sep 18 3:00 -1:00 - @@ -5427,7 +5427,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 18 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2039 only - Oct 23 2:00 0 - @@ -5439,7 +5439,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 23 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2040 only - Sep 2 3:00 -1:00 - @@ -5451,7 +5451,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2040 only - Oct 14 2:00 0 - @@ -5463,7 +5463,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 14 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2041 only - Aug 25 3:00 -1:00 - @@ -5475,7 +5475,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 25 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2041 only - Sep 29 2:00 0 - @@ -5487,7 +5487,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 29 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2042 only - Aug 10 3:00 -1:00 - @@ -5499,7 +5499,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 10 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2042 only - Sep 21 2:00 0 - @@ -5511,7 +5511,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2043 only - Aug 2 3:00 -1:00 - @@ -5523,7 +5523,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2043 only - Sep 13 2:00 0 - @@ -5535,7 +5535,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 13 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2044 only - Jul 24 3:00 -1:00 - @@ -5547,7 +5547,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 24 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2044 only - Aug 28 2:00 0 - @@ -5559,7 +5559,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 28 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2045 only - Jul 9 3:00 -1:00 - @@ -5571,7 +5571,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2045 only - Aug 20 2:00 0 - @@ -5583,7 +5583,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 20 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2046 only - Jul 1 3:00 -1:00 - @@ -5595,7 +5595,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2046 only - Aug 12 2:00 0 - @@ -5607,7 +5607,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 12 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2047 only - Jun 23 3:00 -1:00 - @@ -5619,7 +5619,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 23 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2047 only - Jul 28 2:00 0 - @@ -5631,7 +5631,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 28 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2048 only - Jun 7 3:00 -1:00 - @@ -5643,7 +5643,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 7 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2048 only - Jul 19 2:00 0 - @@ -5655,7 +5655,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 19 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2049 only - May 30 3:00 -1:00 - @@ -5667,7 +5667,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2049 only - Jul 4 2:00 0 - @@ -5679,7 +5679,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 4 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2050 only - May 15 3:00 -1:00 - @@ -5691,7 +5691,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2050 only - Jun 26 2:00 0 - @@ -5703,7 +5703,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 26 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Morocco 2051 only - May 7 3:00 -1:00 - @@ -5715,7 +5715,7 @@ static const extended::ZoneRule kZoneRulesMorocco[] ACE_TIME_PROGMEM = { 7 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, '-' /*letter*/, }, @@ -5747,7 +5747,7 @@ static const extended::ZoneRule kZoneRulesNC[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -5779,7 +5779,7 @@ static const extended::ZoneRule kZoneRulesNT_YK[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule NT_YK 1980 2006 - Oct lastSun 2:00 0 S @@ -5791,7 +5791,7 @@ static const extended::ZoneRule kZoneRulesNT_YK[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule NT_YK 1987 2006 - Apr Sun>=1 2:00 1:00 D @@ -5803,7 +5803,7 @@ static const extended::ZoneRule kZoneRulesNT_YK[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, @@ -5835,7 +5835,7 @@ static const extended::ZoneRule kZoneRulesNZ[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule NZ 1990 2006 - Oct Sun>=1 2:00s 1:00 D @@ -5847,7 +5847,7 @@ static const extended::ZoneRule kZoneRulesNZ[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule NZ 1990 2007 - Mar Sun>=15 2:00s 0 S @@ -5859,7 +5859,7 @@ static const extended::ZoneRule kZoneRulesNZ[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule NZ 2007 max - Sep lastSun 2:00s 1:00 D @@ -5871,7 +5871,7 @@ static const extended::ZoneRule kZoneRulesNZ[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule NZ 2008 max - Apr Sun>=1 2:00s 0 S @@ -5883,7 +5883,7 @@ static const extended::ZoneRule kZoneRulesNZ[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -5915,7 +5915,7 @@ static const extended::ZoneRule kZoneRulesNamibia[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, 1 /*letter (index to "WAT")*/, }, // Rule Namibia 1994 2017 - Sep Sun>=1 2:00 0 CAT @@ -5927,7 +5927,7 @@ static const extended::ZoneRule kZoneRulesNamibia[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 0 /*letter (index to "CAT")*/, }, // Rule Namibia 1995 2017 - Apr Sun>=1 2:00 -1:00 WAT @@ -5939,7 +5939,7 @@ static const extended::ZoneRule kZoneRulesNamibia[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 0 /*deltaCode (deltaMinute=-60/15 + 4)*/, + 0 /*deltaCode ((deltaMinutes=-60)/15 + 4)*/, 1 /*letter (index to "WAT")*/, }, @@ -5976,7 +5976,7 @@ static const extended::ZoneRule kZoneRulesNic[] ACE_TIME_PROGMEM = { 23 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Nic 2005 only - Apr 10 0:00 1:00 D @@ -5988,7 +5988,7 @@ static const extended::ZoneRule kZoneRulesNic[] ACE_TIME_PROGMEM = { 10 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Nic 2005 only - Oct Sun>=1 0:00 0 S @@ -6000,7 +6000,7 @@ static const extended::ZoneRule kZoneRulesNic[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Nic 2006 only - Apr 30 2:00 1:00 D @@ -6012,7 +6012,7 @@ static const extended::ZoneRule kZoneRulesNic[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Nic 2006 only - Oct Sun>=1 1:00 0 S @@ -6024,7 +6024,7 @@ static const extended::ZoneRule kZoneRulesNic[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -6056,7 +6056,7 @@ static const extended::ZoneRule kZoneRulesPRC[] ACE_TIME_PROGMEM = { 11 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -6088,7 +6088,7 @@ static const extended::ZoneRule kZoneRulesPakistan[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Pakistan 2002 only - Apr Sun>=2 0:00 1:00 S @@ -6100,7 +6100,7 @@ static const extended::ZoneRule kZoneRulesPakistan[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Pakistan 2002 only - Oct Sun>=2 0:00 0 - @@ -6112,7 +6112,7 @@ static const extended::ZoneRule kZoneRulesPakistan[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Pakistan 2008 only - Jun 1 0:00 1:00 S @@ -6124,7 +6124,7 @@ static const extended::ZoneRule kZoneRulesPakistan[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Pakistan 2008 2009 - Nov 1 0:00 0 - @@ -6136,7 +6136,7 @@ static const extended::ZoneRule kZoneRulesPakistan[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Pakistan 2009 only - Apr 15 0:00 1:00 S @@ -6148,7 +6148,7 @@ static const extended::ZoneRule kZoneRulesPakistan[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, @@ -6180,7 +6180,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 1999 2005 - Apr Fri>=15 0:00 1:00 S @@ -6192,7 +6192,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Palestine 1999 2003 - Oct Fri>=15 0:00 0 - @@ -6204,7 +6204,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2004 only - Oct 1 1:00 0 - @@ -6216,7 +6216,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2005 only - Oct 4 2:00 0 - @@ -6228,7 +6228,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 4 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2006 2007 - Apr 1 0:00 1:00 S @@ -6240,7 +6240,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Palestine 2006 only - Sep 22 0:00 0 - @@ -6252,7 +6252,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2007 only - Sep 13 2:00 0 - @@ -6264,7 +6264,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 13 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2008 2009 - Mar lastFri 0:00 1:00 S @@ -6276,7 +6276,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Palestine 2008 only - Sep 1 0:00 0 - @@ -6288,7 +6288,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2009 only - Sep 4 1:00 0 - @@ -6300,7 +6300,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 4 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2010 only - Mar 26 0:00 1:00 S @@ -6312,7 +6312,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 26 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Palestine 2010 only - Aug 11 0:00 0 - @@ -6324,7 +6324,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 11 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2011 only - Apr 1 0:01 1:00 S @@ -6336,7 +6336,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 1 /*atTimeModifier (kSuffixW + minute=1)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Palestine 2011 only - Aug 1 0:00 0 - @@ -6348,7 +6348,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2011 only - Aug 30 0:00 1:00 S @@ -6360,7 +6360,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Palestine 2011 only - Sep 30 0:00 0 - @@ -6372,7 +6372,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2012 2014 - Mar lastThu 24:00 1:00 S @@ -6384,7 +6384,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Palestine 2012 only - Sep 21 1:00 0 - @@ -6396,7 +6396,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2013 only - Sep 27 0:00 0 - @@ -6408,7 +6408,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 27 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2014 only - Oct 24 0:00 0 - @@ -6420,7 +6420,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 24 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2015 only - Mar 28 0:00 1:00 S @@ -6432,7 +6432,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 28 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Palestine 2015 only - Oct 23 1:00 0 - @@ -6444,7 +6444,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 23 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S @@ -6456,7 +6456,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 24 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Palestine 2016 2018 - Oct Sat>=24 1:00 0 - @@ -6468,7 +6468,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 24 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2019 only - Mar 29 0:00 1:00 S @@ -6480,7 +6480,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 29 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Palestine 2019 only - Oct Sat>=24 0:00 0 - @@ -6492,7 +6492,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 24 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Palestine 2020 max - Mar Sat>=24 0:00 1:00 S @@ -6504,7 +6504,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 24 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Palestine 2020 max - Oct Sat>=24 1:00 0 - @@ -6516,7 +6516,7 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 24 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -6548,7 +6548,7 @@ static const extended::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Para 1997 only - Feb lastSun 0:00 0 - @@ -6560,7 +6560,7 @@ static const extended::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Para 1998 2001 - Mar Sun>=1 0:00 0 - @@ -6572,7 +6572,7 @@ static const extended::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Para 2002 2004 - Apr Sun>=1 0:00 0 - @@ -6584,7 +6584,7 @@ static const extended::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Para 2002 2003 - Sep Sun>=1 0:00 1:00 - @@ -6596,7 +6596,7 @@ static const extended::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Para 2004 2009 - Oct Sun>=15 0:00 1:00 - @@ -6608,7 +6608,7 @@ static const extended::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Para 2005 2009 - Mar Sun>=8 0:00 0 - @@ -6620,7 +6620,7 @@ static const extended::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Para 2010 max - Oct Sun>=1 0:00 1:00 - @@ -6632,7 +6632,7 @@ static const extended::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Para 2010 2012 - Apr Sun>=8 0:00 0 - @@ -6644,7 +6644,7 @@ static const extended::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Para 2013 max - Mar Sun>=22 0:00 0 - @@ -6656,7 +6656,7 @@ static const extended::ZoneRule kZoneRulesPara[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -6688,7 +6688,7 @@ static const extended::ZoneRule kZoneRulesPeru[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -6720,7 +6720,7 @@ static const extended::ZoneRule kZoneRulesPhil[] ACE_TIME_PROGMEM = { 21 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -6752,7 +6752,7 @@ static const extended::ZoneRule kZoneRulesROK[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -6784,7 +6784,7 @@ static const extended::ZoneRule kZoneRulesRussia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Russia 1985 2010 - Mar lastSun 2:00s 1:00 S @@ -6796,7 +6796,7 @@ static const extended::ZoneRule kZoneRulesRussia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Russia 1996 2010 - Oct lastSun 2:00s 0 - @@ -6808,7 +6808,7 @@ static const extended::ZoneRule kZoneRulesRussia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -6840,7 +6840,7 @@ static const extended::ZoneRule kZoneRulesRussiaAsia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule RussiaAsia 1985 2010 - Mar lastSun 2:00s 1:00 - @@ -6852,7 +6852,7 @@ static const extended::ZoneRule kZoneRulesRussiaAsia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule RussiaAsia 1996 2010 - Oct lastSun 2:00s 0 - @@ -6864,7 +6864,7 @@ static const extended::ZoneRule kZoneRulesRussiaAsia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -6896,7 +6896,7 @@ static const extended::ZoneRule kZoneRulesSA[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -6928,7 +6928,7 @@ static const extended::ZoneRule kZoneRulesSalv[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -6960,7 +6960,7 @@ static const extended::ZoneRule kZoneRulesSanLuis[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule SanLuis 2008 2009 - Mar Sun>=8 0:00 0 - @@ -6972,7 +6972,7 @@ static const extended::ZoneRule kZoneRulesSanLuis[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule SanLuis 2007 2008 - Oct Sun>=8 0:00 1:00 - @@ -6984,7 +6984,7 @@ static const extended::ZoneRule kZoneRulesSanLuis[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, @@ -7016,7 +7016,7 @@ static const extended::ZoneRule kZoneRulesStJohns[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 1 /*atTimeModifier (kSuffixW + minute=1)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule StJohns 1988 only - Apr Sun>=1 0:01 2:00 DD @@ -7028,7 +7028,7 @@ static const extended::ZoneRule kZoneRulesStJohns[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 1 /*atTimeModifier (kSuffixW + minute=1)*/, - 12 /*deltaCode (deltaMinute=120/15 + 4)*/, + 12 /*deltaCode ((deltaMinutes=120)/15 + 4)*/, 0 /*letter (index to "DD")*/, }, // Rule StJohns 1989 2006 - Apr Sun>=1 0:01 1:00 D @@ -7040,7 +7040,7 @@ static const extended::ZoneRule kZoneRulesStJohns[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 1 /*atTimeModifier (kSuffixW + minute=1)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule StJohns 2007 2011 - Mar Sun>=8 0:01 1:00 D @@ -7052,7 +7052,7 @@ static const extended::ZoneRule kZoneRulesStJohns[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 0 /*atTimeCode*/, 1 /*atTimeModifier (kSuffixW + minute=1)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule StJohns 2007 2010 - Nov Sun>=1 0:01 0 S @@ -7064,7 +7064,7 @@ static const extended::ZoneRule kZoneRulesStJohns[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 1 /*atTimeModifier (kSuffixW + minute=1)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -7100,7 +7100,7 @@ static const extended::ZoneRule kZoneRulesSudan[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -7132,7 +7132,7 @@ static const extended::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Syria 1997 1998 - Mar lastMon 0:00 1:00 S @@ -7144,7 +7144,7 @@ static const extended::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Syria 1999 2006 - Apr 1 0:00 1:00 S @@ -7156,7 +7156,7 @@ static const extended::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Syria 2006 only - Sep 22 0:00 0 - @@ -7168,7 +7168,7 @@ static const extended::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Syria 2007 only - Mar lastFri 0:00 1:00 S @@ -7180,7 +7180,7 @@ static const extended::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Syria 2007 only - Nov Fri>=1 0:00 0 - @@ -7192,7 +7192,7 @@ static const extended::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S @@ -7204,7 +7204,7 @@ static const extended::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Syria 2008 only - Nov 1 0:00 0 - @@ -7216,7 +7216,7 @@ static const extended::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Syria 2009 only - Mar lastFri 0:00 1:00 S @@ -7228,7 +7228,7 @@ static const extended::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Syria 2010 2011 - Apr Fri>=1 0:00 1:00 S @@ -7240,7 +7240,7 @@ static const extended::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Syria 2012 max - Mar lastFri 0:00 1:00 S @@ -7252,7 +7252,7 @@ static const extended::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Syria 2009 max - Oct lastFri 0:00 0 - @@ -7264,7 +7264,7 @@ static const extended::ZoneRule kZoneRulesSyria[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -7296,7 +7296,7 @@ static const extended::ZoneRule kZoneRulesTaiwan[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -7328,7 +7328,7 @@ static const extended::ZoneRule kZoneRulesThule[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Thule 1993 2006 - Apr Sun>=1 2:00 1:00 D @@ -7340,7 +7340,7 @@ static const extended::ZoneRule kZoneRulesThule[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Thule 1993 2006 - Oct lastSun 2:00 0 S @@ -7352,7 +7352,7 @@ static const extended::ZoneRule kZoneRulesThule[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Thule 2007 max - Mar Sun>=8 2:00 1:00 D @@ -7364,7 +7364,7 @@ static const extended::ZoneRule kZoneRulesThule[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Thule 2007 max - Nov Sun>=1 2:00 0 S @@ -7376,7 +7376,7 @@ static const extended::ZoneRule kZoneRulesThule[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -7408,7 +7408,7 @@ static const extended::ZoneRule kZoneRulesTonga[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Tonga 1999 only - Oct 7 2:00s 1:00 - @@ -7420,7 +7420,7 @@ static const extended::ZoneRule kZoneRulesTonga[] ACE_TIME_PROGMEM = { 7 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Tonga 2000 only - Mar 19 2:00s 0 - @@ -7432,7 +7432,7 @@ static const extended::ZoneRule kZoneRulesTonga[] ACE_TIME_PROGMEM = { 19 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Tonga 2000 2001 - Nov Sun>=1 2:00 1:00 - @@ -7444,7 +7444,7 @@ static const extended::ZoneRule kZoneRulesTonga[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Tonga 2001 2002 - Jan lastSun 2:00 0 - @@ -7456,7 +7456,7 @@ static const extended::ZoneRule kZoneRulesTonga[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Tonga 2016 only - Nov Sun>=1 2:00 1:00 - @@ -7468,7 +7468,7 @@ static const extended::ZoneRule kZoneRulesTonga[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Tonga 2017 only - Jan Sun>=15 3:00 0 - @@ -7480,7 +7480,7 @@ static const extended::ZoneRule kZoneRulesTonga[] ACE_TIME_PROGMEM = { 15 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -7512,7 +7512,7 @@ static const extended::ZoneRule kZoneRulesTroll[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 0 /*letter (index to "+00")*/, }, // Rule Troll 2005 max - Mar lastSun 1:00u 2:00 +02 @@ -7524,7 +7524,7 @@ static const extended::ZoneRule kZoneRulesTroll[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 12 /*deltaCode (deltaMinute=120/15 + 4)*/, + 12 /*deltaCode ((deltaMinutes=120)/15 + 4)*/, 1 /*letter (index to "+02")*/, }, // Rule Troll 2004 max - Oct lastSun 1:00u 0:00 +00 @@ -7536,7 +7536,7 @@ static const extended::ZoneRule kZoneRulesTroll[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 32 /*atTimeModifier (kSuffixU + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 0 /*letter (index to "+00")*/, }, @@ -7573,7 +7573,7 @@ static const extended::ZoneRule kZoneRulesTunisia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Tunisia 2005 only - May 1 0:00s 1:00 S @@ -7585,7 +7585,7 @@ static const extended::ZoneRule kZoneRulesTunisia[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Tunisia 2005 only - Sep 30 1:00s 0 - @@ -7597,7 +7597,7 @@ static const extended::ZoneRule kZoneRulesTunisia[] ACE_TIME_PROGMEM = { 30 /*onDayOfMonth*/, 4 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Tunisia 2006 2008 - Mar lastSun 2:00s 1:00 S @@ -7609,7 +7609,7 @@ static const extended::ZoneRule kZoneRulesTunisia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Tunisia 2006 2008 - Oct lastSun 2:00s 0 - @@ -7621,7 +7621,7 @@ static const extended::ZoneRule kZoneRulesTunisia[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -7653,7 +7653,7 @@ static const extended::ZoneRule kZoneRulesTurkey[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Turkey 1995 2006 - Mar lastSun 1:00s 1:00 S @@ -7665,7 +7665,7 @@ static const extended::ZoneRule kZoneRulesTurkey[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'S' /*letter*/, }, // Rule Turkey 1996 2006 - Oct lastSun 1:00s 0 - @@ -7677,7 +7677,7 @@ static const extended::ZoneRule kZoneRulesTurkey[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 4 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -7709,7 +7709,7 @@ static const extended::ZoneRule kZoneRulesUS[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule US 1976 1986 - Apr lastSun 2:00 1:00 D @@ -7721,7 +7721,7 @@ static const extended::ZoneRule kZoneRulesUS[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule US 1987 2006 - Apr Sun>=1 2:00 1:00 D @@ -7733,7 +7733,7 @@ static const extended::ZoneRule kZoneRulesUS[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule US 2007 max - Mar Sun>=8 2:00 1:00 D @@ -7745,7 +7745,7 @@ static const extended::ZoneRule kZoneRulesUS[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule US 2007 max - Nov Sun>=1 2:00 0 S @@ -7757,7 +7757,7 @@ static const extended::ZoneRule kZoneRulesUS[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, @@ -7789,7 +7789,7 @@ static const extended::ZoneRule kZoneRulesUruguay[] ACE_TIME_PROGMEM = { 28 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Uruguay 2004 only - Sep 19 0:00 1:00 - @@ -7801,7 +7801,7 @@ static const extended::ZoneRule kZoneRulesUruguay[] ACE_TIME_PROGMEM = { 19 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Uruguay 2005 only - Mar 27 2:00 0 - @@ -7813,7 +7813,7 @@ static const extended::ZoneRule kZoneRulesUruguay[] ACE_TIME_PROGMEM = { 27 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Uruguay 2005 only - Oct 9 2:00 1:00 - @@ -7825,7 +7825,7 @@ static const extended::ZoneRule kZoneRulesUruguay[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule Uruguay 2006 2015 - Mar Sun>=8 2:00 0 - @@ -7837,7 +7837,7 @@ static const extended::ZoneRule kZoneRulesUruguay[] ACE_TIME_PROGMEM = { 8 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule Uruguay 2006 2014 - Oct Sun>=1 2:00 1:00 - @@ -7849,7 +7849,7 @@ static const extended::ZoneRule kZoneRulesUruguay[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, @@ -7881,7 +7881,7 @@ static const extended::ZoneRule kZoneRulesVanuatu[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 96 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, @@ -7913,7 +7913,7 @@ static const extended::ZoneRule kZoneRulesWS[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule WS 2010 only - Sep lastSun 0:00 1 - @@ -7925,7 +7925,7 @@ static const extended::ZoneRule kZoneRulesWS[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule WS 2011 only - Apr Sat>=1 4:00 0 - @@ -7937,7 +7937,7 @@ static const extended::ZoneRule kZoneRulesWS[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 16 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule WS 2011 only - Sep lastSat 3:00 1 - @@ -7949,7 +7949,7 @@ static const extended::ZoneRule kZoneRulesWS[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, // Rule WS 2012 max - Apr Sun>=1 4:00 0 - @@ -7961,7 +7961,7 @@ static const extended::ZoneRule kZoneRulesWS[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 16 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, '-' /*letter*/, }, // Rule WS 2012 max - Sep lastSun 3:00 1 - @@ -7973,7 +7973,7 @@ static const extended::ZoneRule kZoneRulesWS[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 12 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, '-' /*letter*/, }, @@ -8005,7 +8005,7 @@ static const extended::ZoneRule kZoneRulesWinn[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Winn 1966 2005 - Oct lastSun 2:00s 0 S @@ -8017,7 +8017,7 @@ static const extended::ZoneRule kZoneRulesWinn[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Winn 1987 2005 - Apr Sun>=1 2:00s 1:00 D @@ -8029,7 +8029,7 @@ static const extended::ZoneRule kZoneRulesWinn[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 16 /*atTimeModifier (kSuffixS + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, @@ -8061,7 +8061,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 6 /*onDayOfMonth*/, 0 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Zion 1999 only - Apr 2 2:00 1:00 D @@ -8073,7 +8073,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Zion 1999 only - Sep 3 2:00 0 S @@ -8085,7 +8085,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 3 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Zion 2000 only - Apr 14 2:00 1:00 D @@ -8097,7 +8097,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 14 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Zion 2000 only - Oct 6 1:00 0 S @@ -8109,7 +8109,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 6 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Zion 2001 only - Apr 9 1:00 1:00 D @@ -8121,7 +8121,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Zion 2001 only - Sep 24 1:00 0 S @@ -8133,7 +8133,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 24 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Zion 2002 only - Mar 29 1:00 1:00 D @@ -8145,7 +8145,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 29 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Zion 2002 only - Oct 7 1:00 0 S @@ -8157,7 +8157,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 7 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Zion 2003 only - Mar 28 1:00 1:00 D @@ -8169,7 +8169,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 28 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Zion 2003 only - Oct 3 1:00 0 S @@ -8181,7 +8181,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 3 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Zion 2004 only - Apr 7 1:00 1:00 D @@ -8193,7 +8193,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 7 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Zion 2004 only - Sep 22 1:00 0 S @@ -8205,7 +8205,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 22 /*onDayOfMonth*/, 4 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Zion 2005 2012 - Apr Fri<=1 2:00 1:00 D @@ -8217,7 +8217,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { -1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Zion 2005 only - Oct 9 2:00 0 S @@ -8229,7 +8229,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 9 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Zion 2006 only - Oct 1 2:00 0 S @@ -8241,7 +8241,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 1 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Zion 2007 only - Sep 16 2:00 0 S @@ -8253,7 +8253,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 16 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Zion 2008 only - Oct 5 2:00 0 S @@ -8265,7 +8265,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 5 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Zion 2009 only - Sep 27 2:00 0 S @@ -8277,7 +8277,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 27 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Zion 2010 only - Sep 12 2:00 0 S @@ -8289,7 +8289,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 12 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Zion 2011 only - Oct 2 2:00 0 S @@ -8301,7 +8301,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 2 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Zion 2012 only - Sep 23 2:00 0 S @@ -8313,7 +8313,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 23 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, // Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D @@ -8325,7 +8325,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 23 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 8 /*deltaCode (deltaMinute=60/15 + 4)*/, + 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 'D' /*letter*/, }, // Rule Zion 2013 max - Oct lastSun 2:00 0 S @@ -8337,7 +8337,7 @@ static const extended::ZoneRule kZoneRulesZion[] ACE_TIME_PROGMEM = { 0 /*onDayOfMonth*/, 8 /*atTimeCode*/, 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode (deltaMinute=0/15 + 4)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, 'S' /*letter*/, }, From 760563f527b5d4c4e72e83d31b784e7fd01de412 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Sun, 17 Jan 2021 17:15:49 -0800 Subject: [PATCH 52/74] tests/auniter.ini: Add stm32 board and env:stm32 using HID bootloader --- tests/auniter.ini | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tests/auniter.ini b/tests/auniter.ini index 4dee2307c..087cbb160 100644 --- a/tests/auniter.ini +++ b/tests/auniter.ini @@ -9,6 +9,10 @@ [auniter] monitor = picocom -b $baud --omap crlf --imap lfcrlf --echo $port +# ---------------------------------------------------------------------------- +# Board aliases +# ---------------------------------------------------------------------------- + # Board aliases [boards] # "Arduino/Genuino Uno" @@ -30,7 +34,18 @@ # "ESP32 Dev Module" for EzSBC ESP32 board esp32 = esp32:esp32:esp32:PartitionScheme=default,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=none # STM32 generic blue pill F103C8 - stm32 = STM32:stm32:GenF1:pnum=BLUEPILL_F103C8,upload_method=swdMethod,xserial=generic,usb=none,xusb=HS,opt=osstd,rtlib=nano + stm32 = STM32:stm32:GenF1:pnum=BLUEPILL_F103C8,upload_method=hidMethod,xserial=generic,usb=CDCgen,xusb=FS,opt=osstd,rtlib=nano + +# ---------------------------------------------------------------------------- +# Environments. Valid parameters of the [env:{environment}] section: +# +# board = {alias} - board alias from [boards] action +# locking = (true | false) - whether to use flock to lock the /dev/tty port +# exclude = egrep regular expression of files to exclude. Multiple files can be +# specified using the '(a|b)' pattern supported by egrep. +# preprocessor = Space-separated list of preprocessor symbols +# (MACRO MACRO=value MACRO="string value") +# ---------------------------------------------------------------------------- # Disable ExtendedZoneRegistrarTest since they do not fit in an Uno [env:uno] @@ -91,4 +106,5 @@ # An STM32 generic blue pill with an F103C8. [env:stm32] board = stm32 + locking = false preprocessor = -D AUNITER_STM32 -D WIFI_SSID="" -D WIFI_PASSWORD="" From 7171fc1a5915e5ec1e59902d346a04061482594d Mon Sep 17 00:00:00 2001 From: Brian Park Date: Sun, 17 Jan 2021 17:19:35 -0800 Subject: [PATCH 53/74] tests: Add missing initializers for 'numFragments' and 'fragments' fields in ZoneContext; detected by STM32 compiler --- tests/BasicBrokerTest/BasicBrokerTest.ino | 5 ++++- tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino | 2 ++ tests/ExtendedBrokerTest/ExtendedBrokerTest.ino | 2 ++ .../ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/BasicBrokerTest/BasicBrokerTest.ino b/tests/BasicBrokerTest/BasicBrokerTest.ino index 31d63993d..0b8ea7a14 100644 --- a/tests/BasicBrokerTest/BasicBrokerTest.ino +++ b/tests/BasicBrokerTest/BasicBrokerTest.ino @@ -21,9 +21,12 @@ static const basic::ZoneContext kZoneContext = { 2000 /*startYear*/, 2050 /*untilYear*/, kTzDatabaseVersion /*tzVersion*/, + 0 /*numFragments*/, + nullptr /*fragments*/, }; -static const char kZoneNameAmerica_Los_Angeles[] ACE_TIME_PROGMEM = "America/Los_Angeles"; +static const char kZoneNameAmerica_Los_Angeles[] ACE_TIME_PROGMEM = + "America/Los_Angeles"; static const basic::ZoneRule kZoneRulesUS[] ACE_TIME_PROGMEM = { // Rule US 1967 2006 - Oct lastSun 2:00 0 S diff --git a/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino b/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino index 2fa9fa0d4..b1adbb17a 100644 --- a/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino +++ b/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino @@ -25,6 +25,8 @@ static const basic::ZoneContext kZoneContext = { 1980 /*startYear*/, 2050 /*untilYear*/, kTzDatabaseVersion /*tzVersion*/, + 0 /*numFragments*/, + nullptr /*fragments*/, }; static const basic::ZoneRule kZoneRulesEcuador[] ACE_TIME_PROGMEM = { diff --git a/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino b/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino index b4c163287..d8dcc7582 100644 --- a/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino +++ b/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino @@ -21,6 +21,8 @@ static const extended::ZoneContext kZoneContext = { 2000 /*startYear*/, 2050 /*untilYear*/, kTzDatabaseVersion /*tzVersion*/, + 0 /*numFragments*/, + nullptr /*fragments*/, }; static const extended::ZoneRule kZoneRulesUS[] ACE_TIME_PROGMEM = { diff --git a/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino b/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino index 16fa9a7cc..aa28c72e0 100644 --- a/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino +++ b/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino @@ -16,6 +16,8 @@ static const ZoneContext kZoneContext = { 2000 /*startYear*/, 2020 /*untilYear*/, "testing" /*tzVersion*/, + 0 /*numFragments*/, + nullptr /*fragments*/, }; // Create simplified ZoneEras which approximate America/Los_Angeles From f182e579988c9db15a11a8e4123d3f91b1255d2d Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 18 Jan 2021 10:33:01 -0800 Subject: [PATCH 54/74] tests/ZonedDateTimeExtendedTest,ZonedDateTimeBasicTest: Replace extraneous use of ZoneProcessor with existing ZoneManager to save stack memory, to allow ZonedDateTimeExtendedTest to run on a Nano again --- .../ZonedDateTimeBasicTest.ino | 39 +++--- .../ZonedDateTimeExtendedTest.ino | 124 +++--------------- 2 files changed, 34 insertions(+), 129 deletions(-) diff --git a/tests/ZonedDateTimeBasicTest/ZonedDateTimeBasicTest.ino b/tests/ZonedDateTimeBasicTest/ZonedDateTimeBasicTest.ino index 4e3b6caf6..938cd3248 100644 --- a/tests/ZonedDateTimeBasicTest/ZonedDateTimeBasicTest.ino +++ b/tests/ZonedDateTimeBasicTest/ZonedDateTimeBasicTest.ino @@ -1,32 +1,14 @@ #line 2 "ZonedDateTimeBasicTest.ino" #include -#include +#include // PrintStr #include using namespace aunit; using namespace ace_time; // -------------------------------------------------------------------------- -// ZonedDateTime + BasicZoneProcessor -// -------------------------------------------------------------------------- - -test(ZonedDateTimeBasicTest, printTo) { - BasicZoneProcessor zoneProcessor; - auto tz = TimeZone::forZoneInfo(&zonedb::kZoneAmerica_Los_Angeles, - &zoneProcessor); - auto dt = ZonedDateTime::forComponents(2020, 1, 2, 3, 4, 5, tz); - - ace_common::PrintStr<64> dateString; - dt.printTo(dateString); - assertEqual( - dateString.getCstr(), - "2020-01-02T03:04:05-08:00[America/Los_Angeles]" - ); -} - -// -------------------------------------------------------------------------- -// BasicZoneManager +// Create BasicZoneManager // -------------------------------------------------------------------------- const basic::ZoneInfo* const kBasicZoneRegistry[] ACE_TIME_PROGMEM = { @@ -39,13 +21,26 @@ const basic::ZoneInfo* const kBasicZoneRegistry[] ACE_TIME_PROGMEM = { const uint16_t kBasicZoneRegistrySize = sizeof(kBasicZoneRegistry) / sizeof(kBasicZoneRegistry[0]); -BasicZoneManager<2> basicZoneManager( +BasicZoneManager<1> basicZoneManager( kBasicZoneRegistrySize, kBasicZoneRegistry); // -------------------------------------------------------------------------- // ZonedDateTime + BasicZoneManager // -------------------------------------------------------------------------- +test(ZonedDateTimeBasicTest, printTo) { + TimeZone tz = basicZoneManager.createForZoneInfo( + &zonedb::kZoneAmerica_Los_Angeles); + auto dt = ZonedDateTime::forComponents(2020, 1, 2, 3, 4, 5, tz); + + ace_common::PrintStr<64> dateString; + dt.printTo(dateString); + assertEqual( + dateString.getCstr(), + F("2020-01-02T03:04:05-08:00[America/Los_Angeles]") + ); +} + test(ZonedDateTimeBasicTest, forComponents_isError) { TimeZone tz = basicZoneManager.createForZoneInfo( &zonedb::kZoneAmerica_Los_Angeles); @@ -148,7 +143,7 @@ void setup() { delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only } void loop() { diff --git a/tests/ZonedDateTimeExtendedTest/ZonedDateTimeExtendedTest.ino b/tests/ZonedDateTimeExtendedTest/ZonedDateTimeExtendedTest.ino index b9341d764..7d807b457 100644 --- a/tests/ZonedDateTimeExtendedTest/ZonedDateTimeExtendedTest.ino +++ b/tests/ZonedDateTimeExtendedTest/ZonedDateTimeExtendedTest.ino @@ -1,32 +1,14 @@ #line 2 "ZonedDateTimeExtendedTest.ino" #include -#include +#include // PrintStr #include using namespace aunit; using namespace ace_time; // -------------------------------------------------------------------------- -// ZonedDateTime + ExtendedZoneProcessor -// -------------------------------------------------------------------------- - -test(ZonedDateTimeExtendedTest, printTo) { - ExtendedZoneProcessor zoneProcessor; - auto tz = TimeZone::forZoneInfo(&zonedbx::kZoneAmerica_Los_Angeles, - &zoneProcessor); - auto dt = ZonedDateTime::forComponents(2020, 1, 2, 3, 4, 5, tz); - - ace_common::PrintStr<64> dateString; - dt.printTo(dateString); - assertEqual( - dateString.getCstr(), - "2020-01-02T03:04:05-08:00[America/Los_Angeles]" - ); -} - -// -------------------------------------------------------------------------- -// ExtendedZoneManager +// Create ExtendedZoneManager // -------------------------------------------------------------------------- const extended::ZoneInfo* const kExtendedZoneRegistry[] ACE_TIME_PROGMEM = { @@ -39,13 +21,26 @@ const extended::ZoneInfo* const kExtendedZoneRegistry[] ACE_TIME_PROGMEM = { const uint16_t kExtendedZoneRegistrySize = sizeof(kExtendedZoneRegistry) / sizeof(kExtendedZoneRegistry[0]); -ExtendedZoneManager<2> extendedZoneManager( +ExtendedZoneManager<1> extendedZoneManager( kExtendedZoneRegistrySize, kExtendedZoneRegistry); // -------------------------------------------------------------------------- // ZonedDateTime + ExtendedZoneManager // -------------------------------------------------------------------------- +test(ZonedDateTimeExtendedTest, printTo) { + TimeZone tz = extendedZoneManager.createForZoneInfo( + &zonedbx::kZoneAmerica_Los_Angeles); + auto dt = ZonedDateTime::forComponents(2020, 1, 2, 3, 4, 5, tz); + + ace_common::PrintStr<64> dateString; + dt.printTo(dateString); + assertEqual( + dateString.getCstr(), + F("2020-01-02T03:04:05-08:00[America/Los_Angeles]") + ); +} + test(ZonedDateTimeExtendedTest, forComponents_isError) { TimeZone tz = extendedZoneManager.createForZoneInfo( &zonedbx::kZoneAmerica_Los_Angeles); @@ -142,91 +137,6 @@ test(ZonedDateTimeExtendedTest, linked_zones) { } */ -// -------------------------------------------------------------------------- -// Validate some changes in tzdb 2020a -// -------------------------------------------------------------------------- - -// Morocco springs forward on 2020-05-31, not on 2020-05-24 as originally -// scheduled. At 02:00 -> 03:00, the UTC offset goes from UTC+00:00 to -// UTC+01:00. -test(ZonedDateTimeExtendedTest, Morocco2020) { - TimeZone tz = extendedZoneManager.createForZoneInfo( - &zonedbx::kZoneAfrica_Casablanca); - - auto dt = ZonedDateTime::forComponents(2020, 5, 25, 3, 0, 0, tz); - assertEqual(TimeOffset::forHours(0).toMinutes(), - dt.timeOffset().toMinutes()); - acetime_t epoch = dt.toEpochSeconds(); - assertEqual("+00", tz.getAbbrev(epoch)); - assertEqual(TimeOffset::forHours(-1).toMinutes(), - tz.getDeltaOffset(epoch).toMinutes()); - - dt = ZonedDateTime::forComponents(2020, 5, 31, 1, 59, 59, tz); - assertEqual(TimeOffset::forHours(0).toMinutes(), - dt.timeOffset().toMinutes()); - epoch = dt.toEpochSeconds(); - assertEqual("+00", tz.getAbbrev(epoch)); - assertEqual(TimeOffset::forHours(-1).toMinutes(), - tz.getDeltaOffset(epoch).toMinutes()); - - dt = ZonedDateTime::forComponents(2020, 5, 31, 3, 0, 0, tz); - assertEqual(TimeOffset::forHours(1).toMinutes(), - dt.timeOffset().toMinutes()); - epoch = dt.toEpochSeconds(); - assertEqual("+01", tz.getAbbrev(epoch)); - assertEqual(TimeOffset::forHours(0).toMinutes(), - tz.getDeltaOffset(epoch).toMinutes()); -} - -// -------------------------------------------------------------------------- -// Validate some changes in tzdb 2020c -// -------------------------------------------------------------------------- - -// Yukon (e.g. America/Whitehorse) goes to permanent daylight saving time -// starting on 2020-11-01T00:00. It goes from PDT (UTC-07:00) to permanent MST -// (UTC-07:00) at 2020-11-01 00:00. -test(ZonedDateTimeExtendedTest, Yukon2020) { - TimeZone tz = extendedZoneManager.createForZoneInfo( - &zonedbx::kZoneAmerica_Whitehorse); - - auto dt = ZonedDateTime::forComponents(2020, 3, 8, 1, 59, 59, tz); - assertEqual(TimeOffset::forHours(-8).toMinutes(), - dt.timeOffset().toMinutes()); - acetime_t epoch = dt.toEpochSeconds(); - assertEqual("PST", tz.getAbbrev(epoch)); - assertEqual(TimeOffset::forHours(0).toMinutes(), - tz.getDeltaOffset(epoch).toMinutes()); - - // Time in the 2:00->3:00 transition gap. Gets normalized to 03:00. - dt = ZonedDateTime::forComponents(2020, 3, 8, 2, 0, 0, tz); - assertEqual(TimeOffset::forHours(-7).toMinutes(), - dt.timeOffset().toMinutes()); - auto expected = LocalDateTime::forComponents(2020, 3, 8, 3, 0, 0); - assertTrue(expected == dt.localDateTime()); - epoch = dt.toEpochSeconds(); - assertEqual("PDT", tz.getAbbrev(epoch)); - assertEqual(TimeOffset::forHours(1).toMinutes(), - tz.getDeltaOffset(epoch).toMinutes()); - - // 23:59->00:00, but there's a change in abbreviation and DST offset. - dt = ZonedDateTime::forComponents(2020, 10, 31, 23, 59, 59, tz); - assertEqual(TimeOffset::forHours(-7).toMinutes(), - dt.timeOffset().toMinutes()); - epoch = dt.toEpochSeconds(); - assertEqual("PDT", tz.getAbbrev(epoch)); - assertEqual(TimeOffset::forHours(1).toMinutes(), - tz.getDeltaOffset(epoch).toMinutes()); - - // 00:00->00:00, but there's a change in abbreviation and DST offset. - dt = ZonedDateTime::forComponents(2020, 11, 1, 0, 0, 0, tz); - assertEqual(TimeOffset::forHours(-7).toMinutes(), - dt.timeOffset().toMinutes()); - epoch = dt.toEpochSeconds(); - assertEqual("MST", tz.getAbbrev(epoch)); - assertEqual(TimeOffset::forHours(0).toMinutes(), - tz.getDeltaOffset(epoch).toMinutes()); -} - // -------------------------------------------------------------------------- void setup() { @@ -234,7 +144,7 @@ void setup() { delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // for Leonardo/Micro } void loop() { From 7805ebea805c8c60f0b87d00718647f6abb32649 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 18 Jan 2021 10:33:29 -0800 Subject: [PATCH 55/74] tests/TzDbTest: Extract tests for specific TZDB versions to separate test, to reduce static memory usage on 8-bit processors --- tests/TzDbTest/Makefile | 6 ++ tests/TzDbTest/TzDbTest.ino | 112 ++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 tests/TzDbTest/Makefile create mode 100644 tests/TzDbTest/TzDbTest.ino diff --git a/tests/TzDbTest/Makefile b/tests/TzDbTest/Makefile new file mode 100644 index 000000000..6d3378c2b --- /dev/null +++ b/tests/TzDbTest/Makefile @@ -0,0 +1,6 @@ +# See https://github.com/bxparks/UnixHostDuino for documentation about this +# Makefile to compile and run Arduino programs natively on Linux or MacOS. + +APP_NAME := TzDbTest +ARDUINO_LIBS := AUnit AceCommon AceTime +include ../../../UnixHostDuino/UnixHostDuino.mk diff --git a/tests/TzDbTest/TzDbTest.ino b/tests/TzDbTest/TzDbTest.ino new file mode 100644 index 000000000..a6d3c2260 --- /dev/null +++ b/tests/TzDbTest/TzDbTest.ino @@ -0,0 +1,112 @@ +#line 2 "TzDbTest.ino" + +#include +#include + +using namespace aunit; +using namespace ace_time; + +// -------------------------------------------------------------------------- +// Validate some changes in tzdb 2020a +// -------------------------------------------------------------------------- + +// Morocco springs forward on 2020-05-31, not on 2020-05-24 as originally +// scheduled. At 02:00 -> 03:00, the UTC offset goes from UTC+00:00 to +// UTC+01:00. +test(ZonedDateTimeExtendedTest, Morocco2020) { + ExtendedZoneProcessor zoneProcessor; + TimeZone tz = TimeZone::forZoneInfo( + &zonedbx::kZoneAfrica_Casablanca, + &zoneProcessor + ); + + auto dt = ZonedDateTime::forComponents(2020, 5, 25, 3, 0, 0, tz); + assertEqual(TimeOffset::forHours(0).toMinutes(), + dt.timeOffset().toMinutes()); + acetime_t epoch = dt.toEpochSeconds(); + assertEqual("+00", tz.getAbbrev(epoch)); + assertEqual(TimeOffset::forHours(-1).toMinutes(), + tz.getDeltaOffset(epoch).toMinutes()); + + dt = ZonedDateTime::forComponents(2020, 5, 31, 1, 59, 59, tz); + assertEqual(TimeOffset::forHours(0).toMinutes(), + dt.timeOffset().toMinutes()); + epoch = dt.toEpochSeconds(); + assertEqual("+00", tz.getAbbrev(epoch)); + assertEqual(TimeOffset::forHours(-1).toMinutes(), + tz.getDeltaOffset(epoch).toMinutes()); + + dt = ZonedDateTime::forComponents(2020, 5, 31, 3, 0, 0, tz); + assertEqual(TimeOffset::forHours(1).toMinutes(), + dt.timeOffset().toMinutes()); + epoch = dt.toEpochSeconds(); + assertEqual("+01", tz.getAbbrev(epoch)); + assertEqual(TimeOffset::forHours(0).toMinutes(), + tz.getDeltaOffset(epoch).toMinutes()); +} + +// -------------------------------------------------------------------------- +// Validate some changes in tzdb 2020c +// -------------------------------------------------------------------------- + +// Yukon (e.g. America/Whitehorse) goes to permanent daylight saving time +// starting on 2020-11-01T00:00. It goes from PDT (UTC-07:00) to permanent MST +// (UTC-07:00) at 2020-11-01 00:00. +test(ZonedDateTimeExtendedTest, Yukon2020) { + ExtendedZoneProcessor zoneProcessor; + TimeZone tz = TimeZone::forZoneInfo( + &zonedbx::kZoneAmerica_Whitehorse, + &zoneProcessor + ); + + auto dt = ZonedDateTime::forComponents(2020, 3, 8, 1, 59, 59, tz); + assertEqual(TimeOffset::forHours(-8).toMinutes(), + dt.timeOffset().toMinutes()); + acetime_t epoch = dt.toEpochSeconds(); + assertEqual("PST", tz.getAbbrev(epoch)); + assertEqual(TimeOffset::forHours(0).toMinutes(), + tz.getDeltaOffset(epoch).toMinutes()); + + // Time in the 2:00->3:00 transition gap. Gets normalized to 03:00. + dt = ZonedDateTime::forComponents(2020, 3, 8, 2, 0, 0, tz); + assertEqual(TimeOffset::forHours(-7).toMinutes(), + dt.timeOffset().toMinutes()); + auto expected = LocalDateTime::forComponents(2020, 3, 8, 3, 0, 0); + assertTrue(expected == dt.localDateTime()); + epoch = dt.toEpochSeconds(); + assertEqual("PDT", tz.getAbbrev(epoch)); + assertEqual(TimeOffset::forHours(1).toMinutes(), + tz.getDeltaOffset(epoch).toMinutes()); + + // 23:59->00:00, but there's a change in abbreviation and DST offset. + dt = ZonedDateTime::forComponents(2020, 10, 31, 23, 59, 59, tz); + assertEqual(TimeOffset::forHours(-7).toMinutes(), + dt.timeOffset().toMinutes()); + epoch = dt.toEpochSeconds(); + assertEqual("PDT", tz.getAbbrev(epoch)); + assertEqual(TimeOffset::forHours(1).toMinutes(), + tz.getDeltaOffset(epoch).toMinutes()); + + // 00:00->00:00, but there's a change in abbreviation and DST offset. + dt = ZonedDateTime::forComponents(2020, 11, 1, 0, 0, 0, tz); + assertEqual(TimeOffset::forHours(-7).toMinutes(), + dt.timeOffset().toMinutes()); + epoch = dt.toEpochSeconds(); + assertEqual("MST", tz.getAbbrev(epoch)); + assertEqual(TimeOffset::forHours(0).toMinutes(), + tz.getDeltaOffset(epoch).toMinutes()); +} + +// -------------------------------------------------------------------------- + +void setup() { +#if ! defined(UNIX_HOST_DUINO) + delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR +#endif + SERIAL_PORT_MONITOR.begin(115200); + while (!SERIAL_PORT_MONITOR); // for Leonardo/Micro +} + +void loop() { + TestRunner::run(); +} From e1fc63b932acc165764c5f74fcb631b47c0b2b4a Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 18 Jan 2021 10:57:20 -0800 Subject: [PATCH 56/74] tests/TimeZoneTest: Extract test(operatorEqualEqual) using ZoneProcessors to TimeZoneMoreTest to reduce memory usage, allowing TimeZoneTest to run on Arduino Nano; fix (uint16_t) types in various assertEqual() --- tests/TimeZoneMoreTest/Makefile | 6 +++ tests/TimeZoneMoreTest/TimeZoneMoreTest.ino | 56 +++++++++++++++++++ tests/TimeZoneTest/TimeZoneTest.ino | 59 ++++++--------------- 3 files changed, 78 insertions(+), 43 deletions(-) create mode 100644 tests/TimeZoneMoreTest/Makefile create mode 100644 tests/TimeZoneMoreTest/TimeZoneMoreTest.ino diff --git a/tests/TimeZoneMoreTest/Makefile b/tests/TimeZoneMoreTest/Makefile new file mode 100644 index 000000000..17bd4af5a --- /dev/null +++ b/tests/TimeZoneMoreTest/Makefile @@ -0,0 +1,6 @@ +# See https://github.com/bxparks/UnixHostDuino for documentation about this +# Makefile to compile and run Arduino programs natively on Linux or MacOS. + +APP_NAME := TimeZoneMoreTest +ARDUINO_LIBS := AUnit AceCommon AceTime +include ../../../UnixHostDuino/UnixHostDuino.mk diff --git a/tests/TimeZoneMoreTest/TimeZoneMoreTest.ino b/tests/TimeZoneMoreTest/TimeZoneMoreTest.ino new file mode 100644 index 000000000..cd7cb1858 --- /dev/null +++ b/tests/TimeZoneMoreTest/TimeZoneMoreTest.ino @@ -0,0 +1,56 @@ +#line 2 "TimeZoneMoreTest.ino" + +#include +#include // PrintStr +#include + +using namespace aunit; +using ace_common::PrintStr; +using namespace ace_time; + +// -------------------------------------------------------------------------- +// operator==() for kTypeManual, kTypeBasic and kTypeExtended. +// -------------------------------------------------------------------------- + +// These ZoneProcessors consume a lot of static RAM, so moved to a separate +// test so that they can be run on a Nano with only 2kB of memory. These +// processors aren't actually used in the unit tests, but are needed just to +// construct the different types of TimeZone instances. +BasicZoneProcessor basicZoneProcessor; +ExtendedZoneProcessor extendedZoneProcessor; + +test(TimeZoneMoreTest, operatorEqualEqual_directZone) { + TimeZone manual = TimeZone::forHours(-8); + TimeZone manual2 = TimeZone::forHours(-7); + assertTrue(manual != manual2); + + TimeZone basic = TimeZone::forZoneInfo( + &zonedb::kZoneAmerica_Los_Angeles, &basicZoneProcessor); + TimeZone basic2 = TimeZone::forZoneInfo( + &zonedb::kZoneAmerica_New_York, &basicZoneProcessor); + assertTrue(basic != basic2); + + TimeZone extended = TimeZone::forZoneInfo( + &zonedbx::kZoneAmerica_Los_Angeles, &extendedZoneProcessor); + TimeZone extended2 = TimeZone::forZoneInfo( + &zonedbx::kZoneAmerica_New_York, &extendedZoneProcessor); + assertTrue(extended != extended2); + + assertTrue(manual != basic); + assertTrue(manual != extended); + assertTrue(basic != extended); +} + +// -------------------------------------------------------------------------- + +void setup() { +#if ! defined(UNIX_HOST_DUINO) + delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR +#endif + SERIAL_PORT_MONITOR.begin(115200); + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro +} + +void loop() { + TestRunner::run(); +} diff --git a/tests/TimeZoneTest/TimeZoneTest.ino b/tests/TimeZoneTest/TimeZoneTest.ino index c8ddb4267..582c6e9a4 100644 --- a/tests/TimeZoneTest/TimeZoneTest.ino +++ b/tests/TimeZoneTest/TimeZoneTest.ino @@ -54,13 +54,13 @@ const basic::ZoneInfo* const kBasicZoneRegistry[] ACE_TIME_PROGMEM = { const uint16_t kBasicZoneRegistrySize = sizeof(kBasicZoneRegistry) / sizeof(kBasicZoneRegistry[0]); -BasicZoneManager<2> basicZoneManager( +BasicZoneManager<1> basicZoneManager( kBasicZoneRegistrySize, kBasicZoneRegistry); // -------------------------------------------------------------------------- // Use ExtendedZoneManager only for non AVR because we run out of RAM. -#if !defined(__AVR__) +#if ! defined(ARDUINO_ARCH_AVR) const extended::ZoneInfo* const kExtendedZoneRegistry[] ACE_TIME_PROGMEM = { &zonedbx::kZoneAmerica_Chicago, @@ -72,7 +72,7 @@ const extended::ZoneInfo* const kExtendedZoneRegistry[] ACE_TIME_PROGMEM = { const uint16_t kExtendedZoneRegistrySize = sizeof(kExtendedZoneRegistry) / sizeof(kExtendedZoneRegistry[0]); -ExtendedZoneManager<2> extendedZoneManager( +ExtendedZoneManager<1> extendedZoneManager( kExtendedZoneRegistrySize, kExtendedZoneRegistry); #endif @@ -180,7 +180,7 @@ test(TimeZoneTest, forHourMinute) { test(TimeZoneManualTest, registrySize) { ManualZoneManager manualZoneManager; - assertEqual(0, manualZoneManager.registrySize()); + assertEqual((uint16_t) 0, manualZoneManager.registrySize()); } test(TimeZoneManualTest, createForTimeZoneData) { @@ -210,7 +210,7 @@ test(TimeZoneManualTest, createForZoneId) { // -------------------------------------------------------------------------- test(TimeZoneBasicTest, registrySize) { - assertEqual(4, basicZoneManager.registrySize()); + assertEqual((uint16_t) 4, basicZoneManager.registrySize()); } test(TimeZoneBasicTest, createForZoneName) { @@ -239,7 +239,7 @@ test(TimeZoneBasicTest, createForZoneIndex) { test(TimeZoneBasicTest, indexForZoneName) { uint16_t index = basicZoneManager.indexForZoneName("America/Los_Angeles"); - assertEqual(2, index); + assertEqual((uint16_t) 2, index); index = basicZoneManager.indexForZoneName("America/not_found"); assertEqual(ZoneManager::kInvalidIndex, index); @@ -248,7 +248,7 @@ test(TimeZoneBasicTest, indexForZoneName) { test(TimeZoneBasicTest, indexForZoneId) { uint16_t index = basicZoneManager.indexForZoneId( zonedb::kZoneIdAmerica_New_York); - assertEqual(3, index); + assertEqual((uint16_t) 3, index); index = basicZoneManager.indexForZoneId(0 /* not found */); assertEqual(ZoneManager::kInvalidIndex, index); @@ -258,8 +258,10 @@ test(TimeZoneBasicTest, indexForZoneId) { // TimeZone + ExtendedZoneManager // -------------------------------------------------------------------------- +#if ! defined(ARDUINO_ARCH_AVR) + test(TimeZoneExtendedTest, registrySize) { - assertEqual(4, extendedZoneManager.registrySize()); + assertEqual((uint16_t) 4, extendedZoneManager.registrySize()); } test(TimeZoneExtendedTest, createForZoneName) { @@ -297,12 +299,14 @@ test(TimeZoneExtendedTest, indexForZoneName) { test(TimeZoneExtendedTest, indexForZoneId) { uint16_t index = extendedZoneManager.indexForZoneId( zonedbx::kZoneIdAmerica_New_York); - assertEqual(3, index); + assertEqual((uint16_t) 3, index); index = extendedZoneManager.indexForZoneId(0 /* not found */); assertEqual(ZoneManager::kInvalidIndex, index); } +#endif // ARDUINO_ARCH_AVR + // -------------------------------------------------------------------------- // kTypeBasicManaged + BasicZoneManager // -------------------------------------------------------------------------- @@ -391,7 +395,7 @@ test(TimeZoneDataTest, basicManaged) { assertTrue(tz == tzCycle); } -#if !defined(__AVR__) +#if ! defined(ARDUINO_ARCH_AVR) test(TimeZoneDataTest, extendedManaged) { TimeZone tz = extendedZoneManager.createForZoneInfo( &zonedbx::kZoneAmerica_Los_Angeles); @@ -420,7 +424,7 @@ test(TimeZoneDataTest, crossed) { } #endif -#if !defined(__AVR__) +#if ! defined(ARDUINO_ARCH_AVR) // -------------------------------------------------------------------------- // operator==() for kTypeExtendedManaged. // -------------------------------------------------------------------------- @@ -448,37 +452,6 @@ test(TimeZoneExtendedTest, operatorEqualEqual_managedZones) { } #endif -// -------------------------------------------------------------------------- -// operator==() for kTypeBasic and kTypeExtended. -// -------------------------------------------------------------------------- - -// We can reuse the processors for these unit tests because the unit tests -// don't actuallly use them. -BasicZoneProcessor basicZoneProcessor; -ExtendedZoneProcessor extendedZoneProcessor; - -test(TimeZoneTest, operatorEqualEqual_directZone) { - TimeZone manual = TimeZone::forHours(-8); - TimeZone manual2 = TimeZone::forHours(-7); - assertTrue(manual != manual2); - - TimeZone basic = TimeZone::forZoneInfo( - &zonedb::kZoneAmerica_Los_Angeles, &basicZoneProcessor); - TimeZone basic2 = TimeZone::forZoneInfo( - &zonedb::kZoneAmerica_New_York, &basicZoneProcessor); - assertTrue(basic != basic2); - - TimeZone extended = TimeZone::forZoneInfo( - &zonedbx::kZoneAmerica_Los_Angeles, &extendedZoneProcessor); - TimeZone extended2 = TimeZone::forZoneInfo( - &zonedbx::kZoneAmerica_New_York, &extendedZoneProcessor); - assertTrue(extended != extended2); - - assertTrue(manual != basic); - assertTrue(manual != extended); - assertTrue(basic != extended); -} - // -------------------------------------------------------------------------- void setup() { @@ -486,7 +459,7 @@ void setup() { delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { From f3b7016208a5d2da1716985f9856697bdc162755 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 18 Jan 2021 11:15:51 -0800 Subject: [PATCH 57/74] tests/BasicZoneRegistrarTest: Fix assertEqual() statements for 8-bit compilers --- .../BasicZoneRegistrarTest.ino | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino b/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino index 76d7d4916..f17b74808 100644 --- a/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino +++ b/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino @@ -124,7 +124,7 @@ test(BasicZoneRegistrarTest, getZoneInfoForId_not_found) { test(BasicZoneRegistrarTest, findIndexForName) { BasicZoneRegistrar zoneRegistrar(kNumSortedEntries, kSortedRegistry); uint16_t index = zoneRegistrar.findIndexForName("America/Los_Angeles"); - assertEqual(3, index); + assertEqual((uint16_t) 3, index); } test(BasicZoneRegistrarTest, findIndexForName_not_found) { @@ -137,7 +137,7 @@ test(BasicZoneRegistrarTest, findIndexForId) { BasicZoneRegistrar zoneRegistrar(kNumSortedEntries, kSortedRegistry); uint16_t index = zoneRegistrar.findIndexForId( zonedb::kZoneIdAmerica_Los_Angeles); - assertEqual(3, index); + assertEqual((uint16_t) 3, index); } test(BasicZoneRegistrarTest, findIndexForId_not_found) { @@ -167,7 +167,7 @@ test(BasicZoneRegistrarTest_Unsorted, isSorted) { test(BasicZoneRegistrarTest_Sorted, linearSearchById) { uint16_t index = BasicZoneRegistrar::linearSearchById( kSortedRegistry, kNumSortedEntries, zonedb::kZoneIdAmerica_Los_Angeles); - assertEqual(3, index); + assertEqual((uint16_t) 3, index); } test(BasicZoneRegistrarTest_Sorted, linearSearchById_not_found) { @@ -193,19 +193,19 @@ test(BasicZoneRegistrarTest_Sorted, binarySearchById) { index = BasicZoneRegistrar::binarySearchById( kSortedRegistry, kNumSortedEntries, zonedb::kZoneIdAmerica_New_York); - assertEqual(0, index); + assertEqual((uint16_t) 0, index); index = BasicZoneRegistrar::binarySearchById( kSortedRegistry, kNumSortedEntries, zonedb::kZoneIdAmerica_Chicago); - assertEqual(1, index); + assertEqual((uint16_t) 1, index); index = BasicZoneRegistrar::binarySearchById( kSortedRegistry, kNumSortedEntries, zonedb::kZoneIdAmerica_Denver); - assertEqual(2, index); + assertEqual((uint16_t) 2, index); index = BasicZoneRegistrar::binarySearchById( kSortedRegistry, kNumSortedEntries, zonedb::kZoneIdAmerica_Los_Angeles); - assertEqual(3, index); + assertEqual((uint16_t) 3, index); } test(BasicZoneRegistrarTest_Sorted, binarySearchById_not_found) { @@ -222,7 +222,7 @@ test(BasicZoneRegistrarTest_Unsorted, linearSearchById) { uint16_t index = BasicZoneRegistrar::linearSearchById( kUnsortedRegistry, kNumUnsortedEntries, zonedb::kZoneIdAmerica_Los_Angeles); - assertEqual(2, index); + assertEqual((uint16_t) 2, index); } test(BasicZoneRegistrarTest_Unsorted, linearSearchById_not_found) { From bea41b48e3e5a9828408528958cb5a9df3bf24b3 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 18 Jan 2021 11:50:12 -0800 Subject: [PATCH 58/74] tests: Apply cosmetic consistency across all tests; no functional change --- tests/BasicBrokerTest/BasicBrokerTest.ino | 6 ++-- .../BasicZoneProcessorTest.ino | 16 ++++----- .../BasicZoneRegistrarTest.ino | 34 +++++++++---------- tests/CommonTest/CommonTest.ino | 11 +++--- .../ExtendedBrokerTest/ExtendedBrokerTest.ino | 7 ++-- .../ExtendedZoneProcessorMoreTest.ino | 8 ++--- .../ExtendedZoneProcessorTest.ino | 20 +++++------ .../ExtendedZoneRegistrarTest.ino | 10 +++--- tests/HardwareTest/HardwareTest.ino | 12 +++---- tests/LocalDateTest/LocalDateTest.ino | 8 ++--- tests/LocalDateTimeTest/LocalDateTimeTest.ino | 8 ++--- tests/LocalTimeTest/LocalTimeTest.ino | 8 ++--- .../OffsetDateTimeTest/OffsetDateTimeTest.ino | 4 +-- tests/SystemClockTest/SystemClockTest.ino | 2 +- tests/TimeOffsetTest/TimeOffsetTest.ino | 12 +++---- tests/TimePeriodTest/TimePeriodTest.ino | 8 ++--- .../TimeZoneExtendedTest.ino | 10 +++--- .../TransitionStorageTest.ino | 4 +-- tests/UnixTimeTest/UnixTimeTest.ino | 6 ++-- .../ZoneProcessorCacheTest.ino | 14 ++++---- tests/ZonedDateTimeTest/ZonedDateTimeTest.ino | 20 +++++------ .../BasicDateUtilTest/BasicDateUtilTest.ino | 4 +-- .../BasicHinnantDateTest.ino | 4 ++- .../BasicJavaTest/BasicJavaTest.ino | 4 +-- .../BasicPythonTest/BasicPythonTest.ino | 4 +-- .../ExtendedDateUtilTest.ino | 4 +-- .../ExtendedHinnantDateTest.ino | 4 ++- .../ExtendedJavaTest/ExtendedJavaTest.ino | 4 +-- .../ExtendedPythonTest/ExtendedPythonTest.ino | 4 +-- 29 files changed, 132 insertions(+), 128 deletions(-) diff --git a/tests/BasicBrokerTest/BasicBrokerTest.ino b/tests/BasicBrokerTest/BasicBrokerTest.ino index 0b8ea7a14..caa8a29fe 100644 --- a/tests/BasicBrokerTest/BasicBrokerTest.ino +++ b/tests/BasicBrokerTest/BasicBrokerTest.ino @@ -13,7 +13,7 @@ test(timeCodeToMinutes) { ace_time::internal::timeCodeToMinutes(code, modifier)); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- static const char kTzDatabaseVersion[] = "2019b"; @@ -118,14 +118,14 @@ test(BasicBrokerTest, ZoneInfoBroker) { assertEqual(1, info.numEras()); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino b/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino index b1adbb17a..70fe50f8c 100644 --- a/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino +++ b/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino @@ -6,7 +6,7 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // Test zoneinfo files. Taken from Pacific/Galapagos which transitions // from simple Rule to named Rule in 1986: // @@ -17,7 +17,7 @@ using namespace ace_time; //Zone Pacific/Galapagos -5:58:24 - LMT 1931 # Puerto Baquerizo Moreno // -5:00 - -05 1986 // -6:00 Ecuador -06/-05 -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- static const char kTzDatabaseVersion[] = "2019b"; @@ -113,9 +113,9 @@ static const basic::ZoneInfo kZonePacific_Galapagos ACE_TIME_PROGMEM = { kZoneEraPacific_Galapagos /*eras*/, }; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // BasicZoneProcessor: test private methods -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(BasicZoneProcessorTest, operatorEqualEqual) { BasicZoneProcessor a(&zonedb::kZoneAmerica_Los_Angeles); @@ -410,9 +410,9 @@ test(BasicZoneProcessorTest, createAbbreviation) { assertEqual("PDT34", dst); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // Test public methods -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // https://www.timeanddate.com/time/zone/usa/los-angeles test(BasicZoneProcessorTest, kZoneAmerica_Los_Angeles) { @@ -510,14 +510,14 @@ test(BasicZoneProcessorTest, kZoneAmerica_Los_Angeles_outOfBounds) { assertEqual("", zoneProcessor.getAbbrev(epochSeconds)); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino b/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino index f17b74808..9e009a1b4 100644 --- a/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino +++ b/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino @@ -6,9 +6,9 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // Define some registries used later on. -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- const uint16_t kNumSortedEntries = 4; @@ -30,16 +30,16 @@ const basic::ZoneInfo* const kUnsortedRegistry[kNumUnsortedEntries] &zonedb::kZoneAmerica_New_York, // 0x1e2a7654 }; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // Verify that we can use kZoneIdAmerica_Los_Angeles everywhere. test(BasicZoneRegistrarTest, kZoneId) { assertEqual((uint32_t) 0xb7f7e8f2, zonedb::kZoneIdAmerica_Los_Angeles); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // BasicZoneRegistrar public methods -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(BasicZoneRegistrarTest, registrySize) { BasicZoneRegistrar zoneRegistrar( @@ -117,9 +117,9 @@ test(BasicZoneRegistrarTest, getZoneInfoForId_not_found) { assertEqual(zoneInfo, nullptr); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // Tests for findIndexFor*() need a stable registry. -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(BasicZoneRegistrarTest, findIndexForName) { BasicZoneRegistrar zoneRegistrar(kNumSortedEntries, kSortedRegistry); @@ -146,9 +146,9 @@ test(BasicZoneRegistrarTest, findIndexForId_not_found) { assertEqual(BasicZoneRegistrar::kInvalidIndex, index); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // Test ZoneRegistrar::isSorted(). -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(BasicZoneRegistrarTest_Sorted, isSorted) { assertTrue(BasicZoneRegistrar::isSorted(kSortedRegistry, kNumSortedEntries)); @@ -160,9 +160,9 @@ test(BasicZoneRegistrarTest_Unsorted, isSorted) { assertFalse(isSorted); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // BasicZoneRegistrar::linearSearchById() w/ sorted registry. -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(BasicZoneRegistrarTest_Sorted, linearSearchById) { uint16_t index = BasicZoneRegistrar::linearSearchById( @@ -176,9 +176,9 @@ test(BasicZoneRegistrarTest_Sorted, linearSearchById_not_found) { assertEqual(BasicZoneRegistrar::kInvalidIndex, index); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // BasicZoneRegistrar::binarySearchById() w/ sorted registry. -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(BasicZoneRegistrarTest_Sorted, binarySearchById_zeroEntries) { uint16_t index = BasicZoneRegistrar::binarySearchById( @@ -214,9 +214,9 @@ test(BasicZoneRegistrarTest_Sorted, binarySearchById_not_found) { assertEqual(BasicZoneRegistrar::kInvalidIndex, index); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // ZoneRegistrar::linearSearchById() with *unsorted* registry. -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(BasicZoneRegistrarTest_Unsorted, linearSearchById) { uint16_t index = BasicZoneRegistrar::linearSearchById( @@ -231,14 +231,14 @@ test(BasicZoneRegistrarTest_Unsorted, linearSearchById_not_found) { assertEqual(BasicZoneRegistrar::kInvalidIndex, index); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/CommonTest/CommonTest.ino b/tests/CommonTest/CommonTest.ino index 15bbbfe2c..55f490d0d 100644 --- a/tests/CommonTest/CommonTest.ino +++ b/tests/CommonTest/CommonTest.ino @@ -6,9 +6,9 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // DateStrings -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(DateStringsTest, monthString) { DateStrings ds; @@ -90,15 +90,14 @@ test(DateStringsTest, dayOfWeekStringsFitInBuffer) { assertLessOrEqual(maxLength, DateStrings::kBufferSize - 1); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif - - SERIAL_PORT_MONITOR.begin(115200); // ESP8266 default of 74880 not supported on Linux - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + SERIAL_PORT_MONITOR.begin(115200); + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino b/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino index d8dcc7582..788c5125f 100644 --- a/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino +++ b/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino @@ -13,7 +13,7 @@ test(timeCodeToMinutes) { ace_time::internal::timeCodeToMinutes(code, modifier)); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- static const char kTzDatabaseVersion[] = "2019b"; @@ -118,15 +118,14 @@ test(ExtendedBrokerTest, ZoneInfoBroker) { assertEqual(1, info.numEras()); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif - SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/ExtendedZoneProcessorMoreTest/ExtendedZoneProcessorMoreTest.ino b/tests/ExtendedZoneProcessorMoreTest/ExtendedZoneProcessorMoreTest.ino index d575d2c40..0c4f01b6d 100644 --- a/tests/ExtendedZoneProcessorMoreTest/ExtendedZoneProcessorMoreTest.ino +++ b/tests/ExtendedZoneProcessorMoreTest/ExtendedZoneProcessorMoreTest.ino @@ -10,9 +10,9 @@ using namespace aunit; using namespace ace_time; using namespace ace_time::zonedbx; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // Test public methods -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // https://www.timeanddate.com/time/zone/usa/los-angeles test(ExtendedZoneProcessorTest, kZoneAmerica_Los_Angeles) { @@ -79,14 +79,14 @@ test(ExtendedZoneProcessorTest, kZoneAmerica_Los_Angeles_outOfBounds) { assertEqual("", zoneProcessor.getAbbrev(epochSeconds)); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino b/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino index aa28c72e0..fc9a65525 100644 --- a/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino +++ b/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino @@ -7,10 +7,10 @@ using namespace aunit; using namespace ace_time; using namespace ace_time::extended; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // A simplified version of America/Los_Angeles, using only simple ZoneEras // (i.e. no references to a ZonePolicy). Valid only for 2018. -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- static const ZoneContext kZoneContext = { 2000 /*startYear*/, @@ -65,9 +65,9 @@ static const ZoneInfo kZoneAlmostLosAngeles ACE_TIME_PROGMEM = { kZoneEraAlmostLosAngeles /*eras*/, }; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // A real ZoneInfo for America/Los_Angeles. Taken from zonedbx/zone_infos.cpp. -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- static const ZoneRule kZoneRulesTestUS[] ACE_TIME_PROGMEM = { // Rule US 1967 2006 - Oct lastSun 2:00 0 S @@ -164,9 +164,9 @@ static const ZoneInfo kZoneTestLos_Angeles ACE_TIME_PROGMEM = { kZoneEraTestLos_Angeles /*eras*/, }; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // ExtendedZoneProcessor: test private methods -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- static const ZoneEra era ACE_TIME_PROGMEM = {nullptr, "", 0, 0, 0, 1, 2, 12, ZoneContext::kSuffixW}; @@ -780,9 +780,9 @@ test(ExtendedZoneProcessorTest, calcAbbreviations) { } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // Test public methods -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(ExtendedZoneProcessorTest, setZoneInfo) { ExtendedZoneProcessor zoneInfo(&zonedbx::kZoneAmerica_Los_Angeles); @@ -799,14 +799,14 @@ test(ExtendedZoneProcessorTest, setZoneInfo) { assertTrue(zoneInfo.mIsFilled); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro #if 0 TestRunner::exclude("*"); diff --git a/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino b/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino index 54fe9bb68..d4f3af043 100644 --- a/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino +++ b/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino @@ -6,16 +6,16 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // Verify that we can use kZoneIdAmerica_Los_Angeles everywhere. test(ExtendedZoneRegistrarTest, kZoneId) { assertEqual((uint32_t) 0xb7f7e8f2, zonedbx::kZoneIdAmerica_Los_Angeles); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // ExtendedZoneRegistrar -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(ExtendedZoneRegistrarTest, registrySize) { ExtendedZoneRegistrar zoneRegistrar( @@ -93,14 +93,14 @@ test(ExtendedZoneRegistrarTest, getZoneInfoForId_not_found) { assertEqual(zoneInfo, nullptr); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/HardwareTest/HardwareTest.ino b/tests/HardwareTest/HardwareTest.ino index c28d38eaa..cfa8003e9 100644 --- a/tests/HardwareTest/HardwareTest.ino +++ b/tests/HardwareTest/HardwareTest.ino @@ -8,9 +8,9 @@ using namespace aunit; using namespace ace_time::hw; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // HardwareTemperature -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(temperatureCompareAndEquals) { HardwareTemperature a; @@ -37,9 +37,9 @@ test(temperatureToTemperature256) { assertEqual(258, a.toTemperature256()); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // HardwareTemperature -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(dateTimeEqual) { HardwareDateTime a; @@ -78,14 +78,14 @@ test(dateTimeEqual) { assertTrue(a != b); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/LocalDateTest/LocalDateTest.ino b/tests/LocalDateTest/LocalDateTest.ino index bc5f0c22b..1f422cdc2 100644 --- a/tests/LocalDateTest/LocalDateTest.ino +++ b/tests/LocalDateTest/LocalDateTest.ino @@ -6,9 +6,9 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // LocalDate -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(LocalDateTest, isError_year_out_of_range) { assertTrue(LocalDate::forComponents(0, 1, 1).isError()); @@ -440,14 +440,14 @@ test(LocalDateTest, decrementOneDay_error) { assertTrue(ld.isError()); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/LocalDateTimeTest/LocalDateTimeTest.ino b/tests/LocalDateTimeTest/LocalDateTimeTest.ino index d84bc0b0e..157f7f44b 100644 --- a/tests/LocalDateTimeTest/LocalDateTimeTest.ino +++ b/tests/LocalDateTimeTest/LocalDateTimeTest.ino @@ -8,9 +8,9 @@ using namespace aunit; using namespace ace_time; using namespace ace_common; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // LocalDateTime -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(LocalDateTimeTest, accessors) { LocalDateTime dt = LocalDateTime::forComponents(2001, 2, 3, 4, 5, 6); @@ -315,14 +315,14 @@ test(LocalDateTimeTest, printTo) { assertEqual(dateString.getCstr(), "2020-10-30T01:02:03"); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/LocalTimeTest/LocalTimeTest.ino b/tests/LocalTimeTest/LocalTimeTest.ino index 78fa8841b..078648aaa 100644 --- a/tests/LocalTimeTest/LocalTimeTest.ino +++ b/tests/LocalTimeTest/LocalTimeTest.ino @@ -6,9 +6,9 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // LocalTime -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(LocalTimeTest, accessors) { LocalTime lt = LocalTime::forComponents(1, 2, 3); @@ -97,14 +97,14 @@ test(LocalTimeTest, fortimeString_invalid) { assertTrue(lt.isError()); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/OffsetDateTimeTest/OffsetDateTimeTest.ino b/tests/OffsetDateTimeTest/OffsetDateTimeTest.ino index ce2570b06..b65357a3c 100644 --- a/tests/OffsetDateTimeTest/OffsetDateTimeTest.ino +++ b/tests/OffsetDateTimeTest/OffsetDateTimeTest.ino @@ -385,14 +385,14 @@ test(OffsetDateTimeTest, forDateString_errors) { assertTrue(dt.isError()); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/SystemClockTest/SystemClockTest.ino b/tests/SystemClockTest/SystemClockTest.ino index 873c7b3e6..c0dfbc087 100644 --- a/tests/SystemClockTest/SystemClockTest.ino +++ b/tests/SystemClockTest/SystemClockTest.ino @@ -298,7 +298,7 @@ void setup() { delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/TimeOffsetTest/TimeOffsetTest.ino b/tests/TimeOffsetTest/TimeOffsetTest.ino index 2c67f6e52..2d67bd23f 100644 --- a/tests/TimeOffsetTest/TimeOffsetTest.ino +++ b/tests/TimeOffsetTest/TimeOffsetTest.ino @@ -6,9 +6,9 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // TimeOffset -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(TimeOffsetTest, operatorEqualEqual) { TimeOffset a = TimeOffset::forMinutes(10); @@ -94,9 +94,9 @@ test(TimeOffsetTest, error) { assertTrue(offset.isError()); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // time_offset_mutation -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(TimeOffsetMutationTest, increment15Minutes) { int8_t hour; @@ -138,14 +138,14 @@ test(TimeOffsetMutationTest, increment15Minutes) { assertEqual(0, minute); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/TimePeriodTest/TimePeriodTest.ino b/tests/TimePeriodTest/TimePeriodTest.ino index 6e94679b1..ceedf1699 100644 --- a/tests/TimePeriodTest/TimePeriodTest.ino +++ b/tests/TimePeriodTest/TimePeriodTest.ino @@ -6,9 +6,9 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // TimePeriod -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(TimePeriodTest, fromComponents) { TimePeriod t(0, 16, 40, 1); @@ -119,14 +119,14 @@ test(TimePeriodTest, tooLargeOrSmall) { assertTrue(tooSmall.isError()); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/TimeZoneExtendedTest/TimeZoneExtendedTest.ino b/tests/TimeZoneExtendedTest/TimeZoneExtendedTest.ino index 07b049a24..1a498f11f 100644 --- a/tests/TimeZoneExtendedTest/TimeZoneExtendedTest.ino +++ b/tests/TimeZoneExtendedTest/TimeZoneExtendedTest.ino @@ -6,9 +6,9 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // kTypeExtendedManaged + ExtendedZoneManager -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- const extended::ZoneInfo* const kExtendedZoneRegistry[] ACE_TIME_PROGMEM = { &zonedbx::kZoneAmerica_Chicago, @@ -23,7 +23,7 @@ const uint16_t kExtendedZoneRegistrySize = ExtendedZoneManager<2> extendedZoneManager( kExtendedZoneRegistrySize, kExtendedZoneRegistry); -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(TimeZoneExtendedTest, createFor) { TimeZone a = extendedZoneManager.createForZoneInfo( @@ -63,14 +63,14 @@ test(TimeZoneExtendedTest, Los_Angeles) { assertEqual(F("PDT"), tz.getAbbrev(epochSeconds)); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/TransitionStorageTest/TransitionStorageTest.ino b/tests/TransitionStorageTest/TransitionStorageTest.ino index 85c827c1e..39585247d 100644 --- a/tests/TransitionStorageTest/TransitionStorageTest.ino +++ b/tests/TransitionStorageTest/TransitionStorageTest.ino @@ -338,14 +338,14 @@ test(TransitionStorageTest, resetCandidatePool) { assertEqual(2, storage.mIndexFree); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/UnixTimeTest/UnixTimeTest.ino b/tests/UnixTimeTest/UnixTimeTest.ino index c76d21930..1a62b9e90 100644 --- a/tests/UnixTimeTest/UnixTimeTest.ino +++ b/tests/UnixTimeTest/UnixTimeTest.ino @@ -45,7 +45,7 @@ using namespace ace_time; #if defined(AVR) || defined(ESP8266) || defined(ESP32) || defined(__linux__) \ || defined(__APPLE__) -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(UnixTimeTest, toEpochSeconds) { auto dt = LocalDateTime::forComponents(2018, 1, 1, 0, 0, 0); @@ -103,12 +103,14 @@ test(UnixTimeTest, forEpochSeconds) { #endif +//--------------------------------------------------------------------------- + void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/ZoneProcessorCacheTest/ZoneProcessorCacheTest.ino b/tests/ZoneProcessorCacheTest/ZoneProcessorCacheTest.ino index acc6b7874..581345107 100644 --- a/tests/ZoneProcessorCacheTest/ZoneProcessorCacheTest.ino +++ b/tests/ZoneProcessorCacheTest/ZoneProcessorCacheTest.ino @@ -6,9 +6,9 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // BasicZoneProcessorCache -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(BasicZoneProcessorCacheTest, getZoneProcessor) { BasicZoneProcessorCache<2> cache; @@ -30,9 +30,9 @@ test(BasicZoneProcessorCacheTest, getZoneProcessor) { assertEqual(zoneProcessor1, zoneProcessor4); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // ExtendedZoneProcessorCache -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(ExtendedZoneProcessorCacheTest, getZoneProcessor) { ExtendedZoneProcessorCache<2> cache; @@ -54,14 +54,14 @@ test(ExtendedZoneProcessorCacheTest, getZoneProcessor) { assertEqual(zoneProcessor1, zoneProcessor4); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) - delay(1000); // wait to prevent garbage SERIAL_PORT_MONITOR + delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/ZonedDateTimeTest/ZonedDateTimeTest.ino b/tests/ZonedDateTimeTest/ZonedDateTimeTest.ino index 6e2ab77b3..8f1d1ee99 100644 --- a/tests/ZonedDateTimeTest/ZonedDateTimeTest.ino +++ b/tests/ZonedDateTimeTest/ZonedDateTimeTest.ino @@ -7,9 +7,9 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // ZonedDateTime + Manual TimeZone -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // Check that ZonedDateTime with Manual TimeZone agrees with simpler // OffsetDateTime. @@ -162,9 +162,9 @@ test(ZonedDateTimeTest_Manual, error) { assertTrue(zdt.isError()); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // forDateString() -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(ZonedDateTimeTest, forDateString) { // exact ISO8601 format @@ -220,9 +220,9 @@ test(ZonedDateTimeTest, forDateString_errors) { assertTrue(dt.isError()); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // printTo() -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(ZonedDateTimeTest_Manual, printTo) { ace_common::PrintStr<64> dateString; @@ -240,9 +240,9 @@ test(ZonedDateTimeTest_Manual, printTo) { assertEqual(dateString.getCstr(), "2018-03-11T01:59:59-08:00[-08:00+00:00]"); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // data_time_mutation -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- test(DateTimeMutationTest, increment) { ZonedDateTime dt = ZonedDateTime::forComponents(2001, 2, 3, 4, 5, 6, @@ -301,14 +301,14 @@ test(DateTimeMutationTest, increment) { assertEqual(0, dt.timeZone().getUtcOffset(0).toMinutes()); } -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/validation/BasicDateUtilTest/BasicDateUtilTest.ino b/tests/validation/BasicDateUtilTest/BasicDateUtilTest.ino index 84b3d22ee..d77a5b357 100644 --- a/tests/validation/BasicDateUtilTest/BasicDateUtilTest.ino +++ b/tests/validation/BasicDateUtilTest/BasicDateUtilTest.ino @@ -12,14 +12,14 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro #if 0 TestRunner::exclude("*"); diff --git a/tests/validation/BasicHinnantDateTest/BasicHinnantDateTest.ino b/tests/validation/BasicHinnantDateTest/BasicHinnantDateTest.ino index 4315f71e7..067fb2b0d 100644 --- a/tests/validation/BasicHinnantDateTest/BasicHinnantDateTest.ino +++ b/tests/validation/BasicHinnantDateTest/BasicHinnantDateTest.ino @@ -12,12 +12,14 @@ using namespace aunit; using namespace ace_time; +//--------------------------------------------------------------------------- + void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/validation/BasicJavaTest/BasicJavaTest.ino b/tests/validation/BasicJavaTest/BasicJavaTest.ino index 5a06c11ad..4e4d3aa6a 100644 --- a/tests/validation/BasicJavaTest/BasicJavaTest.ino +++ b/tests/validation/BasicJavaTest/BasicJavaTest.ino @@ -12,14 +12,14 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro #if 0 TestRunner::exclude("*"); diff --git a/tests/validation/BasicPythonTest/BasicPythonTest.ino b/tests/validation/BasicPythonTest/BasicPythonTest.ino index d03eace25..69994f75e 100644 --- a/tests/validation/BasicPythonTest/BasicPythonTest.ino +++ b/tests/validation/BasicPythonTest/BasicPythonTest.ino @@ -12,14 +12,14 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro #if 0 TestRunner::exclude("*"); diff --git a/tests/validation/ExtendedDateUtilTest/ExtendedDateUtilTest.ino b/tests/validation/ExtendedDateUtilTest/ExtendedDateUtilTest.ino index 9e24e23df..f1822e9af 100644 --- a/tests/validation/ExtendedDateUtilTest/ExtendedDateUtilTest.ino +++ b/tests/validation/ExtendedDateUtilTest/ExtendedDateUtilTest.ino @@ -12,14 +12,14 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro #if 0 TestRunner::exclude("*"); diff --git a/tests/validation/ExtendedHinnantDateTest/ExtendedHinnantDateTest.ino b/tests/validation/ExtendedHinnantDateTest/ExtendedHinnantDateTest.ino index 6d0009ed3..227022b32 100644 --- a/tests/validation/ExtendedHinnantDateTest/ExtendedHinnantDateTest.ino +++ b/tests/validation/ExtendedHinnantDateTest/ExtendedHinnantDateTest.ino @@ -12,12 +12,14 @@ using namespace aunit; using namespace ace_time; +//--------------------------------------------------------------------------- + void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro } void loop() { diff --git a/tests/validation/ExtendedJavaTest/ExtendedJavaTest.ino b/tests/validation/ExtendedJavaTest/ExtendedJavaTest.ino index 67059683e..2e706a75d 100644 --- a/tests/validation/ExtendedJavaTest/ExtendedJavaTest.ino +++ b/tests/validation/ExtendedJavaTest/ExtendedJavaTest.ino @@ -12,14 +12,14 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro #if 0 TestRunner::exclude("*"); diff --git a/tests/validation/ExtendedPythonTest/ExtendedPythonTest.ino b/tests/validation/ExtendedPythonTest/ExtendedPythonTest.ino index b7b43a30d..4c8aa2e65 100644 --- a/tests/validation/ExtendedPythonTest/ExtendedPythonTest.ino +++ b/tests/validation/ExtendedPythonTest/ExtendedPythonTest.ino @@ -12,14 +12,14 @@ using namespace aunit; using namespace ace_time; -// -------------------------------------------------------------------------- +//--------------------------------------------------------------------------- void setup() { #if ! defined(UNIX_HOST_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); - while(!SERIAL_PORT_MONITOR); // for the Arduino Leonardo/Micro only + while (!SERIAL_PORT_MONITOR); // Leonardo/Micro #if 0 TestRunner::exclude("*"); From aaa2bfb8a438404458c74705eaad12aa4da5ac25 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Fri, 22 Jan 2021 12:36:15 -0800 Subject: [PATCH 59/74] Update UnixHostDuino 0.4 to EpoxyDuino 0.5 --- .github/workflows/aunit_tests.yml | 2 +- CHANGELOG.md | 1 + README.md | 2 +- USER_GUIDE.md | 6 +++--- examples/AutoBenchmark/AutoBenchmark.ino | 6 +++--- examples/AutoBenchmark/Benchmark.cpp | 2 +- examples/AutoBenchmark/Makefile | 4 ++-- examples/HelloDateTime/HelloDateTime.ino | 4 ++-- examples/HelloDateTime/Makefile | 4 ++-- examples/HelloSystemClock/HelloSystemClock.ino | 2 +- examples/HelloSystemClock/Makefile | 4 ++-- .../HelloSystemClockCoroutine/HelloSystemClockCoroutine.ino | 2 +- examples/HelloSystemClockCoroutine/Makefile | 4 ++-- examples/HelloZoneManager/HelloZoneManager.ino | 4 ++-- examples/HelloZoneManager/Makefile | 4 ++-- examples/MemoryBenchmark/Makefile | 6 +++--- src/ace_time/clock/DS3231Clock.h | 2 +- src/ace_time/clock/StmRtcClock.h | 4 ++-- src/ace_time/clock/UnixClock.h | 4 ++-- src/ace_time/common/compat.h | 2 +- src/ace_time/hw/DS3231.cpp | 2 +- src/ace_time/hw/DS3231.h | 2 +- src/ace_time/hw/HardwareDateTime.cpp | 2 +- src/ace_time/hw/StmRtc.cpp | 4 ++-- src/ace_time/hw/StmRtc.h | 4 ++-- tests/BasicBrokerTest/BasicBrokerTest.ino | 2 +- tests/BasicBrokerTest/Makefile | 4 ++-- tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino | 2 +- tests/BasicZoneProcessorTest/Makefile | 4 ++-- tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino | 2 +- tests/BasicZoneRegistrarTest/Makefile | 4 ++-- tests/CommonTest/CommonTest.ino | 2 +- tests/CommonTest/Makefile | 4 ++-- tests/ExtendedBrokerTest/ExtendedBrokerTest.ino | 2 +- tests/ExtendedBrokerTest/Makefile | 4 ++-- .../ExtendedZoneProcessorMoreTest.ino | 2 +- tests/ExtendedZoneProcessorMoreTest/Makefile | 4 ++-- .../ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino | 2 +- tests/ExtendedZoneProcessorTest/Makefile | 4 ++-- .../ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino | 2 +- tests/ExtendedZoneRegistrarTest/Makefile | 4 ++-- tests/HardwareTest/HardwareTest.ino | 2 +- tests/HardwareTest/Makefile | 4 ++-- tests/JenkinsfileUnixHost | 4 ++-- tests/LocalDateTest/LocalDateTest.ino | 2 +- tests/LocalDateTest/Makefile | 4 ++-- tests/LocalDateTimeTest/LocalDateTimeTest.ino | 2 +- tests/LocalDateTimeTest/Makefile | 4 ++-- tests/LocalTimeTest/LocalTimeTest.ino | 2 +- tests/LocalTimeTest/Makefile | 4 ++-- tests/OffsetDateTimeTest/Makefile | 4 ++-- tests/OffsetDateTimeTest/OffsetDateTimeTest.ino | 2 +- tests/README.md | 6 +++--- tests/SystemClockTest/Makefile | 4 ++-- tests/SystemClockTest/SystemClockTest.ino | 2 +- tests/TimeOffsetTest/Makefile | 4 ++-- tests/TimeOffsetTest/TimeOffsetTest.ino | 2 +- tests/TimePeriodTest/Makefile | 4 ++-- tests/TimePeriodTest/TimePeriodTest.ino | 2 +- tests/TimeZoneExtendedTest/Makefile | 4 ++-- tests/TimeZoneExtendedTest/TimeZoneExtendedTest.ino | 2 +- tests/TimeZoneMoreTest/Makefile | 4 ++-- tests/TimeZoneMoreTest/TimeZoneMoreTest.ino | 2 +- tests/TimeZoneTest/Makefile | 4 ++-- tests/TimeZoneTest/TimeZoneTest.ino | 2 +- tests/TransitionStorageTest/Makefile | 4 ++-- tests/TransitionStorageTest/TransitionStorageTest.ino | 2 +- tests/TzDbTest/Makefile | 4 ++-- tests/TzDbTest/TzDbTest.ino | 2 +- tests/UnixTimeTest/Makefile | 4 ++-- tests/UnixTimeTest/UnixTimeTest.ino | 2 +- tests/ZoneProcessorCacheTest/Makefile | 4 ++-- tests/ZoneProcessorCacheTest/ZoneProcessorCacheTest.ino | 2 +- tests/ZonedDateTimeBasicTest/Makefile | 4 ++-- tests/ZonedDateTimeBasicTest/ZonedDateTimeBasicTest.ino | 2 +- tests/ZonedDateTimeExtendedTest/Makefile | 4 ++-- .../ZonedDateTimeExtendedTest/ZonedDateTimeExtendedTest.ino | 2 +- tests/ZonedDateTimeTest/Makefile | 4 ++-- tests/ZonedDateTimeTest/ZonedDateTimeTest.ino | 2 +- tests/validation/BasicDateUtilTest/BasicDateUtilTest.ino | 2 +- tests/validation/BasicDateUtilTest/Makefile | 4 ++-- tests/validation/BasicDateUtilTest/README.md | 2 +- .../BasicHinnantDateTest/BasicHinnantDateTest.ino | 2 +- tests/validation/BasicHinnantDateTest/Makefile | 4 ++-- tests/validation/BasicJavaTest/BasicJavaTest.ino | 2 +- tests/validation/BasicJavaTest/Makefile | 4 ++-- tests/validation/BasicJavaTest/README.md | 2 +- tests/validation/BasicPythonTest/BasicPythonTest.ino | 2 +- tests/validation/BasicPythonTest/Makefile | 4 ++-- tests/validation/BasicPythonTest/README.md | 2 +- .../ExtendedDateUtilTest/ExtendedDateUtilTest.ino | 2 +- tests/validation/ExtendedDateUtilTest/Makefile | 4 ++-- tests/validation/ExtendedDateUtilTest/README.md | 2 +- .../ExtendedHinnantDateTest/ExtendedHinnantDateTest.ino | 2 +- tests/validation/ExtendedHinnantDateTest/Makefile | 4 ++-- tests/validation/ExtendedJavaTest/ExtendedJavaTest.ino | 2 +- tests/validation/ExtendedJavaTest/Makefile | 4 ++-- tests/validation/ExtendedJavaTest/README.md | 2 +- tests/validation/ExtendedPythonTest/ExtendedPythonTest.ino | 2 +- tests/validation/ExtendedPythonTest/Makefile | 4 ++-- tests/validation/ExtendedPythonTest/README.md | 2 +- tests/validation/README.md | 6 +++--- 102 files changed, 158 insertions(+), 157 deletions(-) diff --git a/.github/workflows/aunit_tests.yml b/.github/workflows/aunit_tests.yml index f546f0497..8493b76b4 100644 --- a/.github/workflows/aunit_tests.yml +++ b/.github/workflows/aunit_tests.yml @@ -13,7 +13,7 @@ jobs: - name: Setup run: | cd .. - git clone https://github.com/bxparks/UnixHostDuino + git clone https://github.com/bxparks/EpoxyDuino git clone https://github.com/bxparks/AceButton git clone https://github.com/bxparks/AceRoutine git clone https://github.com/bxparks/AUnit diff --git a/CHANGELOG.md b/CHANGELOG.md index f32d3126d..1b9768ef7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ useful for internal algorithms. Client code that needs the old functionality can print to a `ace_common::PrintStr<>` object, then extract the c-string using `PrintStr::getCstr()`. + * Update UnixHostDuino 0.4 to EpoxyDuino 0.5. * 1.4.1 (2020-12-30, TZDB version 2020f for real) * Actually update `src/ace_time/zonedb` and `src/ace_time/zonedbx` zone info files to 2020f. Oops. diff --git a/README.md b/README.md index eee2c886e..aa9e563ca 100644 --- a/README.md +++ b/README.md @@ -535,7 +535,7 @@ It should work with [PlatformIO](https://platformio.org/) but I have not tested it. The library works on Linux or MacOS (using both g++ and clang++ compilers) using -the UnixHostDuino (https://github.com/bxparks/UnixHostDuino) emulation layer. +the EpoxyDuino (https://github.com/bxparks/EpoxyDuino) emulation layer. ### Operating System diff --git a/USER_GUIDE.md b/USER_GUIDE.md index 5179ebffb..30ad2be34 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -124,7 +124,7 @@ The source files are organized as follows: * `tests/` - unit tests using [AUnit](https://github.com/bxparks/AUnit) * `tests/validation` - integration tests using AUnit which must be run on desktop Linux or MacOS machines using - [UnixHostDuino](https://github.com/bxparks/UnixHostDuino) + [EpoxyDuino](https://github.com/bxparks/EpoxyDuino) * `examples/` - example programs * `tools/` - parser for the TZ Database files, code generators for `zonedb::` and `zonedbx::` zone files, and code generators for various unit tests @@ -160,7 +160,7 @@ Various scripts in the `tools/` directory depend on: If you want to run the unit tests or some of the command line examples using a Linux or MacOS machine, you need: -* UnixHostDuino (https://github.com/bxparks/UnixHostDuino) +* EpoxyDuino (https://github.com/bxparks/EpoxyDuino) ### Examples @@ -2718,7 +2718,7 @@ components are identical. The resulting data test set contains between 150k to 220k data points, and can no longer fit in any Arduino microcontroller that I am aware of. They can be executed only on desktop-class Linux or MacOS machines through the use of the -[UnixHostDuino](https://github.com/bxparks/UnixHostDuino) emulation framework. +[EpoxyDuino](https://github.com/bxparks/EpoxyDuino) emulation framework. The `pytz` library supports [dates only until 2038](https://answers.launchpad.net/pytz/+question/262216). It is also tricky to diff --git a/examples/AutoBenchmark/AutoBenchmark.ino b/examples/AutoBenchmark/AutoBenchmark.ino index c04cc2e20..b9f03c9b7 100644 --- a/examples/AutoBenchmark/AutoBenchmark.ino +++ b/examples/AutoBenchmark/AutoBenchmark.ino @@ -13,7 +13,7 @@ using namespace ace_time; void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); #endif @@ -71,7 +71,7 @@ void setup() { // ace_time::clock classes -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) SERIAL_PORT_MONITOR.print(F("sizeof(clock::DS3231Clock): ")); SERIAL_PORT_MONITOR.println(sizeof(clock::DS3231Clock)); @@ -120,7 +120,7 @@ void setup() { runBenchmarks(); SERIAL_PORT_MONITOR.println("END"); -#if defined(UNIX_HOST_DUINO) +#if defined(EPOXY_DUINO) exit(0); #endif } diff --git a/examples/AutoBenchmark/Benchmark.cpp b/examples/AutoBenchmark/Benchmark.cpp index d763ad46e..64c375ae2 100644 --- a/examples/AutoBenchmark/Benchmark.cpp +++ b/examples/AutoBenchmark/Benchmark.cpp @@ -18,7 +18,7 @@ const uint32_t COUNT = 10000; const uint32_t COUNT = 100000; #elif defined(TEENSYDUINO) const uint32_t COUNT = 100000; -#elif defined(UNIX_HOST_DUINO) +#elif defined(EPOXY_DUINO) // Linux or MacOS const uint32_t COUNT = 100000; #else diff --git a/examples/AutoBenchmark/Makefile b/examples/AutoBenchmark/Makefile index e2832b1f0..3a30a3724 100644 --- a/examples/AutoBenchmark/Makefile +++ b/examples/AutoBenchmark/Makefile @@ -1,10 +1,10 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := AutoBenchmark ARDUINO_LIBS := AceCommon AceTime AceRoutine MORE_CLEAN := more_clean -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk .PHONY: benchmarks diff --git a/examples/HelloDateTime/HelloDateTime.ino b/examples/HelloDateTime/HelloDateTime.ino index 7ff0fe3bb..fc1f45c0f 100644 --- a/examples/HelloDateTime/HelloDateTime.ino +++ b/examples/HelloDateTime/HelloDateTime.ino @@ -29,7 +29,7 @@ static BasicZoneProcessor pacificProcessor; static BasicZoneProcessor londonProcessor; void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); #endif SERIAL_PORT_MONITOR.begin(115200); @@ -103,7 +103,7 @@ void setup() { SERIAL_PORT_MONITOR.print(F("pacificTime == londonTime: ")); SERIAL_PORT_MONITOR.println((pacificTime == londonTime) ? "true" : "false"); -#if defined(UNIX_HOST_DUINO) +#if defined(EPOXY_DUINO) exit(0); #endif } diff --git a/examples/HelloDateTime/Makefile b/examples/HelloDateTime/Makefile index 18c41fa9c..8ca14819d 100644 --- a/examples/HelloDateTime/Makefile +++ b/examples/HelloDateTime/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := HelloDateTime ARDUINO_LIBS := AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/HelloSystemClock/HelloSystemClock.ino b/examples/HelloSystemClock/HelloSystemClock.ino index 0f2d72050..437511ff2 100644 --- a/examples/HelloSystemClock/HelloSystemClock.ino +++ b/examples/HelloSystemClock/HelloSystemClock.ino @@ -19,7 +19,7 @@ static BasicZoneProcessor pacificProcessor; static SystemClockLoop systemClock(nullptr /*reference*/, nullptr /*backup*/); void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/examples/HelloSystemClock/Makefile b/examples/HelloSystemClock/Makefile index b690bfbf7..603580fe2 100644 --- a/examples/HelloSystemClock/Makefile +++ b/examples/HelloSystemClock/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := HelloSystemClock ARDUINO_LIBS := AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/HelloSystemClockCoroutine/HelloSystemClockCoroutine.ino b/examples/HelloSystemClockCoroutine/HelloSystemClockCoroutine.ino index e52826faf..0a27a0f21 100644 --- a/examples/HelloSystemClockCoroutine/HelloSystemClockCoroutine.ino +++ b/examples/HelloSystemClockCoroutine/HelloSystemClockCoroutine.ino @@ -25,7 +25,7 @@ static SystemClockCoroutine systemClock( nullptr /*reference*/, nullptr /*backup*/); void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/examples/HelloSystemClockCoroutine/Makefile b/examples/HelloSystemClockCoroutine/Makefile index 8b0f90fb2..c73d51fc7 100644 --- a/examples/HelloSystemClockCoroutine/Makefile +++ b/examples/HelloSystemClockCoroutine/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := HelloSystemClockCoroutine ARDUINO_LIBS := AceCommon AceTime AceRoutine -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/HelloZoneManager/HelloZoneManager.ino b/examples/HelloZoneManager/HelloZoneManager.ino index 1ee9b8923..836af4697 100644 --- a/examples/HelloZoneManager/HelloZoneManager.ino +++ b/examples/HelloZoneManager/HelloZoneManager.ino @@ -20,7 +20,7 @@ static BasicZoneManager manager( zonedb::kZoneRegistrySize, zonedb::kZoneRegistry); void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); #endif SERIAL_PORT_MONITOR.begin(115200); @@ -45,7 +45,7 @@ void setup() { sydneyTime.printTo(SERIAL_PORT_MONITOR); SERIAL_PORT_MONITOR.println(); -#if defined(UNIX_HOST_DUINO) +#if defined(EPOXY_DUINO) exit(0); #endif } diff --git a/examples/HelloZoneManager/Makefile b/examples/HelloZoneManager/Makefile index 0ae8da534..be5e4bb06 100644 --- a/examples/HelloZoneManager/Makefile +++ b/examples/HelloZoneManager/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := HelloZoneManager ARDUINO_LIBS := AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/MemoryBenchmark/Makefile b/examples/MemoryBenchmark/Makefile index e9e3d70cc..e50b3d3ae 100644 --- a/examples/MemoryBenchmark/Makefile +++ b/examples/MemoryBenchmark/Makefile @@ -1,10 +1,10 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about using -# UnixHostDuino to compile and run AUnit tests natively on Linux or MacOS. +# See https://github.com/bxparks/EpoxyDuino for documentation about using +# EpoxyDuino to compile and run AUnit tests natively on Linux or MacOS. APP_NAME := MemoryBenchmark ARDUINO_LIBS := AceCommon AceRoutine MORE_CLEAN := more_clean -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk .PHONY: benchmarks diff --git a/src/ace_time/clock/DS3231Clock.h b/src/ace_time/clock/DS3231Clock.h index 94eb984e3..379440b9f 100644 --- a/src/ace_time/clock/DS3231Clock.h +++ b/src/ace_time/clock/DS3231Clock.h @@ -6,7 +6,7 @@ #ifndef ACE_TIME_DS3231_CLOCK_H #define ACE_TIME_DS3231_CLOCK_H -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) #include #include "../hw/DS3231.h" diff --git a/src/ace_time/clock/StmRtcClock.h b/src/ace_time/clock/StmRtcClock.h index 42820f7e2..819678c9d 100644 --- a/src/ace_time/clock/StmRtcClock.h +++ b/src/ace_time/clock/StmRtcClock.h @@ -8,7 +8,7 @@ #ifndef ACE_TIME_STM_RTC_CLOCK_H #define ACE_TIME_STM_RTC_CLOCK_H -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) #if defined(ARDUINO_ARCH_STM32) #include @@ -77,5 +77,5 @@ class StmRtcClock: public Clock { } // ace_time #endif // #if defined(ARDUINO_ARCH_STM32) -#endif // #if ! defined(UNIX_HOST_DUINO) +#endif // #if ! defined(EPOXY_DUINO) #endif // #ifndef ACE_TIME_STM_RTC_CLOCK_H diff --git a/src/ace_time/clock/UnixClock.h b/src/ace_time/clock/UnixClock.h index 5628ccf67..67205660c 100644 --- a/src/ace_time/clock/UnixClock.h +++ b/src/ace_time/clock/UnixClock.h @@ -6,7 +6,7 @@ #ifndef ACE_TIME_UNIX_CLOCK_H #define ACE_TIME_UNIX_CLOCK_H -#if defined(UNIX_HOST_DUINO) +#if defined(EPOXY_DUINO) #include // time() #include "Clock.h" @@ -16,7 +16,7 @@ namespace ace_time { namespace clock { /** - * An implementation of Clock that works on Unix using UnixHostDuino. + * An implementation of Clock that works on Unix using EpoxyDuino. */ class UnixClock: public Clock { public: diff --git a/src/ace_time/common/compat.h b/src/ace_time/common/compat.h index e8735a0f8..fbe15a94d 100644 --- a/src/ace_time/common/compat.h +++ b/src/ace_time/common/compat.h @@ -60,7 +60,7 @@ #define SERIAL_PORT_MONITOR Serial #endif -#elif defined(UNIX_HOST_DUINO) +#elif defined(EPOXY_DUINO) #include #elif defined(ARDUINO_ARCH_STM32) diff --git a/src/ace_time/hw/DS3231.cpp b/src/ace_time/hw/DS3231.cpp index cc828a051..23e06efb2 100644 --- a/src/ace_time/hw/DS3231.cpp +++ b/src/ace_time/hw/DS3231.cpp @@ -3,7 +3,7 @@ * Copyright (c) 2018 Brian T. Park */ -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) #include #include // Print diff --git a/src/ace_time/hw/DS3231.h b/src/ace_time/hw/DS3231.h index e92d8d234..fb50db40f 100644 --- a/src/ace_time/hw/DS3231.h +++ b/src/ace_time/hw/DS3231.h @@ -6,7 +6,7 @@ #ifndef ACE_TIME_HW_DS3231_H #define ACE_TIME_HW_DS3231_H -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) #include diff --git a/src/ace_time/hw/HardwareDateTime.cpp b/src/ace_time/hw/HardwareDateTime.cpp index c4154441d..0ccfadca2 100644 --- a/src/ace_time/hw/HardwareDateTime.cpp +++ b/src/ace_time/hw/HardwareDateTime.cpp @@ -3,7 +3,7 @@ * Copyright (c) 2018 Brian T. Park */ -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) #include #include "HardwareDateTime.h" diff --git a/src/ace_time/hw/StmRtc.cpp b/src/ace_time/hw/StmRtc.cpp index dd980ec9d..3a78ea3e4 100644 --- a/src/ace_time/hw/StmRtc.cpp +++ b/src/ace_time/hw/StmRtc.cpp @@ -3,7 +3,7 @@ * Copyright (c) 2020 Brian T. Park, Anatoli Arkhipenko */ -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) #if defined(ARDUINO_ARCH_STM32) #include // Print @@ -75,5 +75,5 @@ bool StmRtc::isTimeSet() const { } // hw } // ace_time -#endif // #if ! defined(UNIX_HOST_DUINO) +#endif // #if ! defined(EPOXY_DUINO) #endif // #if defined(ARDUINO_ARCH_STM32) diff --git a/src/ace_time/hw/StmRtc.h b/src/ace_time/hw/StmRtc.h index e3fdb4460..7ea84f128 100644 --- a/src/ace_time/hw/StmRtc.h +++ b/src/ace_time/hw/StmRtc.h @@ -6,7 +6,7 @@ #ifndef ACE_TIME_HW_STM_RTC_H #define ACE_TIME_HW_STM_RTC_H -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) #if defined(ARDUINO_ARCH_STM32) #include @@ -47,5 +47,5 @@ class StmRtc { } // ace_time #endif // #if defined(ARDUINO_ARCH_STM32) -#endif // #if ! defined(UNIX_HOST_DUINO) +#endif // #if ! defined(EPOXY_DUINO) #endif // #ifndef ACE_TIME_HW_STM_RTC_H diff --git a/tests/BasicBrokerTest/BasicBrokerTest.ino b/tests/BasicBrokerTest/BasicBrokerTest.ino index caa8a29fe..6a0873f30 100644 --- a/tests/BasicBrokerTest/BasicBrokerTest.ino +++ b/tests/BasicBrokerTest/BasicBrokerTest.ino @@ -121,7 +121,7 @@ test(BasicBrokerTest, ZoneInfoBroker) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/BasicBrokerTest/Makefile b/tests/BasicBrokerTest/Makefile index 5575d6c4a..58ded38bb 100644 --- a/tests/BasicBrokerTest/Makefile +++ b/tests/BasicBrokerTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := BasicBrokerTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino b/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino index 70fe50f8c..ba5ae20ef 100644 --- a/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino +++ b/tests/BasicZoneProcessorTest/BasicZoneProcessorTest.ino @@ -513,7 +513,7 @@ test(BasicZoneProcessorTest, kZoneAmerica_Los_Angeles_outOfBounds) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/BasicZoneProcessorTest/Makefile b/tests/BasicZoneProcessorTest/Makefile index 1478c6f32..e7d57f040 100644 --- a/tests/BasicZoneProcessorTest/Makefile +++ b/tests/BasicZoneProcessorTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := BasicZoneProcessorTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino b/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino index 9e009a1b4..28703c8fc 100644 --- a/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino +++ b/tests/BasicZoneRegistrarTest/BasicZoneRegistrarTest.ino @@ -234,7 +234,7 @@ test(BasicZoneRegistrarTest_Unsorted, linearSearchById_not_found) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/BasicZoneRegistrarTest/Makefile b/tests/BasicZoneRegistrarTest/Makefile index de441c5aa..d534d6a18 100644 --- a/tests/BasicZoneRegistrarTest/Makefile +++ b/tests/BasicZoneRegistrarTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := BasicZoneRegistrarTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/CommonTest/CommonTest.ino b/tests/CommonTest/CommonTest.ino index 55f490d0d..b0358f85c 100644 --- a/tests/CommonTest/CommonTest.ino +++ b/tests/CommonTest/CommonTest.ino @@ -93,7 +93,7 @@ test(DateStringsTest, dayOfWeekStringsFitInBuffer) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/CommonTest/Makefile b/tests/CommonTest/Makefile index 2827843f8..904aac5ec 100644 --- a/tests/CommonTest/Makefile +++ b/tests/CommonTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := CommonTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino b/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino index 788c5125f..0ebaa21cd 100644 --- a/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino +++ b/tests/ExtendedBrokerTest/ExtendedBrokerTest.ino @@ -121,7 +121,7 @@ test(ExtendedBrokerTest, ZoneInfoBroker) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/ExtendedBrokerTest/Makefile b/tests/ExtendedBrokerTest/Makefile index 66ec2992a..67f53eeca 100644 --- a/tests/ExtendedBrokerTest/Makefile +++ b/tests/ExtendedBrokerTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := ExtendedBrokerTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/ExtendedZoneProcessorMoreTest/ExtendedZoneProcessorMoreTest.ino b/tests/ExtendedZoneProcessorMoreTest/ExtendedZoneProcessorMoreTest.ino index 0c4f01b6d..14c92398c 100644 --- a/tests/ExtendedZoneProcessorMoreTest/ExtendedZoneProcessorMoreTest.ino +++ b/tests/ExtendedZoneProcessorMoreTest/ExtendedZoneProcessorMoreTest.ino @@ -82,7 +82,7 @@ test(ExtendedZoneProcessorTest, kZoneAmerica_Los_Angeles_outOfBounds) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/ExtendedZoneProcessorMoreTest/Makefile b/tests/ExtendedZoneProcessorMoreTest/Makefile index 62cebe90b..301467ab5 100644 --- a/tests/ExtendedZoneProcessorMoreTest/Makefile +++ b/tests/ExtendedZoneProcessorMoreTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := ExtendedZoneProcessorMoreTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino b/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino index fc9a65525..496c43141 100644 --- a/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino +++ b/tests/ExtendedZoneProcessorTest/ExtendedZoneProcessorTest.ino @@ -802,7 +802,7 @@ test(ExtendedZoneProcessorTest, setZoneInfo) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/ExtendedZoneProcessorTest/Makefile b/tests/ExtendedZoneProcessorTest/Makefile index ac00518dc..54a9576f9 100644 --- a/tests/ExtendedZoneProcessorTest/Makefile +++ b/tests/ExtendedZoneProcessorTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := ExtendedZoneProcessorTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino b/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino index d4f3af043..2c5d64e3d 100644 --- a/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino +++ b/tests/ExtendedZoneRegistrarTest/ExtendedZoneRegistrarTest.ino @@ -96,7 +96,7 @@ test(ExtendedZoneRegistrarTest, getZoneInfoForId_not_found) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/ExtendedZoneRegistrarTest/Makefile b/tests/ExtendedZoneRegistrarTest/Makefile index 18c0e8539..459f6f7aa 100644 --- a/tests/ExtendedZoneRegistrarTest/Makefile +++ b/tests/ExtendedZoneRegistrarTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := ExtendedZoneRegistrarTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/HardwareTest/HardwareTest.ino b/tests/HardwareTest/HardwareTest.ino index cfa8003e9..a3c2da95b 100644 --- a/tests/HardwareTest/HardwareTest.ino +++ b/tests/HardwareTest/HardwareTest.ino @@ -81,7 +81,7 @@ test(dateTimeEqual) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/HardwareTest/Makefile b/tests/HardwareTest/Makefile index 1d35f52ca..2af23f6ab 100644 --- a/tests/HardwareTest/Makefile +++ b/tests/HardwareTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := HardwareTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/JenkinsfileUnixHost b/tests/JenkinsfileUnixHost index b68fe6481..6de4f86c6 100644 --- a/tests/JenkinsfileUnixHost +++ b/tests/JenkinsfileUnixHost @@ -26,8 +26,8 @@ pipeline { git url: 'https://github.com/bxparks/AceRoutine', branch: 'develop' } - dir('libraries/UnixHostDuino') { - git url: 'https://github.com/bxparks/UnixHostDuino', + dir('libraries/EpoxyDuino') { + git url: 'https://github.com/bxparks/EpoxyDuino', branch: 'develop' } dir('libraries/tz') { diff --git a/tests/LocalDateTest/LocalDateTest.ino b/tests/LocalDateTest/LocalDateTest.ino index 1f422cdc2..383f9b2fd 100644 --- a/tests/LocalDateTest/LocalDateTest.ino +++ b/tests/LocalDateTest/LocalDateTest.ino @@ -443,7 +443,7 @@ test(LocalDateTest, decrementOneDay_error) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/LocalDateTest/Makefile b/tests/LocalDateTest/Makefile index 2bb4d92a9..9b6b59241 100644 --- a/tests/LocalDateTest/Makefile +++ b/tests/LocalDateTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := LocalDateTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/LocalDateTimeTest/LocalDateTimeTest.ino b/tests/LocalDateTimeTest/LocalDateTimeTest.ino index 157f7f44b..46856f5e8 100644 --- a/tests/LocalDateTimeTest/LocalDateTimeTest.ino +++ b/tests/LocalDateTimeTest/LocalDateTimeTest.ino @@ -318,7 +318,7 @@ test(LocalDateTimeTest, printTo) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/LocalDateTimeTest/Makefile b/tests/LocalDateTimeTest/Makefile index 86e9c4d61..e20f61743 100644 --- a/tests/LocalDateTimeTest/Makefile +++ b/tests/LocalDateTimeTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := LocalDateTimeTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/LocalTimeTest/LocalTimeTest.ino b/tests/LocalTimeTest/LocalTimeTest.ino index 078648aaa..98d158ae4 100644 --- a/tests/LocalTimeTest/LocalTimeTest.ino +++ b/tests/LocalTimeTest/LocalTimeTest.ino @@ -100,7 +100,7 @@ test(LocalTimeTest, fortimeString_invalid) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/LocalTimeTest/Makefile b/tests/LocalTimeTest/Makefile index 33653baf9..79c92d73d 100644 --- a/tests/LocalTimeTest/Makefile +++ b/tests/LocalTimeTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := LocalTimeTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/OffsetDateTimeTest/Makefile b/tests/OffsetDateTimeTest/Makefile index 2b3fcf25e..e6e43090d 100644 --- a/tests/OffsetDateTimeTest/Makefile +++ b/tests/OffsetDateTimeTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := OffsetDateTimeTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/OffsetDateTimeTest/OffsetDateTimeTest.ino b/tests/OffsetDateTimeTest/OffsetDateTimeTest.ino index b65357a3c..199710ba5 100644 --- a/tests/OffsetDateTimeTest/OffsetDateTimeTest.ino +++ b/tests/OffsetDateTimeTest/OffsetDateTimeTest.ino @@ -388,7 +388,7 @@ test(OffsetDateTimeTest, forDateString_errors) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/README.md b/tests/README.md index 67dc0b19d..06075730b 100644 --- a/tests/README.md +++ b/tests/README.md @@ -3,7 +3,7 @@ You can run most of these unit tests on an Arduino board (tested on Nano, Pro Micro, SAMD21, ESP8266 and ESP32). But it is often far faster to run them on a Linux or MacOS machine using -[UnixHostDuino](https://github.com/bxparks/UnixHostDuino). +[EpoxyDuino](https://github.com/bxparks/EpoxyDuino). ## Running Tests on Linux or MacOS @@ -20,9 +20,9 @@ them on a Linux or MacOS machine using 1. Install [AUnit](https://github.com/bxparks/AUnit) as a sibling project to AceTime. * `$ (cd ../../..; git clone https://github.com/bxparks/AUnit)` -1. Install [UnixHostDuino](https://github.com/bxparks/UnixHostDuino) as a +1. Install [EpoxyDuino](https://github.com/bxparks/EpoxyDuino) as a sibling to AceTime - * `$ (cd ../../..; git clone https://github.com/bxparks/UnixHostDuino)` + * `$ (cd ../../..; git clone https://github.com/bxparks/EpoxyDuino)` Compile the unit test programs using the following `make` commands (or run the equivalent one-line shell commands shown in the `Makefile`): diff --git a/tests/SystemClockTest/Makefile b/tests/SystemClockTest/Makefile index 784eac484..c4ce91bd4 100644 --- a/tests/SystemClockTest/Makefile +++ b/tests/SystemClockTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := SystemClockTest ARDUINO_LIBS := AUnit AceCommon AceTime AceRoutine -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/SystemClockTest/SystemClockTest.ino b/tests/SystemClockTest/SystemClockTest.ino index c0dfbc087..1c3455876 100644 --- a/tests/SystemClockTest/SystemClockTest.ino +++ b/tests/SystemClockTest/SystemClockTest.ino @@ -294,7 +294,7 @@ testF(SystemClockCoroutineTest, runCoroutine) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/TimeOffsetTest/Makefile b/tests/TimeOffsetTest/Makefile index d8916f921..ea925ecf4 100644 --- a/tests/TimeOffsetTest/Makefile +++ b/tests/TimeOffsetTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := TimeOffsetTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/TimeOffsetTest/TimeOffsetTest.ino b/tests/TimeOffsetTest/TimeOffsetTest.ino index 2d67bd23f..77d5f9236 100644 --- a/tests/TimeOffsetTest/TimeOffsetTest.ino +++ b/tests/TimeOffsetTest/TimeOffsetTest.ino @@ -141,7 +141,7 @@ test(TimeOffsetMutationTest, increment15Minutes) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/TimePeriodTest/Makefile b/tests/TimePeriodTest/Makefile index e70193697..e8de623d4 100644 --- a/tests/TimePeriodTest/Makefile +++ b/tests/TimePeriodTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := TimePeriodTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/TimePeriodTest/TimePeriodTest.ino b/tests/TimePeriodTest/TimePeriodTest.ino index ceedf1699..fe13e5ecb 100644 --- a/tests/TimePeriodTest/TimePeriodTest.ino +++ b/tests/TimePeriodTest/TimePeriodTest.ino @@ -122,7 +122,7 @@ test(TimePeriodTest, tooLargeOrSmall) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/TimeZoneExtendedTest/Makefile b/tests/TimeZoneExtendedTest/Makefile index b4d840c6e..35701a699 100644 --- a/tests/TimeZoneExtendedTest/Makefile +++ b/tests/TimeZoneExtendedTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := TimeZoneExtendedTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/TimeZoneExtendedTest/TimeZoneExtendedTest.ino b/tests/TimeZoneExtendedTest/TimeZoneExtendedTest.ino index 1a498f11f..11250d351 100644 --- a/tests/TimeZoneExtendedTest/TimeZoneExtendedTest.ino +++ b/tests/TimeZoneExtendedTest/TimeZoneExtendedTest.ino @@ -66,7 +66,7 @@ test(TimeZoneExtendedTest, Los_Angeles) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/TimeZoneMoreTest/Makefile b/tests/TimeZoneMoreTest/Makefile index 17bd4af5a..179f4bae3 100644 --- a/tests/TimeZoneMoreTest/Makefile +++ b/tests/TimeZoneMoreTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := TimeZoneMoreTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/TimeZoneMoreTest/TimeZoneMoreTest.ino b/tests/TimeZoneMoreTest/TimeZoneMoreTest.ino index cd7cb1858..ad0ad43ad 100644 --- a/tests/TimeZoneMoreTest/TimeZoneMoreTest.ino +++ b/tests/TimeZoneMoreTest/TimeZoneMoreTest.ino @@ -44,7 +44,7 @@ test(TimeZoneMoreTest, operatorEqualEqual_directZone) { // -------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/TimeZoneTest/Makefile b/tests/TimeZoneTest/Makefile index 56173aa3b..d95c57232 100644 --- a/tests/TimeZoneTest/Makefile +++ b/tests/TimeZoneTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := TimeZoneTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/TimeZoneTest/TimeZoneTest.ino b/tests/TimeZoneTest/TimeZoneTest.ino index 582c6e9a4..2fe7f8f7e 100644 --- a/tests/TimeZoneTest/TimeZoneTest.ino +++ b/tests/TimeZoneTest/TimeZoneTest.ino @@ -455,7 +455,7 @@ test(TimeZoneExtendedTest, operatorEqualEqual_managedZones) { // -------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/TransitionStorageTest/Makefile b/tests/TransitionStorageTest/Makefile index 77c1c1cc6..04498953d 100644 --- a/tests/TransitionStorageTest/Makefile +++ b/tests/TransitionStorageTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := TransitionStorageTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/TransitionStorageTest/TransitionStorageTest.ino b/tests/TransitionStorageTest/TransitionStorageTest.ino index 39585247d..adcb7ac20 100644 --- a/tests/TransitionStorageTest/TransitionStorageTest.ino +++ b/tests/TransitionStorageTest/TransitionStorageTest.ino @@ -341,7 +341,7 @@ test(TransitionStorageTest, resetCandidatePool) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/TzDbTest/Makefile b/tests/TzDbTest/Makefile index 6d3378c2b..d96d1d45f 100644 --- a/tests/TzDbTest/Makefile +++ b/tests/TzDbTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := TzDbTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/TzDbTest/TzDbTest.ino b/tests/TzDbTest/TzDbTest.ino index a6d3c2260..30cf6e55f 100644 --- a/tests/TzDbTest/TzDbTest.ino +++ b/tests/TzDbTest/TzDbTest.ino @@ -100,7 +100,7 @@ test(ZonedDateTimeExtendedTest, Yukon2020) { // -------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/UnixTimeTest/Makefile b/tests/UnixTimeTest/Makefile index e3b7feb8a..8d1591459 100644 --- a/tests/UnixTimeTest/Makefile +++ b/tests/UnixTimeTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := UnixTimeTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/UnixTimeTest/UnixTimeTest.ino b/tests/UnixTimeTest/UnixTimeTest.ino index 1a62b9e90..787eb34bc 100644 --- a/tests/UnixTimeTest/UnixTimeTest.ino +++ b/tests/UnixTimeTest/UnixTimeTest.ino @@ -106,7 +106,7 @@ test(UnixTimeTest, forEpochSeconds) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/ZoneProcessorCacheTest/Makefile b/tests/ZoneProcessorCacheTest/Makefile index f0908a202..df53c60dd 100644 --- a/tests/ZoneProcessorCacheTest/Makefile +++ b/tests/ZoneProcessorCacheTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := ZoneProcessorCacheTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/ZoneProcessorCacheTest/ZoneProcessorCacheTest.ino b/tests/ZoneProcessorCacheTest/ZoneProcessorCacheTest.ino index 581345107..6c79b0879 100644 --- a/tests/ZoneProcessorCacheTest/ZoneProcessorCacheTest.ino +++ b/tests/ZoneProcessorCacheTest/ZoneProcessorCacheTest.ino @@ -57,7 +57,7 @@ test(ExtendedZoneProcessorCacheTest, getZoneProcessor) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/ZonedDateTimeBasicTest/Makefile b/tests/ZonedDateTimeBasicTest/Makefile index a5d85af80..359121a98 100644 --- a/tests/ZonedDateTimeBasicTest/Makefile +++ b/tests/ZonedDateTimeBasicTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := ZonedDateTimeBasicTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/ZonedDateTimeBasicTest/ZonedDateTimeBasicTest.ino b/tests/ZonedDateTimeBasicTest/ZonedDateTimeBasicTest.ino index 938cd3248..0d9040065 100644 --- a/tests/ZonedDateTimeBasicTest/ZonedDateTimeBasicTest.ino +++ b/tests/ZonedDateTimeBasicTest/ZonedDateTimeBasicTest.ino @@ -139,7 +139,7 @@ test(ZonedDateTimeBasicTest, linked_zones) { // -------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/ZonedDateTimeExtendedTest/Makefile b/tests/ZonedDateTimeExtendedTest/Makefile index 02d518375..49cc1a741 100644 --- a/tests/ZonedDateTimeExtendedTest/Makefile +++ b/tests/ZonedDateTimeExtendedTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := ZonedDateTimeExtendedTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/ZonedDateTimeExtendedTest/ZonedDateTimeExtendedTest.ino b/tests/ZonedDateTimeExtendedTest/ZonedDateTimeExtendedTest.ino index 7d807b457..b70ecac78 100644 --- a/tests/ZonedDateTimeExtendedTest/ZonedDateTimeExtendedTest.ino +++ b/tests/ZonedDateTimeExtendedTest/ZonedDateTimeExtendedTest.ino @@ -140,7 +140,7 @@ test(ZonedDateTimeExtendedTest, linked_zones) { // -------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/ZonedDateTimeTest/Makefile b/tests/ZonedDateTimeTest/Makefile index 8b73fb4e9..910f3116b 100644 --- a/tests/ZonedDateTimeTest/Makefile +++ b/tests/ZonedDateTimeTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := ZonedDateTimeTest ARDUINO_LIBS := AUnit AceCommon AceTime -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/ZonedDateTimeTest/ZonedDateTimeTest.ino b/tests/ZonedDateTimeTest/ZonedDateTimeTest.ino index 8f1d1ee99..cc8f3dd95 100644 --- a/tests/ZonedDateTimeTest/ZonedDateTimeTest.ino +++ b/tests/ZonedDateTimeTest/ZonedDateTimeTest.ino @@ -304,7 +304,7 @@ test(DateTimeMutationTest, increment) { //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/validation/BasicDateUtilTest/BasicDateUtilTest.ino b/tests/validation/BasicDateUtilTest/BasicDateUtilTest.ino index d77a5b357..a0ec99bf0 100644 --- a/tests/validation/BasicDateUtilTest/BasicDateUtilTest.ino +++ b/tests/validation/BasicDateUtilTest/BasicDateUtilTest.ino @@ -15,7 +15,7 @@ using namespace ace_time; //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/validation/BasicDateUtilTest/Makefile b/tests/validation/BasicDateUtilTest/Makefile index 84823e961..569420a44 100644 --- a/tests/validation/BasicDateUtilTest/Makefile +++ b/tests/validation/BasicDateUtilTest/Makefile @@ -1,4 +1,4 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. DB_NAMESPACE := zonedbdateutil @@ -21,7 +21,7 @@ OBJS := validation_data.o \ APP_NAME := BasicDateUtilTest ARDUINO_LIBS := AUnit AceCommon AceTime MORE_CLEAN := more_clean -include ../../../../UnixHostDuino/UnixHostDuino.mk +include ../../../../EpoxyDuino/EpoxyDuino.mk #.PHONY: $(GENERATED) diff --git a/tests/validation/BasicDateUtilTest/README.md b/tests/validation/BasicDateUtilTest/README.md index 99686560c..5e0dd4fcf 100644 --- a/tests/validation/BasicDateUtilTest/README.md +++ b/tests/validation/BasicDateUtilTest/README.md @@ -12,7 +12,7 @@ The Python tool generates about 130,000 data points spanning the year 2000 to the ESP32. The unit test does run on a Linux machine using the -[UnixHostDuino](https://github.com/bxparks/UnixHostDuino) adapter layer. +[EpoxyDuino](https://github.com/bxparks/EpoxyDuino) adapter layer. Assuming that you have `g++` and `make` installed, just type: ``` diff --git a/tests/validation/BasicHinnantDateTest/BasicHinnantDateTest.ino b/tests/validation/BasicHinnantDateTest/BasicHinnantDateTest.ino index 067fb2b0d..859bf7084 100644 --- a/tests/validation/BasicHinnantDateTest/BasicHinnantDateTest.ino +++ b/tests/validation/BasicHinnantDateTest/BasicHinnantDateTest.ino @@ -15,7 +15,7 @@ using namespace ace_time; //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/validation/BasicHinnantDateTest/Makefile b/tests/validation/BasicHinnantDateTest/Makefile index 7287e0ad3..842db5b0d 100644 --- a/tests/validation/BasicHinnantDateTest/Makefile +++ b/tests/validation/BasicHinnantDateTest/Makefile @@ -1,4 +1,4 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. DB_NAMESPACE := zonedbhd @@ -21,7 +21,7 @@ OBJS := validation_data.o \ APP_NAME := BasicHinnantDateTest ARDUINO_LIBS := AUnit AceCommon AceTime MORE_CLEAN := more_clean -include ../../../../UnixHostDuino/UnixHostDuino.mk +include ../../../../EpoxyDuino/EpoxyDuino.mk #.PHONY: $(GENERATED) diff --git a/tests/validation/BasicJavaTest/BasicJavaTest.ino b/tests/validation/BasicJavaTest/BasicJavaTest.ino index 4e4d3aa6a..53dede379 100644 --- a/tests/validation/BasicJavaTest/BasicJavaTest.ino +++ b/tests/validation/BasicJavaTest/BasicJavaTest.ino @@ -15,7 +15,7 @@ using namespace ace_time; //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/validation/BasicJavaTest/Makefile b/tests/validation/BasicJavaTest/Makefile index cbd5207d3..fab06f0e4 100644 --- a/tests/validation/BasicJavaTest/Makefile +++ b/tests/validation/BasicJavaTest/Makefile @@ -1,4 +1,4 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. DB_NAMESPACE := zonedbjava @@ -21,7 +21,7 @@ OBJS := validation_data.o \ APP_NAME := BasicJavaTest ARDUINO_LIBS := AUnit AceCommon AceTime MORE_CLEAN := more_clean -include ../../../../UnixHostDuino/UnixHostDuino.mk +include ../../../../EpoxyDuino/EpoxyDuino.mk #.PHONY: $(GENERATED) diff --git a/tests/validation/BasicJavaTest/README.md b/tests/validation/BasicJavaTest/README.md index 4a1ca08df..1193fd6a1 100644 --- a/tests/validation/BasicJavaTest/README.md +++ b/tests/validation/BasicJavaTest/README.md @@ -10,7 +10,7 @@ This unit test compares the DST transitions calculated by the The Java tool generates about 130,000 data points spanning the year 2000 to 2050. It is too large to run on any Arduino board that I am aware of, including the ESP32. However it does run on a Linux machine using the -[UnixHostDuino](https://github.com/bxparks/UnixHostDuino) adapter layer. +[EpoxyDuino](https://github.com/bxparks/EpoxyDuino) adapter layer. Assuming that you have `g++` and `make` installed, just type: ``` diff --git a/tests/validation/BasicPythonTest/BasicPythonTest.ino b/tests/validation/BasicPythonTest/BasicPythonTest.ino index 69994f75e..463fa89e9 100644 --- a/tests/validation/BasicPythonTest/BasicPythonTest.ino +++ b/tests/validation/BasicPythonTest/BasicPythonTest.ino @@ -15,7 +15,7 @@ using namespace ace_time; //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/validation/BasicPythonTest/Makefile b/tests/validation/BasicPythonTest/Makefile index 624bcf358..1b1bab5a8 100644 --- a/tests/validation/BasicPythonTest/Makefile +++ b/tests/validation/BasicPythonTest/Makefile @@ -1,4 +1,4 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. DB_NAMESPACE := zonedbpytz @@ -21,7 +21,7 @@ OBJS := validation_data.o \ APP_NAME := BasicPythonTest ARDUINO_LIBS := AUnit AceCommon AceTime MORE_CLEAN := more_clean -include ../../../../UnixHostDuino/UnixHostDuino.mk +include ../../../../EpoxyDuino/EpoxyDuino.mk runtests: ./$(APP_NAME).out diff --git a/tests/validation/BasicPythonTest/README.md b/tests/validation/BasicPythonTest/README.md index 5fb0cd997..b49cdb287 100644 --- a/tests/validation/BasicPythonTest/README.md +++ b/tests/validation/BasicPythonTest/README.md @@ -12,7 +12,7 @@ The Python tool generates about 130,000 data points spanning the year 2000 to the ESP32. The unit test does run on a Linux machine using the -[UnixHostDuino](https://github.com/bxparks/UnixHostDuino) adapter layer. +[EpoxyDuino](https://github.com/bxparks/EpoxyDuino) adapter layer. Assuming that you have `g++` and `make` installed, just type: ``` diff --git a/tests/validation/ExtendedDateUtilTest/ExtendedDateUtilTest.ino b/tests/validation/ExtendedDateUtilTest/ExtendedDateUtilTest.ino index f1822e9af..b89f6349a 100644 --- a/tests/validation/ExtendedDateUtilTest/ExtendedDateUtilTest.ino +++ b/tests/validation/ExtendedDateUtilTest/ExtendedDateUtilTest.ino @@ -15,7 +15,7 @@ using namespace ace_time; //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/validation/ExtendedDateUtilTest/Makefile b/tests/validation/ExtendedDateUtilTest/Makefile index f588256b9..0c8006151 100644 --- a/tests/validation/ExtendedDateUtilTest/Makefile +++ b/tests/validation/ExtendedDateUtilTest/Makefile @@ -1,4 +1,4 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. DB_NAMESPACE := zonedbxdateutil @@ -21,7 +21,7 @@ OBJS := validation_data.o \ APP_NAME := ExtendedDateUtilTest ARDUINO_LIBS := AUnit AceCommon AceTime MORE_CLEAN := more_clean -include ../../../../UnixHostDuino/UnixHostDuino.mk +include ../../../../EpoxyDuino/EpoxyDuino.mk #.PHONY: $(GENERATED) diff --git a/tests/validation/ExtendedDateUtilTest/README.md b/tests/validation/ExtendedDateUtilTest/README.md index a4116f622..3c621f9ea 100644 --- a/tests/validation/ExtendedDateUtilTest/README.md +++ b/tests/validation/ExtendedDateUtilTest/README.md @@ -12,7 +12,7 @@ The Python tool generates about 130,000 data points spanning the year 2000 to the ESP32. The unit test does run on a Linux machine using the -[UnixHostDuino](https://github.com/bxparks/UnixHostDuino) adapter layer. +[EpoxyDuino](https://github.com/bxparks/EpoxyDuino) adapter layer. Assuming that you have `g++` and `make` installed, just type: ``` diff --git a/tests/validation/ExtendedHinnantDateTest/ExtendedHinnantDateTest.ino b/tests/validation/ExtendedHinnantDateTest/ExtendedHinnantDateTest.ino index 227022b32..0880d812e 100644 --- a/tests/validation/ExtendedHinnantDateTest/ExtendedHinnantDateTest.ino +++ b/tests/validation/ExtendedHinnantDateTest/ExtendedHinnantDateTest.ino @@ -15,7 +15,7 @@ using namespace ace_time; //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/validation/ExtendedHinnantDateTest/Makefile b/tests/validation/ExtendedHinnantDateTest/Makefile index 4f14cd5a4..2895eb391 100644 --- a/tests/validation/ExtendedHinnantDateTest/Makefile +++ b/tests/validation/ExtendedHinnantDateTest/Makefile @@ -1,4 +1,4 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. DB_NAMESPACE := zonedbxhd @@ -21,7 +21,7 @@ OBJS := validation_data.o \ APP_NAME := ExtendedHinnantDateTest ARDUINO_LIBS := AUnit AceCommon AceTime MORE_CLEAN := more_clean -include ../../../../UnixHostDuino/UnixHostDuino.mk +include ../../../../EpoxyDuino/EpoxyDuino.mk #.PHONY: $(GENERATED) diff --git a/tests/validation/ExtendedJavaTest/ExtendedJavaTest.ino b/tests/validation/ExtendedJavaTest/ExtendedJavaTest.ino index 2e706a75d..fd81e3383 100644 --- a/tests/validation/ExtendedJavaTest/ExtendedJavaTest.ino +++ b/tests/validation/ExtendedJavaTest/ExtendedJavaTest.ino @@ -15,7 +15,7 @@ using namespace ace_time; //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/validation/ExtendedJavaTest/Makefile b/tests/validation/ExtendedJavaTest/Makefile index 9c6adcd5d..54653f86d 100644 --- a/tests/validation/ExtendedJavaTest/Makefile +++ b/tests/validation/ExtendedJavaTest/Makefile @@ -1,4 +1,4 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. DB_NAMESPACE := zonedbxjava @@ -21,7 +21,7 @@ OBJS := validation_data.o \ APP_NAME := ExtendedJavaTest ARDUINO_LIBS := AUnit AceCommon AceTime MORE_CLEAN := more_clean -include ../../../../UnixHostDuino/UnixHostDuino.mk +include ../../../../EpoxyDuino/EpoxyDuino.mk #.PHONY: $(GENERATED) diff --git a/tests/validation/ExtendedJavaTest/README.md b/tests/validation/ExtendedJavaTest/README.md index 61e677c36..633534c23 100644 --- a/tests/validation/ExtendedJavaTest/README.md +++ b/tests/validation/ExtendedJavaTest/README.md @@ -10,7 +10,7 @@ This unit test compares the DST transitions calculated by the The Java program generates about 260,000 data points spanning the year 2000 to 2050. It is too large to run on any Arduino board that I am aware of, including the ESP32. However it does run on a Linux machine using the -[UnixHostDuino](https://github.com/bxparks/UnixHostDuino) adapter layer. +[EpoxyDuino](https://github.com/bxparks/EpoxyDuino) adapter layer. Assuming that you have `g++` and `make` installed, just type: ``` diff --git a/tests/validation/ExtendedPythonTest/ExtendedPythonTest.ino b/tests/validation/ExtendedPythonTest/ExtendedPythonTest.ino index 4c8aa2e65..a3ece3057 100644 --- a/tests/validation/ExtendedPythonTest/ExtendedPythonTest.ino +++ b/tests/validation/ExtendedPythonTest/ExtendedPythonTest.ino @@ -15,7 +15,7 @@ using namespace ace_time; //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); // wait to prevent garbage on SERIAL_PORT_MONITOR #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/tests/validation/ExtendedPythonTest/Makefile b/tests/validation/ExtendedPythonTest/Makefile index 72b7a0ace..eeedd6061 100644 --- a/tests/validation/ExtendedPythonTest/Makefile +++ b/tests/validation/ExtendedPythonTest/Makefile @@ -1,4 +1,4 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. DB_NAMESPACE := zonedbxpytz @@ -21,7 +21,7 @@ OBJS := validation_data.o \ APP_NAME := ExtendedPythonTest ARDUINO_LIBS := AUnit AceCommon AceTime MORE_CLEAN := more_clean -include ../../../../UnixHostDuino/UnixHostDuino.mk +include ../../../../EpoxyDuino/EpoxyDuino.mk runtests: ./$(APP_NAME).out diff --git a/tests/validation/ExtendedPythonTest/README.md b/tests/validation/ExtendedPythonTest/README.md index 5abf403af..1b230d6bc 100644 --- a/tests/validation/ExtendedPythonTest/README.md +++ b/tests/validation/ExtendedPythonTest/README.md @@ -12,7 +12,7 @@ The Python tool generates about 200,000 data points spanning the year 2000 to the ESP32. The unit test does run on a Linux machine using the -[UnixHostDuino](https://github.com/bxparks/UnixHostDuino) adapter layer. +[EpoxyDuino](https://github.com/bxparks/EpoxyDuino) adapter layer. Assuming that you have `g++` and `make` installed, just type: ``` diff --git a/tests/validation/README.md b/tests/validation/README.md index 6c6af0118..f670b3b34 100644 --- a/tests/validation/README.md +++ b/tests/validation/README.md @@ -11,7 +11,7 @@ other libraries: These unit tests require a desktop-class machine running Linux or MacOS. They are too big to run on any Arduino microcontroller that I know of. They use the -[UnixHostDuino](https://github.com/bxparks/UnixHostDuino) emulation layer to run +[EpoxyDuino](https://github.com/bxparks/EpoxyDuino) emulation layer to run these programs on the desktop machine. They also use various files (e.g. `validation_data.h`, `validation_data.cpp`, `validation_tests.cpp`) which are *generated* dynamically by the various `Makefile` files. (These files used to be @@ -34,8 +34,8 @@ The various `Makefile` files under the subdirectories here will run `make -C` in those directories to build the Java and C++ binaries as necessary. Here is a (potentially out of date) summary of the 3rd party prerequisites: -1. Install UnixHostDuino as a sibling project to `AceTime`: - * `$ git clone https://github.com/bxparks/UnixHostDuino` +1. Install EpoxyDuino as a sibling project to `AceTime`: + * `$ git clone https://github.com/bxparks/EpoxyDuino` 1. Clone the IANA TZ database as a sibling project to `AceTime`: * `$ git clone https://github.com/eggert/tz` 1. Install the Python `pytz` and `dateutil` libraries: From 0da2291d84d9e16b98291143a2d19353af557edb Mon Sep 17 00:00:00 2001 From: Brian Park Date: Fri, 22 Jan 2021 13:40:26 -0800 Subject: [PATCH 60/74] github/workflows: Rename UnixHostDuino to EpoxyDuino --- .github/workflows/validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index dc3a448b9..ac8e04c95 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -26,7 +26,7 @@ jobs: - name: Checkout 3rd Party Repos run: | cd .. - git clone https://github.com/bxparks/UnixHostDuino + git clone https://github.com/bxparks/EpoxyDuino git clone https://github.com/bxparks/AUnit git clone https://github.com/bxparks/AceCommon git clone https://github.com/eggert/tz From dafe0dbf1e49cb4293480003ee9f9152cb7b12a6 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 25 Jan 2021 10:51:17 -0800 Subject: [PATCH 61/74] src/AceTime.h,compat.h: Blacklist megaAVR and arduino:samd>=1.8.10; enable additional 3rd party cores with a #warning using reasonable defaults --- src/AceTime.h | 9 +++++++++ src/ace_time/common/compat.h | 21 ++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/AceTime.h b/src/AceTime.h index a4b2f2f27..ad417d6fb 100644 --- a/src/AceTime.h +++ b/src/AceTime.h @@ -17,6 +17,15 @@ #ifndef ACE_TIME_ACE_TIME_H #define ACE_TIME_ACE_TIME_H +// Blacklist boards using new Arduino API due to incompatibilities. This +// currently includes all megaAVR boards and SAMD21 boards using arduino::samd +// >= 1.8.10. Boards using arduino:samd <= 1.8.9 or SparkFun:samd are fine. +#if defined(ARDUINO_ARCH_MEGAAVR) +#error MegaAVR not supported, https://github.com/bxparks/AceTime/issues/44 +#elif defined(ARDUINO_ARCH_SAMD) && defined(ARDUINO_API_VERSION) +#error SAMD21 with arduino:samd >= 1.8.10 not supported, https://github.com/bxparks/AceTime/issues/45 +#endif + #include "ace_time/common/compat.h" #include "ace_time/common/common.h" #include "ace_time/common/DateStrings.h" diff --git a/src/ace_time/common/compat.h b/src/ace_time/common/compat.h index fbe15a94d..5a0179db8 100644 --- a/src/ace_time/common/compat.h +++ b/src/ace_time/common/compat.h @@ -60,9 +60,6 @@ #define SERIAL_PORT_MONITOR Serial #endif -#elif defined(EPOXY_DUINO) - #include - #elif defined(ARDUINO_ARCH_STM32) #include #define FPSTR(p) (reinterpret_cast(p)) @@ -70,8 +67,22 @@ #undef SERIAL_PORT_MONITOR #define SERIAL_PORT_MONITOR Serial +#elif defined(EPOXY_DUINO) + #include + #else - #error Unsupported platform -#endif + #warning Untested platform. AceTime may still work... + + #include + + #if ! defined(FPSTR) + #define FPSTR(p) (reinterpret_cast(p)) + #endif + + #if ! defined(SERIAL_PORT_MONITOR) + #define SERIAL_PORT_MONITOR Serial + #endif #endif + +#endif // ACE_TIME_COMMON_COMPAT_H From f1189ff2641b941b91eda2172172ab9167aa1fdd Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 25 Jan 2021 10:52:55 -0800 Subject: [PATCH 62/74] README.md: Update supported Hardware section; reorg for consistency with my other README.md files --- README.md | 56 ++++++++++++++++++++++++++++++++++----------------- USER_GUIDE.md | 2 +- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index aa9e563ca..288076f2d 100644 --- a/README.md +++ b/README.md @@ -152,7 +152,7 @@ dataset instead of using `zonedb::` and `zonedbx::` zone files provided in this library. It is expected that most applications using AceTime will use only a small number -of timezones at the same time (1 to 3 zones have been extensively tested) and +of timezones at the same time (1 to 4 zones have been extensively tested) and that this set is known at compile-time. The C++ compiler will include only the subset of zoneinfo files needed to support those timezones, instead of compiling in the entire TZ Database. But on microcontrollers with enough memory, the @@ -243,9 +243,9 @@ library for some of its low-level routines. See the * [WorldClock](#WorldClock) * [Documentation](#Documentation) * [System Requirements](#SystemRequirements) + * [Hardware](#Hardware) * [Tool Chain](#ToolChain) * [Operating System](#OperatingSystem) - * [Hardware](#Hardware) * [License](#License) * [Feedback and Support](#Feedback) * [Authors](#Authors) @@ -517,20 +517,51 @@ for all 3 zones: ## System Requirements + +### Hardware + +The library is tested on the following boards: + +* Arduino Nano clone (16 MHz ATmega328P) +* SparkFun Pro Micro clone (16 MHz ATmega32U4) +* SAMD21 M0 Mini (48 MHz ARM Cortex-M0+) +* STM32 Blue Pill (STM32F103C8, 72 MHz ARM Cortex-M3) +* NodeMCU 1.0 (ESP-12E module, 80 MHz ESP8266) +* WeMos D1 Mini (ESP-12E module, 80 MHz ESP8266) +* ESP32 dev board (ESP-WROOM-32 module, 240 MHz dual core Tensilica LX6) +* Teensy 3.2 (96 MHz ARM Cortex-M4) + +I will occasionally test on the following hardware as a sanity check: + +* Mini Mega 2560 (Arduino Mega 2560 compatible, 16 MHz ATmega2560) +* Teensy LC (48 MHz ARM Cortex-M0+) + +The following boards are *not* supported: + +* megaAVR (e.g. Nano Every) +* SAMD21 boards w/ `arduino:samd` version >= 1.8.10 (e.g. MKRZero) + ### Tool Chain This library was developed and tested using: * [Arduino IDE 1.8.13](https://www.arduino.cc/en/Main/Software) +* [Arduino CLI 0.14.0](https://arduino.github.io/arduino-cli) * [Arduino AVR Boards 1.8.3](https://github.com/arduino/ArduinoCore-avr) * [Arduino SAMD Boards 1.8.9](https://github.com/arduino/ArduinoCore-samd) * [SparkFun AVR Boards 1.1.13](https://github.com/sparkfun/Arduino_Boards) * [SparkFun SAMD Boards 1.8.1](https://github.com/sparkfun/Arduino_Boards) +* [STM32duino 1.9.0](https://github.com/stm32duino/Arduino_Core_STM32) * [ESP8266 Arduino 2.7.4](https://github.com/esp8266/Arduino) * [ESP32 Arduino 1.0.4](https://github.com/espressif/arduino-esp32) * [Teensydino 1.53](https://www.pjrc.com/teensy/td_download.html) +This library is *not* compatible with: +* [Arduino megaAVR](https://github.com/arduino/ArduinoCore-megaavr/) +* [MegaCoreX](https://github.com/MCUdude/MegaCoreX) +* [Arduino SAMD Boards >=1.8.10](https://github.com/arduino/ArduinoCore-samd) + It should work with [PlatformIO](https://platformio.org/) but I have not tested it. @@ -544,23 +575,6 @@ I use Ubuntu 18.04 and 20.04 for the vast majority of my development. I expect that the library will work fine under MacOS and Windows, but I have not tested them. - -### Hardware - -The library is extensively tested on the following boards: - -* Arduino Nano clone (16 MHz ATmega328P) -* SparkFun Pro Micro clone (16 MHz ATmega32U4) -* WeMos D1 Mini clone (ESP-12E module, 80 MHz ESP8266) -* ESP32 dev board (ESP-WROOM-32 module, 240 MHz dual core Tensilica LX6) -* SAMD21 M0 Mini (48 MHz ARM Cortex-M0+) (compatible with Arduino Zero) (See - notes in the [USER_GUIDE.md](USER_GUIDE.md) for some potential issues.) - -I will occasionally test on the following hardware as a sanity check: - -* Teensy 3.2 (72 MHz ARM Cortex-M4) -* Mini Mega 2560 (Arduino Mega 2560 compatible, 16 MHz ATmega2560) - ## License @@ -569,6 +583,10 @@ I will occasionally test on the following hardware as a sanity check: ## Feedback and Support +If you find this library useful, consider starring this project on GitHub. The +stars will let me prioritize the more popular libraries over the less popular +ones. + If you have any questions, comments, bug reports, or feature requests, please file a GitHub ticket instead of emailing me unless the content is sensitive. (The problem with email is that I cannot reference the email conversation when diff --git a/USER_GUIDE.md b/USER_GUIDE.md index 30ad2be34..abf172086 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -243,7 +243,7 @@ released (several times a year), I can regenerate the zone files, recompile the application, and it will instantly use the new transition rules, without the developer needing to create a new POSIX string. To address the memory constraint problem, the AceTime library is designed to load only of the smallest subset of -the TZ Database that is required to support the selected timezones (1 to 3 have +the TZ Database that is required to support the selected timezones (1 to 4 have been extensively tested). Dynamic lookup of the time zone is possible using the `ZoneManager`, and the app develop can customize it with the list of zones that are compiled into the app. On microcontrollers with more than about 32kB of From 308f81a1cf90cd1637baa3d2d677ebaf851e84ff Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 25 Jan 2021 13:10:31 -0800 Subject: [PATCH 63/74] USER_GUIDE.md: Add 'Zones and Links' subsection to explain fat links in v1.5 --- CHANGELOG.md | 74 ++++++++++++++++++++-------------- USER_GUIDE.md | 109 ++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 144 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b9768ef7..349f0f99f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,43 +2,55 @@ * Unreleased * Use binary search for both `ZoneManager::createForZoneName()` and - `ZoneManager::createForZoneId()`. Previously, the `zone_registry.cpp` was - sorted by zoneName, so only the `createForZoneName()` could use the binary - search. The new solution sorts the `zone_registry.cpp` entries by `zoneId` - instead of `zoneName`. The `createForZoneId()` can use the binary search - algorith. The `createForZoneName()` can also use the binary search because - the `zoneName` is converted dynamically to its `zoneId` using the same - djb2 hash algorithm used by the `tzcompiler.py`. If there is a match, a - final verification against the exact `zoneName` is performed to make sure - that there was no hash collision. Updated `AutoBenchmark.ino` to determine - that a binary search on the 386 zones in `zonedbx/zone_registry.cpp` is - 9-10X faster (on average) than a linear search through the same list. - (Linear search takes ~190 iterations; binary search takes ~9 iterations.) - * Upgrade Link entries to be "fat links". Links become essentially identical - to Zone entries, with references to the same underlying `ZoneEra` records. - Add `kZoneAndLinkRegistry[]` array in `zone_registry.h` that contains all - Links as well as Zones. - * Implement zoneName compression using `ace_common::KString`. Saves about - 1500-2300 bytes for basic `zonedb` info files, and 2500-3400 bytes for - extended `zonedbx` info files. + `ZoneManager::createForZoneId()`. + * Previously, the `zone_registry.cpp` was sorted by zoneName, so only + the `createForZoneName()` could use the binary search. The new + solution sorts the `zone_registry.cpp` entries by `zoneId` instead of + `zoneName`. The `createForZoneId()` can use the binary search + algorith. + * The `createForZoneName()` can also use the binary search because + the `zoneName` is converted dynamically to its `zoneId` using the same + djb2 hash algorithm used by the `tzcompiler.py`. If there is a match, + a final verification against the exact `zoneName` is performed to make + sure that there was no hash collision. + * Updated `AutoBenchmark.ino` to determine that a binary search on the + 386 zones in `zonedbx/zone_registry.cpp` is 9-10X faster (on average) + than a linear search through the same list. (Linear search takes ~190 + iterations; binary search takes ~9 iterations.) + * Upgrade Link entries to be "fat links". + * Links become essentially identical to Zone entries, with references to + the same underlying `ZoneEra` records. + * Add `kZoneAndLinkRegistry[]` array in `zone_registry.h` that contains + all Links as well as Zones. + * Add "Zones and Links" section in `USER_GUIDE.md`. + * Implement zoneName compression using `ace_common::KString`. + * Saves about 1500-2300 bytes for basic `zonedb` info files, and + 2500-3400 bytes for extended `zonedbx` info files. * **Potentially Breaking Change**: Remove `transitionBufSize` from `ZoneInfo` struct, and migrate to `kZoneBufSize{xxx}` constants in the - `zone_infos.h` files. This was used only in validation tests under - `tests/validation` and only for `Extended{xxx}` tests. Saves 1 byte per - Zone on 8-bit processors, but none on 32-bit processors due to 4-byte - alignment. This has no impact on client code since this field was used - only for validation testing. + `zone_infos.h` files. + * This was used only in validation tests under `tests/validation` and + only for `Extended{xxx}` tests. Saves 1 byte per Zone on 8-bit + processors, but none on 32-bit processors due to 4-byte alignment. + * This should have no impact on client code since this field was used + only for validation testing. * **API Breaking Change**: Replace `BasicZone::name()` and `shortName() with `printNameTo()` and `printShortNameTo()`. Same with `ExtendedZone::name()` and `shortName()`, replaced with `printNameTo()` - and `printShortNameTo()`. After implementing zoneName compression, it was - no longer possible to return a simple pointer to the `name` and - `shortName` without using static memory buffers. I expect almost no one to - be using the `BasicZone` and `ExtendedZone` classes, since they are mostly - useful for internal algorithms. Client code that needs the old - functionality can print to a `ace_common::PrintStr<>` object, then extract - the c-string using `PrintStr::getCstr()`. + and `printShortNameTo()`. + * After implementing zoneName compression, it was no longer possible to + return a simple pointer to the `name` and `shortName` without using + static memory buffers. + * I expect almost no one to be using the `BasicZone` and `ExtendedZone` + classes, since they are mostly useful for internal algorithms. + * Client code that needs the old functionality can print to a + `ace_common::PrintStr<>` object, then extract the c-string using + `PrintStr::getCstr()`. * Update UnixHostDuino 0.4 to EpoxyDuino 0.5. + * Explicitly blacklist megaAVR boards, and SAMD21 boards using + `arduino:samd` Core >= 1.8.10. + * This allows a helpful message to be shown to the user, instead of the + pages and pages of compiler errors. * 1.4.1 (2020-12-30, TZDB version 2020f for real) * Actually update `src/ace_time/zonedb` and `src/ace_time/zonedbx` zone info files to 2020f. Oops. diff --git a/USER_GUIDE.md b/USER_GUIDE.md index abf172086..524504836 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -45,6 +45,9 @@ See the [README.md](README.md) for introductory background. * [createForTimeZoneData()](#CreateForTimeZoneData) * [ManualZoneManager](#ManualZoneManager) * [Print To String](#PrintToString) +* [Zones and Links](#ZonesAndLinks) + * [Thin Links (Prior to v1.5)](#ThinLinks) + * [Fat Links (From v1.5)](#FatLinks) * [Mutations](#Mutations) * [TimeOffset Mutations](#TimeOffsetMutations) * [LocalDate Mutations](#LocalDateMutations) @@ -1946,6 +1949,104 @@ using namespace ace_common; } ``` + +## Zones and Links + +It seems worthwhile to describe the difference between Zones and Links in the +IANA TZ database, and how they are implemented in AceTime. A Zone entry is the +canonical name of a given time zone in the IANA database (e.g. +`America/Los_Angeles`). A Link entry is an alias, an alternate name, for a +canonical entry (e.g. `US/Pacific`). + + +### Thin Links (Prior to v1.5) + +Prior to AceTime v1.5, a Link entry was implemented using a C++ reference to the +corresponding Zone entry. In other words, `kZoneUS_Pacific` was a reference to +the `kZoneAmerica_Los_Angeles` Zone data structure, and the `kZoneUS_Pacific` +object did not have an existence of its own. The main positive aspects of this +design were: + +* the `kZoneUS_Pacific` Link entry consumed *no* additional flash memory, + because the data structure for the Link did not exist +* the implementation was very simple, just a C++ reference + +There were several negative consequences however: + +* the `name` component of a `kZoneUS_Pacific` data structure was set to + `"America/Los_Angeles"`, not `"US/Pacific"`, because the Link entry was just a + C++ reference to the Zone entry + * this means that `ZonedDateTime.printTo()` prints `America/Los_Angeles`, + not `US/Pacific` +* similarly, the `zoneId` component of a `kZoneUS_Pacific` struct was set to + the same `zoneId` of `kZoneAmerica_Los_Angeles` +* the `kZoneIdUS_Pacific` constant did not exist, in constrast to the target + `KZoneIdAmerica_Los_Angeles` constant +* the `zonedb::kZoneRegistry` and `zonedbx::kZoneRegistry` contained only + the Zone entries, not the Link entries + * it was then not possible to create a `TimeZone` object through + `ZoneManager::createForZoneName()` or `ZoneManager::createForZoneId()` + using the Link identifiers instead of the Zone identifiers + +But the biggest problem was that the IANA TZ database does not guarantee the +stability of the Zone and Link identifiers. Sometimes a Zone entry becomes a +Link entry. For example, in TZ DB version 2020f, the Zone `Australia/Currie` +became a Link that points to Zone `Australia/Hobart`. This causes problems +at both compile-time and run-time for applications using AceTime: + +**Compile-time**: If the application was using the ZoneId symbol +`kZoneIdAustralia_Currie`, the app would no longer compile after upgrading to +TZDB 2020f. + +**Run-time**: If the application had stored the ZoneId of `Australia/Currie` or +the string `"Australia/Currie"` into the EEPROM, the application would no longer +be able to obtain the `TimeZone` object of `Australia/Currie` after upgrading to +TZDB 2020f. + + +### Fat Links (From v1.5) + +With AceTime v1.5, the implementation of Links was changed to something called +Fat Links internally, and Link entries become identical to their corresponding +Zone entries. In other words: + +* the ZoneInfo `kZone{xxx}` constant exists for every Link entry +* the ZoneId `kZoneId{xxx}` constant exists for every Link entry +* the `kZone{xxx}.name` field points to the full name of the **Link** entry, + not the target Zone entry +* the `kZone{xxx}.zoneId` field is set to the ZoneId of the **Link** entry + +The underlying `ZonePolicy` and `ZoneInfo` data structures are shared between +the corresponding Zone and Link entries, to save memory, but those Link entries +now do consume extra flash memory. Because of the extra memory usage, I provide +2 different Zone registries in the default `zonedb/zone_registry.h` and +`zonedbx/zone_registry.h` files: + +* `zonedb::kZoneRegistry`, `zonedbx::kZoneRegistry` + * contain only the Zone entries +* `zonedb::kZoneAndLinkRegistry`, `zonedbx::kZoneAndLinkRegistry` + * contain both Zone and Link entries + +The approximate sizes of those registries are given in the corresponding +`zone_infos.cpp` files, for example, for the `zonedbx`: + +* `zonedbx::kZoneRegistry`: + * 386 Zones + * 17kB (8-bits), 24kB (32-bits) +* `zonedbx::kZoneAndLinkRegistry`: + * 386 Zones, 207 Links + * 21kB (8-bits), 31kB (32-bits) + +If you have enough flash memory, and forward-compatibility is important, then I +recommend using the complete `kZoneAndLinkRegistry`. However, if you don't have +enough memory, and you can tolerate occasional instability of the Zone and Link +names, then perhaps `kZoneRegistry` is good enough. + +If you are creating your own Zone registry, then you don't have to worry about +forward compatiblity with v1.5 and onwards, because the ZoneName and ZoneId of a +particular Zone will be stable, even when it changes from a Zone to a Link (or +the other way). + ## Mutations @@ -3173,14 +3274,6 @@ get some time to take a closer look in the future. supported. The `tzcompiler.py` will exclude and flag the Rules which could potentially shift to a different year. As of version 2019b, no such Rule seems to exist. -* `Link` entries - * The TZ Database `Link` entries are implemented as C++ references to - the equivalent `Zone` entries. For example, - `zonedb::kZoneUS_Pacific` is just a reference to - `zonedb::kZoneAmerica_Los_Angeles`. This means that if a `ZonedDateTime` - is created with a `TimeZone` associated with `kZoneUS_Pacific`, the - `ZonedDateTime::printTo()` will print "[America/Los_Angeles]" not - "[US/Pacific]". * Arduino Zero and SAMD21 Boards * SAMD21 boards (which all identify themselves as `ARDUINO_SAMD_ZERO`) are supported, but there are some tricky points. From ccddfe3590683678912bb7732f2567e0ff15ed21 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 25 Jan 2021 13:58:01 -0800 Subject: [PATCH 64/74] USER_GUIDE.md: Add entry in 'Bugs' about inability to determine if a ZoneInfo is a Zone or a Link --- USER_GUIDE.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/USER_GUIDE.md b/USER_GUIDE.md index 524504836..dfef85ffb 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -3274,6 +3274,13 @@ get some time to take a closer look in the future. supported. The `tzcompiler.py` will exclude and flag the Rules which could potentially shift to a different year. As of version 2019b, no such Rule seems to exist. +* Links + * Even with the implementation of "fat links" (see *Zones and Links* section + above), it is not possible to determine whether a given `ZoneInfo` + instance is a Zone or a Link at run time. + * Adding a byte-flag would be straight forward, but would increase flash + memory consumption of `kZoneAndLinkRegistry` by 593 bytes. It's not clear + if this feature is worth the cost of extra memory usage. * Arduino Zero and SAMD21 Boards * SAMD21 boards (which all identify themselves as `ARDUINO_SAMD_ZERO`) are supported, but there are some tricky points. From 6bbecf584be289f7a0ab97df3b49ccd80bff6b22 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 25 Jan 2021 17:15:49 -0800 Subject: [PATCH 65/74] zonedb,zonedbx,zonedbpy: Update TZ Database to 2021a --- CHANGELOG.md | 4 ++ src/ace_time/zonedb/Makefile | 2 +- src/ace_time/zonedb/zone_infos.cpp | 6 +-- src/ace_time/zonedb/zone_infos.h | 4 +- src/ace_time/zonedb/zone_policies.cpp | 4 +- src/ace_time/zonedb/zone_policies.h | 4 +- src/ace_time/zonedb/zone_registry.cpp | 4 +- src/ace_time/zonedb/zone_registry.h | 4 +- src/ace_time/zonedbx/Makefile | 2 +- src/ace_time/zonedbx/zone_infos.cpp | 38 ++++++++++++------- src/ace_time/zonedbx/zone_infos.h | 4 +- src/ace_time/zonedbx/zone_policies.cpp | 4 +- src/ace_time/zonedbx/zone_policies.h | 4 +- src/ace_time/zonedbx/zone_registry.cpp | 4 +- src/ace_time/zonedbx/zone_registry.h | 4 +- .../validation/BasicHinnantDateTest/Makefile | 2 +- .../ExtendedHinnantDateTest/Makefile | 2 +- tools/zonedbpy/Makefile | 2 +- tools/zonedbpy/zone_infos.py | 22 ++++++++--- tools/zonedbpy/zone_policies.py | 4 +- 20 files changed, 76 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 349f0f99f..85250c819 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,10 @@ `arduino:samd` Core >= 1.8.10. * This allows a helpful message to be shown to the user, instead of the pages and pages of compiler errors. + * Update TZ Database to 2021a. + * https://mm.icann.org/pipermail/tz-announce/2021-January/000065.html + * "South Sudan changes from +03 to +02 on 2021-02-01 at 00:00. + (Thanks to Steffen Thorsen.)" * 1.4.1 (2020-12-30, TZDB version 2020f for real) * Actually update `src/ace_time/zonedb` and `src/ace_time/zonedbx` zone info files to 2020f. Oops. diff --git a/src/ace_time/zonedb/Makefile b/src/ace_time/zonedb/Makefile index 1140d0c51..08a777440 100644 --- a/src/ace_time/zonedb/Makefile +++ b/src/ace_time/zonedb/Makefile @@ -1,6 +1,6 @@ TARGETS := zone_infos.cpp zone_infos.h zone_policies.cpp zone_policies.h -TZ_VERSION = 2020f +TZ_VERSION = 2021a START_YEAR = 2000 UNTIL_YEAR = 2050 diff --git a/src/ace_time/zonedb/zone_infos.cpp b/src/ace_time/zonedb/zone_infos.cpp index 91b6ab749..74706ad20 100644 --- a/src/ace_time/zonedb/zone_infos.cpp +++ b/src/ace_time/zonedb/zone_infos.cpp @@ -3,7 +3,7 @@ // $ ../../../tools/tzcompiler.py // --input_dir /home/brian/dev/tz // --output_dir /home/brian/src/AceTime/src/ace_time/zonedb -// --tz_version 2020f +// --tz_version 2021a // --action zonedb // --language arduino // --scope basic @@ -22,7 +22,7 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2020f +// from https://github.com/eggert/tz/releases/tag/2021a // // Zones: 266 // Links: 183 @@ -52,7 +52,7 @@ namespace zonedb { // ZoneContext (should not be in PROGMEM) //--------------------------------------------------------------------------- -const char kTzDatabaseVersion[] = "2020f"; +const char kTzDatabaseVersion[] = "2021a"; const char* const kFragments[] = { /*\x00*/ nullptr, diff --git a/src/ace_time/zonedb/zone_infos.h b/src/ace_time/zonedb/zone_infos.h index 43ef41700..5f3cfeefc 100644 --- a/src/ace_time/zonedb/zone_infos.h +++ b/src/ace_time/zonedb/zone_infos.h @@ -3,7 +3,7 @@ // $ ../../../tools/tzcompiler.py // --input_dir /home/brian/dev/tz // --output_dir /home/brian/src/AceTime/src/ace_time/zonedb -// --tz_version 2020f +// --tz_version 2021a // --action zonedb // --language arduino // --scope basic @@ -22,7 +22,7 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2020f +// from https://github.com/eggert/tz/releases/tag/2021a // // DO NOT EDIT diff --git a/src/ace_time/zonedb/zone_policies.cpp b/src/ace_time/zonedb/zone_policies.cpp index 15d62c89d..51834fb02 100644 --- a/src/ace_time/zonedb/zone_policies.cpp +++ b/src/ace_time/zonedb/zone_policies.cpp @@ -3,7 +3,7 @@ // $ ../../../tools/tzcompiler.py // --input_dir /home/brian/dev/tz // --output_dir /home/brian/src/AceTime/src/ace_time/zonedb -// --tz_version 2020f +// --tz_version 2021a // --action zonedb // --language arduino // --scope basic @@ -22,7 +22,7 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2020f +// from https://github.com/eggert/tz/releases/tag/2021a // // Policies: 64 // Rules: 361 diff --git a/src/ace_time/zonedb/zone_policies.h b/src/ace_time/zonedb/zone_policies.h index 9602493de..252ced6cf 100644 --- a/src/ace_time/zonedb/zone_policies.h +++ b/src/ace_time/zonedb/zone_policies.h @@ -3,7 +3,7 @@ // $ ../../../tools/tzcompiler.py // --input_dir /home/brian/dev/tz // --output_dir /home/brian/src/AceTime/src/ace_time/zonedb -// --tz_version 2020f +// --tz_version 2021a // --action zonedb // --language arduino // --scope basic @@ -22,7 +22,7 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2020f +// from https://github.com/eggert/tz/releases/tag/2021a // // DO NOT EDIT diff --git a/src/ace_time/zonedb/zone_registry.cpp b/src/ace_time/zonedb/zone_registry.cpp index 021549301..708608b73 100644 --- a/src/ace_time/zonedb/zone_registry.cpp +++ b/src/ace_time/zonedb/zone_registry.cpp @@ -3,7 +3,7 @@ // $ ../../../tools/tzcompiler.py // --input_dir /home/brian/dev/tz // --output_dir /home/brian/src/AceTime/src/ace_time/zonedb -// --tz_version 2020f +// --tz_version 2021a // --action zonedb // --language arduino // --scope basic @@ -22,7 +22,7 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2020f +// from https://github.com/eggert/tz/releases/tag/2021a // // DO NOT EDIT diff --git a/src/ace_time/zonedb/zone_registry.h b/src/ace_time/zonedb/zone_registry.h index 1c41f3f00..b3396e4a5 100644 --- a/src/ace_time/zonedb/zone_registry.h +++ b/src/ace_time/zonedb/zone_registry.h @@ -3,7 +3,7 @@ // $ ../../../tools/tzcompiler.py // --input_dir /home/brian/dev/tz // --output_dir /home/brian/src/AceTime/src/ace_time/zonedb -// --tz_version 2020f +// --tz_version 2021a // --action zonedb // --language arduino // --scope basic @@ -22,7 +22,7 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2020f +// from https://github.com/eggert/tz/releases/tag/2021a // // DO NOT EDIT diff --git a/src/ace_time/zonedbx/Makefile b/src/ace_time/zonedbx/Makefile index 055c881df..37aa54835 100644 --- a/src/ace_time/zonedbx/Makefile +++ b/src/ace_time/zonedbx/Makefile @@ -1,6 +1,6 @@ TARGETS := zone_infos.cpp zone_infos.h zone_policies.cpp zone_policies.h -TZ_VERSION = 2020f +TZ_VERSION = 2021a START_YEAR = 2000 UNTIL_YEAR = 2050 diff --git a/src/ace_time/zonedbx/zone_infos.cpp b/src/ace_time/zonedbx/zone_infos.cpp index 5ed3f4587..067a0980f 100644 --- a/src/ace_time/zonedbx/zone_infos.cpp +++ b/src/ace_time/zonedbx/zone_infos.cpp @@ -3,7 +3,7 @@ // $ ../../../tools/tzcompiler.py // --input_dir /home/brian/dev/tz // --output_dir /home/brian/src/AceTime/src/ace_time/zonedbx -// --tz_version 2020f +// --tz_version 2021a // --action zonedb // --language arduino // --scope extended @@ -22,7 +22,7 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2020f +// from https://github.com/eggert/tz/releases/tag/2021a // // Zones: 386 // Links: 207 @@ -30,14 +30,14 @@ // Names: 3667 (originally 6100) // Formats: 597 // Fragments: 122 -// Memory (8-bit): 16848 -// Memory (32-bit): 24464 +// Memory (8-bit): 16859 +// Memory (32-bit): 24480 // kZoneAndLinkRegistry sizes (bytes): // Names: 5620 (originally 9027) // Formats: 597 // Fragments: 122 -// Memory (8-bit): 21492 -// Memory (32-bit): 31385 +// Memory (8-bit): 21503 +// Memory (32-bit): 31401 // // DO NOT EDIT @@ -52,7 +52,7 @@ namespace zonedbx { // ZoneContext (should not be in PROGMEM) //--------------------------------------------------------------------------- -const char kTzDatabaseVersion[] = "2020f"; +const char kTzDatabaseVersion[] = "2021a"; const char* const kFragments[] = { /*\x00*/ nullptr, @@ -417,10 +417,10 @@ const extended::ZoneInfo kZoneAfrica_Johannesburg ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Africa/Juba -// Zone Eras: 2 -// Strings (bytes): 15 (originally 21) -// Memory (8-bit): 48 -// Memory (32-bit): 67 +// Zone Eras: 3 +// Strings (bytes): 19 (originally 25) +// Memory (8-bit): 63 +// Memory (32-bit): 87 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAfrica_Juba[] ACE_TIME_PROGMEM = { @@ -436,12 +436,24 @@ static const extended::ZoneEra kZoneEraAfrica_Juba[] ACE_TIME_PROGMEM = { 48 /*untilTimeCode*/, 0 /*untilTimeModifier (kSuffixW + minute=0)*/, }, - // 3:00 - EAT + // 3:00 - EAT 2021 Feb 1 00:00 { nullptr /*zonePolicy*/, "EAT" /*format*/, 12 /*offsetCode*/, 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, + 21 /*untilYearTiny*/, + 2 /*untilMonth*/, + 1 /*untilDay*/, + 0 /*untilTimeCode*/, + 0 /*untilTimeModifier (kSuffixW + minute=0)*/, + }, + // 2:00 - CAT + { + nullptr /*zonePolicy*/, + "CAT" /*format*/, + 8 /*offsetCode*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -457,7 +469,7 @@ const extended::ZoneInfo kZoneAfrica_Juba ACE_TIME_PROGMEM = { kZoneNameAfrica_Juba /*name*/, 0xd51b395c /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*numEras*/, + 3 /*numEras*/, kZoneEraAfrica_Juba /*eras*/, }; diff --git a/src/ace_time/zonedbx/zone_infos.h b/src/ace_time/zonedbx/zone_infos.h index a3d8b7289..abf32562a 100644 --- a/src/ace_time/zonedbx/zone_infos.h +++ b/src/ace_time/zonedbx/zone_infos.h @@ -3,7 +3,7 @@ // $ ../../../tools/tzcompiler.py // --input_dir /home/brian/dev/tz // --output_dir /home/brian/src/AceTime/src/ace_time/zonedbx -// --tz_version 2020f +// --tz_version 2021a // --action zonedb // --language arduino // --scope extended @@ -22,7 +22,7 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2020f +// from https://github.com/eggert/tz/releases/tag/2021a // // DO NOT EDIT diff --git a/src/ace_time/zonedbx/zone_policies.cpp b/src/ace_time/zonedbx/zone_policies.cpp index af45ed866..f99cab86f 100644 --- a/src/ace_time/zonedbx/zone_policies.cpp +++ b/src/ace_time/zonedbx/zone_policies.cpp @@ -3,7 +3,7 @@ // $ ../../../tools/tzcompiler.py // --input_dir /home/brian/dev/tz // --output_dir /home/brian/src/AceTime/src/ace_time/zonedbx -// --tz_version 2020f +// --tz_version 2021a // --action zonedb // --language arduino // --scope extended @@ -22,7 +22,7 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2020f +// from https://github.com/eggert/tz/releases/tag/2021a // // Policies: 84 // Rules: 551 diff --git a/src/ace_time/zonedbx/zone_policies.h b/src/ace_time/zonedbx/zone_policies.h index 6763ef656..d774c24b0 100644 --- a/src/ace_time/zonedbx/zone_policies.h +++ b/src/ace_time/zonedbx/zone_policies.h @@ -3,7 +3,7 @@ // $ ../../../tools/tzcompiler.py // --input_dir /home/brian/dev/tz // --output_dir /home/brian/src/AceTime/src/ace_time/zonedbx -// --tz_version 2020f +// --tz_version 2021a // --action zonedb // --language arduino // --scope extended @@ -22,7 +22,7 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2020f +// from https://github.com/eggert/tz/releases/tag/2021a // // DO NOT EDIT diff --git a/src/ace_time/zonedbx/zone_registry.cpp b/src/ace_time/zonedbx/zone_registry.cpp index 4daaa5ef0..404cfdb9c 100644 --- a/src/ace_time/zonedbx/zone_registry.cpp +++ b/src/ace_time/zonedbx/zone_registry.cpp @@ -3,7 +3,7 @@ // $ ../../../tools/tzcompiler.py // --input_dir /home/brian/dev/tz // --output_dir /home/brian/src/AceTime/src/ace_time/zonedbx -// --tz_version 2020f +// --tz_version 2021a // --action zonedb // --language arduino // --scope extended @@ -22,7 +22,7 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2020f +// from https://github.com/eggert/tz/releases/tag/2021a // // DO NOT EDIT diff --git a/src/ace_time/zonedbx/zone_registry.h b/src/ace_time/zonedbx/zone_registry.h index 2935bd847..fed6f7203 100644 --- a/src/ace_time/zonedbx/zone_registry.h +++ b/src/ace_time/zonedbx/zone_registry.h @@ -3,7 +3,7 @@ // $ ../../../tools/tzcompiler.py // --input_dir /home/brian/dev/tz // --output_dir /home/brian/src/AceTime/src/ace_time/zonedbx -// --tz_version 2020f +// --tz_version 2021a // --action zonedb // --language arduino // --scope extended @@ -22,7 +22,7 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2020f +// from https://github.com/eggert/tz/releases/tag/2021a // // DO NOT EDIT diff --git a/tests/validation/BasicHinnantDateTest/Makefile b/tests/validation/BasicHinnantDateTest/Makefile index 842db5b0d..f1644a832 100644 --- a/tests/validation/BasicHinnantDateTest/Makefile +++ b/tests/validation/BasicHinnantDateTest/Makefile @@ -30,7 +30,7 @@ runtests: # Define the scope of the test data. SCOPE = basic -TZ_VERSION = 2020f +TZ_VERSION = 2021a START_YEAR = 2000 UNTIL_YEAR = 2050 diff --git a/tests/validation/ExtendedHinnantDateTest/Makefile b/tests/validation/ExtendedHinnantDateTest/Makefile index 2895eb391..50081c827 100644 --- a/tests/validation/ExtendedHinnantDateTest/Makefile +++ b/tests/validation/ExtendedHinnantDateTest/Makefile @@ -32,7 +32,7 @@ runtests: # If START_YEAR < ~1974, then tzcompiler.py must be given the # --ignore_buf_size_too_large flag to prevent an exception. SCOPE = extended -TZ_VERSION = 2020f +TZ_VERSION = 2021a START_YEAR = 1974 UNTIL_YEAR = 2050 diff --git a/tools/zonedbpy/Makefile b/tools/zonedbpy/Makefile index 49a418b20..c9f38d8c7 100644 --- a/tools/zonedbpy/Makefile +++ b/tools/zonedbpy/Makefile @@ -1,6 +1,6 @@ TARGETS := zone_infos.py zone_policies.py -TZ_VERSION := 2020f +TZ_VERSION := 2021a START_YEAR := 1974 UNTIL_YEAR := 2050 diff --git a/tools/zonedbpy/zone_infos.py b/tools/zonedbpy/zone_infos.py index 0e64e3860..984f306ee 100644 --- a/tools/zonedbpy/zone_infos.py +++ b/tools/zonedbpy/zone_infos.py @@ -3,7 +3,7 @@ # $ ../tzcompiler.py # --input_dir /home/brian/dev/tz # --output_dir /home/brian/src/AceTime/tools/zonedbpy -# --tz_version 2020f +# --tz_version 2021a # --action zonedb # --language python # --scope extended @@ -23,14 +23,14 @@ # northamerica # southamerica # -# from https://github.com/eggert/tz/releases/tag/2020f +# from https://github.com/eggert/tz/releases/tag/2021a # # DO NOT EDIT from .zone_policies import * # numInfos: 386 -# numEras: 1071 +# numEras: 1072 #--------------------------------------------------------------------------- # Zone name: Africa/Abidjan @@ -391,7 +391,7 @@ #--------------------------------------------------------------------------- # Zone name: Africa/Juba -# Era count: 2 +# Era count: 3 #--------------------------------------------------------------------------- ZONE_ERAS_Africa_Juba = [ @@ -407,12 +407,24 @@ 'until_seconds': 43200, 'until_time_suffix': 'w', }, - # 3:00 - EAT + # 3:00 - EAT 2021 Feb 1 00:00 { 'offset_seconds': 10800, 'zone_policy': '-', 'rules_delta_seconds': 0, 'format': 'EAT', + 'until_year': 2021, + 'until_month': 2, + 'until_day': 1, + 'until_seconds': 0, + 'until_time_suffix': 'w', + }, + # 2:00 - CAT + { + 'offset_seconds': 7200, + 'zone_policy': '-', + 'rules_delta_seconds': 0, + 'format': 'CAT', 'until_year': 10000, 'until_month': 1, 'until_day': 1, diff --git a/tools/zonedbpy/zone_policies.py b/tools/zonedbpy/zone_policies.py index a5b98da1f..c03b7477d 100644 --- a/tools/zonedbpy/zone_policies.py +++ b/tools/zonedbpy/zone_policies.py @@ -3,7 +3,7 @@ # $ ../tzcompiler.py # --input_dir /home/brian/dev/tz # --output_dir /home/brian/src/AceTime/tools/zonedbpy -# --tz_version 2020f +# --tz_version 2021a # --action zonedb # --language python # --scope extended @@ -23,7 +23,7 @@ # northamerica # southamerica # -# from https://github.com/eggert/tz/releases/tag/2020f +# from https://github.com/eggert/tz/releases/tag/2021a # # DO NOT EDIT From 48b47118c2877902cce77642d3f20d9cc35f7222 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 26 Jan 2021 09:11:17 -0800 Subject: [PATCH 66/74] MemoryBenchmark: Add benchmarks for STM32 --- examples/MemoryBenchmark/Makefile | 6 +++- examples/MemoryBenchmark/collect.sh | 39 +++++++++++++++------ examples/MemoryBenchmark/generate_table.awk | 9 +++-- examples/MemoryBenchmark/stm32.txt | 17 +++++++++ 4 files changed, 57 insertions(+), 14 deletions(-) create mode 100644 examples/MemoryBenchmark/stm32.txt diff --git a/examples/MemoryBenchmark/Makefile b/examples/MemoryBenchmark/Makefile index e50b3d3ae..856c31c78 100644 --- a/examples/MemoryBenchmark/Makefile +++ b/examples/MemoryBenchmark/Makefile @@ -8,7 +8,8 @@ include ../../../EpoxyDuino/EpoxyDuino.mk .PHONY: benchmarks -TARGETS := nano.txt micro.txt samd.txt esp8266.txt esp32.txt teensy32.txt +TARGETS := nano.txt micro.txt samd.txt stm32.txt esp8266.txt esp32.txt \ +teensy32.txt README.md: $(TARGETS) generate_readme.py generate_table.awk ./generate_readme.py > $@ @@ -24,6 +25,9 @@ micro.txt: samd.txt: ./collect.sh samd $@ +stm32.txt: + ./collect.sh stm32 $@ + esp8266.txt: ./collect.sh nodemcu $@ diff --git a/examples/MemoryBenchmark/collect.sh b/examples/MemoryBenchmark/collect.sh index 212968ef0..5e9d927ea 100755 --- a/examples/MemoryBenchmark/collect.sh +++ b/examples/MemoryBenchmark/collect.sh @@ -54,23 +54,40 @@ function collect_for_board() { sed -i -e "s/#define FEATURE [0-9]*/#define FEATURE $feature/" \ $PROGRAM_NAME - if ! ($AUNITER_CMD "$cli_flag" verify $board $PROGRAM_NAME 2>&1) > \ - $auniter_out_file; then + if ($AUNITER_CMD "$cli_flag" verify $board $PROGRAM_NAME 2>&1) > \ + $auniter_out_file; then + extract_memory "$feature" "$result_file" + + elif grep -q 'Sketch too big' $auniter_out_file; then # Ignore 'Sketch too big' condition, since we just want to # collect the flash and ram usage numbers. - if ! grep -q 'Sketch too big' $auniter_out_file; then - cat $auniter_out_file - exit 1 - fi + extract_memory "$feature" "$result_file" + + elif grep -q 'region.*overflowed by' $auniter_out_file; then + # When STM32duino overflows, it does not print any useful info. + # Print special markers to tell generate_table.awk about the + # overflow. + echo $feature -1 -1 -1 -1 >> $result_file + + else + # Can't handle the error, so echo the output and exit the script. + cat $auniter_out_file + exit 1 fi - flash=$(grep 'Sketch uses' $auniter_out_file | - awk '{print $3, $12}') - memory=$(grep 'Global variables' $auniter_out_file | - awk '{print $4, $18}') - echo $feature $flash $memory >> $result_file done } +function extract_memory() { + local feature=$1 + local result_file=$2 + + local flash=$(grep 'Sketch uses' $auniter_out_file | + awk '{print $3, $12}') + local memory=$(grep 'Global variables' $auniter_out_file | + awk '{print $4, $18}') + echo $feature $flash $memory >> $result_file +} + trap "cleanup" EXIT # Parse flags. diff --git a/examples/MemoryBenchmark/generate_table.awk b/examples/MemoryBenchmark/generate_table.awk index dae7bf43a..21eac8149 100755 --- a/examples/MemoryBenchmark/generate_table.awk +++ b/examples/MemoryBenchmark/generate_table.awk @@ -35,8 +35,13 @@ END { base_flash = u[0]["flash"] base_ram = u[0]["ram"] for (i = 0; i <= NUM_FEATURES; i++) { - u[i]["d_flash"] = u[i]["flash"] - base_flash - u[i]["d_ram"] = u[i]["ram"]- base_ram + if (u[i]["flash"] == -1) { + u[i]["d_flash"] = -1 + u[i]["d_ram"] = -1 + } else { + u[i]["d_flash"] = u[i]["flash"] - base_flash + u[i]["d_ram"] = u[i]["ram"]- base_ram + } } printf("+----------------------------------------------------------------+\n") diff --git a/examples/MemoryBenchmark/stm32.txt b/examples/MemoryBenchmark/stm32.txt new file mode 100644 index 000000000..f17af82e6 --- /dev/null +++ b/examples/MemoryBenchmark/stm32.txt @@ -0,0 +1,17 @@ +0 19136 65536 3788 20480 +1 23128 65536 3988 20480 +2 23280 65536 3988 20480 +3 23288 65536 3988 20480 +4 27140 65536 3988 20480 +5 27576 65536 3988 20480 +6 27844 65536 3988 20480 +7 45124 65536 3988 20480 +8 51224 65536 3988 20480 +9 28924 65536 3988 20480 +10 29176 65536 3988 20480 +11 29620 65536 3988 20480 +12 59312 65536 3988 20480 +13 -1 -1 -1 -1 +14 26004 65536 3988 20480 +15 29688 65536 3988 20480 +16 31480 65536 3988 20480 From 9f3bc392a81d475d7810aaa214b1bc31fa1eb7fc Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 26 Jan 2021 09:54:47 -0800 Subject: [PATCH 67/74] MemoryBenchmark: Generate table for STM32 --- examples/MemoryBenchmark/README.md | 100 ++++++++++++++------ examples/MemoryBenchmark/esp32.txt | 4 +- examples/MemoryBenchmark/esp8266.txt | 4 +- examples/MemoryBenchmark/generate_readme.py | 25 ++++- examples/MemoryBenchmark/micro.txt | 4 +- examples/MemoryBenchmark/nano.txt | 4 +- examples/MemoryBenchmark/samd.txt | 4 +- examples/MemoryBenchmark/teensy32.txt | 26 ++--- 8 files changed, 119 insertions(+), 52 deletions(-) diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index 2a75e0ef2..fc85b3bb7 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -7,7 +7,7 @@ the baseline, and its memory usage numbers are subtracted from the subsequent **NOTE**: This file was auto-generated using `make README.md`. DO NOT EDIT. -**Version**: AceTime v1.4.1 +**Version**: AceTime v1.5 ## How to Regenerate @@ -59,6 +59,7 @@ consumption by 1200-2400 bytes when all the zones are loaded into the ## Arduino Nano +* 16MHz ATmega328P * Arduino IDE 1.8.13 * Arduino AVR Boards 1.8.3 @@ -79,8 +80,8 @@ consumption by 1200-2400 bytes when all the zones are loaded into the | Extended TimeZone (1 zone) | 9982/ 343 | 9534/ 333 | | Extended TimeZone (2 zones) | 10450/ 347 | 10002/ 337 | | ExtendedZoneManager (1 zone) | 11790/ 369 | 11342/ 359 | -| ExtendedZoneManager (all zones) | 33844/ 853 | 33396/ 843 | -| ExtendedZoneManager (zones+links) | 38488/ 853 | 38040/ 843 | +| ExtendedZoneManager (all zones) | 33854/ 853 | 33406/ 843 | +| ExtendedZoneManager (zones+links) | 38498/ 853 | 38050/ 843 | |-----------------------------------+--------------+-------------| | SystemClock | 5662/ 282 | 5214/ 272 | | SystemClock+Basic TimeZone | 10248/ 456 | 9800/ 446 | @@ -91,6 +92,7 @@ consumption by 1200-2400 bytes when all the zones are loaded into the ## Sparkfun Pro Micro +* 16 MHz ATmega32U4 * Arduino IDE 1.8.13 * SparkFun AVR Boards 1.1.13 @@ -111,8 +113,8 @@ consumption by 1200-2400 bytes when all the zones are loaded into the | Extended TimeZone (1 zone) | 13082/ 481 | 9618/ 331 | | Extended TimeZone (2 zones) | 13552/ 487 | 10088/ 337 | | ExtendedZoneManager (1 zone) | 14890/ 507 | 11426/ 357 | -| ExtendedZoneManager (all zones) | 36944/ 991 | 33480/ 841 | -| ExtendedZoneManager (zones+links) | 41588/ 991 | 38124/ 841 | +| ExtendedZoneManager (all zones) | 36954/ 991 | 33490/ 841 | +| ExtendedZoneManager (zones+links) | 41598/ 991 | 38134/ 841 | |-----------------------------------+--------------+-------------| | SystemClock | 8646/ 422 | 5182/ 272 | | SystemClock+Basic TimeZone | 13230/ 594 | 9766/ 444 | @@ -123,6 +125,7 @@ consumption by 1200-2400 bytes when all the zones are loaded into the ## SAMD21 M0 Mini +* 48 MHz ARM Cortex-M0+ * Arduino IDE 1.8.13 * Sparkfun SAMD Boards 1.8.1 @@ -143,8 +146,8 @@ consumption by 1200-2400 bytes when all the zones are loaded into the | Extended TimeZone (1 zone) | 17108/ 0 | 7044/ 0 | | Extended TimeZone (2 zones) | 17532/ 0 | 7468/ 0 | | ExtendedZoneManager (1 zone) | 18140/ 0 | 8076/ 0 | -| ExtendedZoneManager (all zones) | 48164/ 0 | 38100/ 0 | -| ExtendedZoneManager (zones+links) | 55252/ 0 | 45188/ 0 | +| ExtendedZoneManager (all zones) | 48180/ 0 | 38116/ 0 | +| ExtendedZoneManager (zones+links) | 55268/ 0 | 45204/ 0 | |-----------------------------------+--------------+-------------| | SystemClock | 13264/ 0 | 3200/ 0 | | SystemClock+Basic TimeZone | 16948/ 0 | 6884/ 0 | @@ -155,8 +158,47 @@ consumption by 1200-2400 bytes when all the zones are loaded into the (SAMD compiler does not produce RAM usage numbers.) +## STM32 Blue Pill + +* STM32F103C8, 72 MHz ARM Cortex-M3 +* Arduino IDE 1.8.13 +* STM32duino 1.9.0 + +``` ++----------------------------------------------------------------+ +| Functionality | flash/ ram | delta | +|-----------------------------------+--------------+-------------| +| Baseline | 19136/ 3788 | 0/ 0 | +|-----------------------------------+--------------+-------------| +| LocalDateTime | 23128/ 3988 | 3992/ 200 | +| ZonedDateTime | 23280/ 3988 | 4144/ 200 | +| Manual ZoneManager | 23288/ 3988 | 4152/ 200 | +| Basic TimeZone (1 zone) | 27140/ 3988 | 8004/ 200 | +| Basic TimeZone (2 zones) | 27576/ 3988 | 8440/ 200 | +| BasicZoneManager (1 zone) | 27844/ 3988 | 8708/ 200 | +| BasicZoneManager (all zones) | 45124/ 3988 | 25988/ 200 | +| BasicZoneManager (zones+links) | 51224/ 3988 | 32088/ 200 | +| Extended TimeZone (1 zone) | 28924/ 3988 | 9788/ 200 | +| Extended TimeZone (2 zones) | 29176/ 3988 | 10040/ 200 | +| ExtendedZoneManager (1 zone) | 29620/ 3988 | 10484/ 200 | +| ExtendedZoneManager (all zones) | 59312/ 3988 | 40176/ 200 | +| ExtendedZoneManager (zones+links) | -1/ -1 | -1/ -1 | +|-----------------------------------+--------------+-------------| +| SystemClock | 26004/ 3988 | 6868/ 200 | +| SystemClock+Basic TimeZone | 29688/ 3988 | 10552/ 200 | +| SystemClock+Extended TimeZone | 31480/ 3988 | 12344/ 200 | ++----------------------------------------------------------------+ + +``` + +An entry of `-1` indicates that the memory usage exceeded the maximum of the +microcontroller and the compiler did not generate the desired information. + +(SAMD compiler does not produce RAM usage numbers.) + ## ESP8266 +* NodeMCU 1.0, 80MHz ESP8266 * Arduino IDE 1.8.13 * ESP8266 Boards 2.7.4 @@ -177,8 +219,8 @@ consumption by 1200-2400 bytes when all the zones are loaded into the | Extended TimeZone (1 zone) | 267292/27968 | 10592/ 1192 | | Extended TimeZone (2 zones) | 267580/27968 | 10880/ 1192 | | ExtendedZoneManager (1 zone) | 268412/27968 | 11712/ 1192 | -| ExtendedZoneManager (all zones) | 298608/27980 | 41908/ 1204 | -| ExtendedZoneManager (zones+links) | 305536/27980 | 48836/ 1204 | +| ExtendedZoneManager (all zones) | 298624/27980 | 41924/ 1204 | +| ExtendedZoneManager (zones+links) | 305552/27980 | 48852/ 1204 | |-----------------------------------+--------------+-------------| | SystemClock | 262268/27276 | 5568/ 500 | | SystemClock+Basic TimeZone | 267624/27824 | 10924/ 1048 | @@ -189,6 +231,7 @@ consumption by 1200-2400 bytes when all the zones are loaded into the ## ESP32 +* ESP32-01 Dev Board, 240 MHz Tensilica LX6 * Arduino IDE 1.8.13 * ESP32 Boards 1.0.4 @@ -209,8 +252,8 @@ consumption by 1200-2400 bytes when all the zones are loaded into the | Extended TimeZone (1 zone) | 225153/16116 | 18718/ 1552 | | Extended TimeZone (2 zones) | 225421/16116 | 18986/ 1552 | | ExtendedZoneManager (1 zone) | 226109/16116 | 19674/ 1552 | -| ExtendedZoneManager (all zones) | 256393/16116 | 49958/ 1552 | -| ExtendedZoneManager (zones+links) | 263601/16116 | 57166/ 1552 | +| ExtendedZoneManager (all zones) | 256409/16116 | 49974/ 1552 | +| ExtendedZoneManager (zones+links) | 263617/16116 | 57182/ 1552 | |-----------------------------------+--------------+-------------| | SystemClock | 226013/16220 | 19578/ 1656 | | SystemClock+Basic TimeZone | 229909/16220 | 23474/ 1656 | @@ -225,6 +268,7 @@ usage by objects. ## Teensy 3.2 +* 96 MHz ARM Cortex-M4 * Arduino IDE 1.8.13 * Teensyduino 1.53 @@ -232,25 +276,25 @@ usage by objects. +----------------------------------------------------------------+ | Functionality | flash/ ram | delta | |-----------------------------------+--------------+-------------| -| Baseline | 7624/ 3048 | 0/ 0 | +| Baseline | 7656/ 3048 | 0/ 0 | |-----------------------------------+--------------+-------------| -| LocalDateTime | 13268/ 4812 | 5644/ 1764 | -| ZonedDateTime | 13268/ 4812 | 5644/ 1764 | -| Manual ZoneManager | 13268/ 4812 | 5644/ 1764 | -| Basic TimeZone (1 zone) | 22264/ 4812 | 14640/ 1764 | -| Basic TimeZone (2 zones) | 22992/ 4812 | 15368/ 1764 | -| BasicZoneManager (1 zone) | 23536/ 4812 | 15912/ 1764 | -| BasicZoneManager (all zones) | 41280/ 4812 | 33656/ 1764 | -| BasicZoneManager (zones+links) | 47624/ 4812 | 40000/ 1764 | -| Extended TimeZone (1 zone) | 24564/ 4812 | 16940/ 1764 | -| Extended TimeZone (2 zones) | 25228/ 4812 | 17604/ 1764 | -| ExtendedZoneManager (1 zone) | 25836/ 4812 | 18212/ 1764 | -| ExtendedZoneManager (all zones) | 56116/ 4812 | 48492/ 1764 | -| ExtendedZoneManager (zones+links) | 63324/ 4812 | 55700/ 1764 | +| LocalDateTime | 13300/ 4812 | 5644/ 1764 | +| ZonedDateTime | 13300/ 4812 | 5644/ 1764 | +| Manual ZoneManager | 13300/ 4812 | 5644/ 1764 | +| Basic TimeZone (1 zone) | 22328/ 4812 | 14672/ 1764 | +| Basic TimeZone (2 zones) | 22992/ 4812 | 15336/ 1764 | +| BasicZoneManager (1 zone) | 23600/ 4812 | 15944/ 1764 | +| BasicZoneManager (all zones) | 41344/ 4812 | 33688/ 1764 | +| BasicZoneManager (zones+links) | 47688/ 4812 | 40032/ 1764 | +| Extended TimeZone (1 zone) | 24564/ 4812 | 16908/ 1764 | +| Extended TimeZone (2 zones) | 25292/ 4812 | 17636/ 1764 | +| ExtendedZoneManager (1 zone) | 25836/ 4812 | 18180/ 1764 | +| ExtendedZoneManager (all zones) | 56196/ 4812 | 48540/ 1764 | +| ExtendedZoneManager (zones+links) | 63404/ 4812 | 55748/ 1764 | |-----------------------------------+--------------+-------------| -| SystemClock | 16192/ 4812 | 8568/ 1764 | -| SystemClock+Basic TimeZone | 25372/ 4812 | 17748/ 1764 | -| SystemClock+Extended TimeZone | 27672/ 4812 | 20048/ 1764 | +| SystemClock | 16224/ 4812 | 8568/ 1764 | +| SystemClock+Basic TimeZone | 25436/ 4812 | 17780/ 1764 | +| SystemClock+Extended TimeZone | 27672/ 4812 | 20016/ 1764 | +----------------------------------------------------------------+ ``` diff --git a/examples/MemoryBenchmark/esp32.txt b/examples/MemoryBenchmark/esp32.txt index 8e13c53b1..2f3f9f71f 100644 --- a/examples/MemoryBenchmark/esp32.txt +++ b/examples/MemoryBenchmark/esp32.txt @@ -10,8 +10,8 @@ 9 225153 1310720 16116 327680 10 225421 1310720 16116 327680 11 226109 1310720 16116 327680 -12 256393 1310720 16116 327680 -13 263601 1310720 16116 327680 +12 256409 1310720 16116 327680 +13 263617 1310720 16116 327680 14 226013 1310720 16220 327680 15 229909 1310720 16220 327680 16 231901 1310720 16220 327680 diff --git a/examples/MemoryBenchmark/esp8266.txt b/examples/MemoryBenchmark/esp8266.txt index f5aadb5b7..9ca49c921 100644 --- a/examples/MemoryBenchmark/esp8266.txt +++ b/examples/MemoryBenchmark/esp8266.txt @@ -10,8 +10,8 @@ 9 267292 1044464 27968 81920 10 267580 1044464 27968 81920 11 268412 1044464 27968 81920 -12 298608 1044464 27980 81920 -13 305536 1044464 27980 81920 +12 298624 1044464 27980 81920 +13 305552 1044464 27980 81920 14 262268 1044464 27276 81920 15 267624 1044464 27824 81920 16 269944 1044464 27968 81920 diff --git a/examples/MemoryBenchmark/generate_readme.py b/examples/MemoryBenchmark/generate_readme.py index 45c26c3b5..69057b8c7 100755 --- a/examples/MemoryBenchmark/generate_readme.py +++ b/examples/MemoryBenchmark/generate_readme.py @@ -12,6 +12,8 @@ "./generate_table.awk < micro.txt", shell=True, text=True) samd_results = check_output( "./generate_table.awk < samd.txt", shell=True, text=True) +stm32_results = check_output( + "./generate_table.awk < stm32.txt", shell=True, text=True) esp8266_results = check_output( "./generate_table.awk < esp8266.txt", shell=True, text=True) esp32_results = check_output( @@ -29,7 +31,7 @@ **NOTE**: This file was auto-generated using `make README.md`. DO NOT EDIT. -**Version**: AceTime v1.4.1 +**Version**: AceTime v1.5 ## How to Regenerate @@ -81,6 +83,7 @@ ## Arduino Nano +* 16MHz ATmega328P * Arduino IDE 1.8.13 * Arduino AVR Boards 1.8.3 @@ -90,6 +93,7 @@ ## Sparkfun Pro Micro +* 16 MHz ATmega32U4 * Arduino IDE 1.8.13 * SparkFun AVR Boards 1.1.13 @@ -99,6 +103,7 @@ ## SAMD21 M0 Mini +* 48 MHz ARM Cortex-M0+ * Arduino IDE 1.8.13 * Sparkfun SAMD Boards 1.8.1 @@ -108,8 +113,24 @@ (SAMD compiler does not produce RAM usage numbers.) +## STM32 Blue Pill + +* STM32F103C8, 72 MHz ARM Cortex-M3 +* Arduino IDE 1.8.13 +* STM32duino 1.9.0 + +``` +{stm32_results} +``` + +An entry of `-1` indicates that the memory usage exceeded the maximum of the +microcontroller and the compiler did not generate the desired information. + +(SAMD compiler does not produce RAM usage numbers.) + ## ESP8266 +* NodeMCU 1.0, 80MHz ESP8266 * Arduino IDE 1.8.13 * ESP8266 Boards 2.7.4 @@ -119,6 +140,7 @@ ## ESP32 +* ESP32-01 Dev Board, 240 MHz Tensilica LX6 * Arduino IDE 1.8.13 * ESP32 Boards 1.0.4 @@ -132,6 +154,7 @@ ## Teensy 3.2 +* 96 MHz ARM Cortex-M4 * Arduino IDE 1.8.13 * Teensyduino 1.53 diff --git a/examples/MemoryBenchmark/micro.txt b/examples/MemoryBenchmark/micro.txt index 7df787a42..13e18bc5b 100644 --- a/examples/MemoryBenchmark/micro.txt +++ b/examples/MemoryBenchmark/micro.txt @@ -10,8 +10,8 @@ 9 13082 28672 481 2560 10 13552 28672 487 2560 11 14890 28672 507 2560 -12 36944 28672 991 2560 -13 41588 28672 991 2560 +12 36954 28672 991 2560 +13 41598 28672 991 2560 14 8646 28672 422 2560 15 13230 28672 594 2560 16 16270 28672 628 2560 diff --git a/examples/MemoryBenchmark/nano.txt b/examples/MemoryBenchmark/nano.txt index e69f4474b..6f2ac226c 100644 --- a/examples/MemoryBenchmark/nano.txt +++ b/examples/MemoryBenchmark/nano.txt @@ -10,8 +10,8 @@ 9 9982 30720 343 2048 10 10450 30720 347 2048 11 11790 30720 369 2048 -12 33844 30720 853 2048 -13 38488 30720 853 2048 +12 33854 30720 853 2048 +13 38498 30720 853 2048 14 5662 30720 282 2048 15 10248 30720 456 2048 16 13288 30720 490 2048 diff --git a/examples/MemoryBenchmark/samd.txt b/examples/MemoryBenchmark/samd.txt index 1b91db41e..f90a87ed6 100644 --- a/examples/MemoryBenchmark/samd.txt +++ b/examples/MemoryBenchmark/samd.txt @@ -10,8 +10,8 @@ 9 17108 262144 10 17532 262144 11 18140 262144 -12 48164 262144 -13 55252 262144 +12 48180 262144 +13 55268 262144 14 13264 262144 15 16948 262144 16 18932 262144 diff --git a/examples/MemoryBenchmark/teensy32.txt b/examples/MemoryBenchmark/teensy32.txt index b8de7b930..6bb04c01d 100644 --- a/examples/MemoryBenchmark/teensy32.txt +++ b/examples/MemoryBenchmark/teensy32.txt @@ -1,17 +1,17 @@ -0 7624 262144 3048 65536 -1 13268 262144 4812 65536 -2 13268 262144 4812 65536 -3 13268 262144 4812 65536 -4 22264 262144 4812 65536 +0 7656 262144 3048 65536 +1 13300 262144 4812 65536 +2 13300 262144 4812 65536 +3 13300 262144 4812 65536 +4 22328 262144 4812 65536 5 22992 262144 4812 65536 -6 23536 262144 4812 65536 -7 41280 262144 4812 65536 -8 47624 262144 4812 65536 +6 23600 262144 4812 65536 +7 41344 262144 4812 65536 +8 47688 262144 4812 65536 9 24564 262144 4812 65536 -10 25228 262144 4812 65536 +10 25292 262144 4812 65536 11 25836 262144 4812 65536 -12 56116 262144 4812 65536 -13 63324 262144 4812 65536 -14 16192 262144 4812 65536 -15 25372 262144 4812 65536 +12 56196 262144 4812 65536 +13 63404 262144 4812 65536 +14 16224 262144 4812 65536 +15 25436 262144 4812 65536 16 27672 262144 4812 65536 From 1f7bf63aa74db9dcb90dfe156810b8618c5ed0af Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 26 Jan 2021 12:55:02 -0800 Subject: [PATCH 68/74] AutoBenchmark/README.md: Go back to v1.4.1 and regenerate ZoneRegistrar search by zoneName and zoneId numbers, so that they can be compared to v1.5 --- examples/AutoBenchmark/README.md | 154 ++++++++++++++++++++++++++++--- 1 file changed, 140 insertions(+), 14 deletions(-) diff --git a/examples/AutoBenchmark/README.md b/examples/AutoBenchmark/README.md index ee7d96680..a649d110b 100644 --- a/examples/AutoBenchmark/README.md +++ b/examples/AutoBenchmark/README.md @@ -4,7 +4,15 @@ Here are the results from `AutoBenchmark.ino` for various boards. These results show that integer division and modulus operations are incredibly slow on 8-bit AVR processors. -**Version**: AceTime v1.4 +**Version**: AceTime v1.4.1 (This is a special README.md file that contains +benchmarks for `BasicZoneManager::indexForZoneName(binary)` (and +`BasicZoneManager::indexForZoneId(linear)` algorithms at v1.4.1, before these +algorithms were converted into using a binary search on zoneId. I should have +generated this before doing the major refactoring for v1.5. Failing that, I had +to go back to v1.4.1 and create this README.md as a one-off, then rebase this +version just before the results for v1.5. This allows me to compare the +performance improvements in from v1.4.1 to v1.5 after making the algorithmic +change.) **NOTE**: This file was auto-generated using `make README.md`. DO NOT EDIT. @@ -102,7 +110,7 @@ CPU: | LocalDate::dayOfWeek() | 51.2 | | OffsetDateTime::forEpochSeconds() | 318.8 | | OffsetDateTime::toEpochSeconds() | 87.2 | -| ZonedDateTime::toEpochSeconds() | 85.6 | +| ZonedDateTime::toEpochSeconds() | 86.0 | | ZonedDateTime::toEpochDays() | 73.2 | | ZonedDateTime::forEpochSeconds(UTC) | 334.8 | | ZonedDateTime::forEpochSeconds(Basic_nocache) | 1185.6 | @@ -218,15 +226,78 @@ CPU: | LocalDate::forEpochDays() | 23.2 | | LocalDate::toEpochDays() | 9.7 | | LocalDate::dayOfWeek() | 12.3 | -| OffsetDateTime::forEpochSeconds() | 35.0 | -| OffsetDateTime::toEpochSeconds() | 17.1 | +| OffsetDateTime::forEpochSeconds() | 34.9 | +| OffsetDateTime::toEpochSeconds() | 16.9 | | ZonedDateTime::toEpochSeconds() | 18.2 | -| ZonedDateTime::toEpochDays() | 16.3 | +| ZonedDateTime::toEpochDays() | 16.1 | | ZonedDateTime::forEpochSeconds(UTC) | 41.3 | -| ZonedDateTime::forEpochSeconds(Basic_nocache) | 235.2 | -| ZonedDateTime::forEpochSeconds(Basic_cached) | 73.8 | -| ZonedDateTime::forEpochSeconds(Extended_nocache) | 435.1 | -| ZonedDateTime::forEpochSeconds(Extended_cached) | 74.1 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 235.3 | +| ZonedDateTime::forEpochSeconds(Basic_cached) | 73.9 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 436.1 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 74.3 | +| BasicZoneManager::indexForZoneName(binary) | 18.8 | +| BasicZoneManager::indexForZoneId(linear) | 44.9 | ++--------------------------------------------------+----------+ +Iterations_per_run: 10000 + +``` + +## STM32 Blue Pill + +* STM32F103C8, 72 MHz ARM Cortex-M3 +* Arduino IDE 1.8.13 +* STM32duino 1.9.0 + +``` +Sizes of Objects: +sizeof(LocalDate): 3 +sizeof(LocalTime): 3 +sizeof(LocalDateTime): 6 +sizeof(TimeOffset): 2 +sizeof(OffsetDateTime): 8 +sizeof(BasicZoneProcessor): 156 +sizeof(ExtendedZoneProcessor): 532 +sizeof(BasicZoneRegistrar): 12 +sizeof(ExtendedZoneRegistrar): 12 +sizeof(BasicZoneManager<1>): 180 +sizeof(ExtendedZoneManager<1>): 556 +sizeof(TimeZoneData): 8 +sizeof(TimeZone): 12 +sizeof(ZonedDateTime): 20 +sizeof(TimePeriod): 4 +sizeof(clock::DS3231Clock): 8 +sizeof(clock::SystemClock): 24 +sizeof(clock::SystemClockLoop): 44 +sizeof(clock::SystemClockCoroutine): 68 +sizeof(basic::ZoneContext): 8 +sizeof(basic::ZoneEra): 16 +sizeof(basic::ZoneInfo): 20 +sizeof(basic::ZoneRule): 9 +sizeof(basic::ZonePolicy): 12 +sizeof(basic::Transition): 28 +sizeof(extended::Transition): 52 +sizeof(extended::ZoneMatch): 16 + +CPU: ++--------------------------------------------------+----------+ +| Method | micros | +|--------------------------------------------------+----------| +| EmptyLoop | 1.3 | +|--------------------------------------------------+----------| +| LocalDate::forEpochDays() | 2.1 | +| LocalDate::toEpochDays() | 0.9 | +| LocalDate::dayOfWeek() | 1.2 | +| OffsetDateTime::forEpochSeconds() | 3.3 | +| OffsetDateTime::toEpochSeconds() | 4.4 | +| ZonedDateTime::toEpochSeconds() | 4.2 | +| ZonedDateTime::toEpochDays() | 3.1 | +| ZonedDateTime::forEpochSeconds(UTC) | 4.6 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 66.7 | +| ZonedDateTime::forEpochSeconds(Basic_cached) | 11.0 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 129.1 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 10.8 | +| BasicZoneManager::indexForZoneName(binary) | 17.6 | +| BasicZoneManager::indexForZoneId(linear) | 44.8 | +--------------------------------------------------+----------+ Iterations_per_run: 10000 @@ -276,17 +347,19 @@ CPU: | EmptyLoop | 5.1 | |--------------------------------------------------+----------| | LocalDate::forEpochDays() | 7.8 | -| LocalDate::toEpochDays() | 4.3 | -| LocalDate::dayOfWeek() | 4.1 | +| LocalDate::toEpochDays() | 4.2 | +| LocalDate::dayOfWeek() | 4.0 | | OffsetDateTime::forEpochSeconds() | 12.2 | -| OffsetDateTime::toEpochSeconds() | 7.0 | +| OffsetDateTime::toEpochSeconds() | 7.1 | | ZonedDateTime::toEpochSeconds() | 7.0 | | ZonedDateTime::toEpochDays() | 6.0 | | ZonedDateTime::forEpochSeconds(UTC) | 13.1 | -| ZonedDateTime::forEpochSeconds(Basic_nocache) | 97.7 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 121.3 | | ZonedDateTime::forEpochSeconds(Basic_cached) | 27.1 | | ZonedDateTime::forEpochSeconds(Extended_nocache) | 177.1 | | ZonedDateTime::forEpochSeconds(Extended_cached) | 27.3 | +| BasicZoneManager::indexForZoneName(binary) | 32.6 | +| BasicZoneManager::indexForZoneId(linear) | 135.4 | +--------------------------------------------------+----------+ Iterations_per_run: 10000 @@ -347,6 +420,8 @@ CPU: | ZonedDateTime::forEpochSeconds(Basic_cached) | 2.6 | | ZonedDateTime::forEpochSeconds(Extended_nocache) | 30.0 | | ZonedDateTime::forEpochSeconds(Extended_cached) | 2.5 | +| BasicZoneManager::indexForZoneName(binary) | 2.5 | +| BasicZoneManager::indexForZoneId(linear) | 8.4 | +--------------------------------------------------+----------+ Iterations_per_run: 100000 @@ -363,6 +438,57 @@ duration of an empty loop, the numbers become unreliable. * Compiler options: "Faster" ``` -TBD +Sizes of Objects: +sizeof(LocalDate): 3 +sizeof(LocalTime): 3 +sizeof(LocalDateTime): 6 +sizeof(TimeOffset): 2 +sizeof(OffsetDateTime): 8 +sizeof(BasicZoneProcessor): 156 +sizeof(ExtendedZoneProcessor): 532 +sizeof(BasicZoneRegistrar): 12 +sizeof(ExtendedZoneRegistrar): 12 +sizeof(BasicZoneManager<1>): 180 +sizeof(ExtendedZoneManager<1>): 556 +sizeof(TimeZoneData): 8 +sizeof(TimeZone): 12 +sizeof(ZonedDateTime): 20 +sizeof(TimePeriod): 4 +sizeof(clock::DS3231Clock): 8 +sizeof(clock::SystemClock): 24 +sizeof(clock::SystemClockLoop): 44 +sizeof(clock::SystemClockCoroutine): 68 +sizeof(basic::ZoneContext): 8 +sizeof(basic::ZoneEra): 16 +sizeof(basic::ZoneInfo): 20 +sizeof(basic::ZoneRule): 9 +sizeof(basic::ZonePolicy): 12 +sizeof(basic::Transition): 28 +sizeof(extended::Transition): 52 +sizeof(extended::ZoneMatch): 16 + +CPU: ++--------------------------------------------------+----------+ +| Method | micros | +|--------------------------------------------------+----------| +| EmptyLoop | 0.6 | +|--------------------------------------------------+----------| +| LocalDate::forEpochDays() | 1.1 | +| LocalDate::toEpochDays() | 0.9 | +| LocalDate::dayOfWeek() | 1.6 | +| OffsetDateTime::forEpochSeconds() | 1.9 | +| OffsetDateTime::toEpochSeconds() | 0.4 | +| ZonedDateTime::toEpochSeconds() | 0.4 | +| ZonedDateTime::toEpochDays() | 0.2 | +| ZonedDateTime::forEpochSeconds(UTC) | 2.2 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 30.6 | +| ZonedDateTime::forEpochSeconds(Basic_cached) | 6.3 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 68.9 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 5.8 | +| BasicZoneManager::indexForZoneName(binary) | 11.2 | +| BasicZoneManager::indexForZoneId(linear) | 25.6 | ++--------------------------------------------------+----------+ +Iterations_per_run: 100000 + ``` From 76b5b7d090054c5f16bf2856e9f38d80d398129f Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 26 Jan 2021 11:46:54 -0800 Subject: [PATCH 69/74] AutoBenchmark: Add benchmarks for indexForZoneName(), indexForZoneId(binary), indexForZoneId(linear); support Teensy 3.2 again --- examples/AutoBenchmark/Benchmark.cpp | 72 ++++---- examples/AutoBenchmark/Makefile | 37 ++-- examples/AutoBenchmark/README.md | 206 +++++++++++----------- examples/AutoBenchmark/esp32.txt | 29 +-- examples/AutoBenchmark/esp8266.txt | 27 +-- examples/AutoBenchmark/generate_readme.py | 30 +++- examples/AutoBenchmark/micro.txt | 16 +- examples/AutoBenchmark/nano.txt | 14 +- examples/AutoBenchmark/samd.txt | 35 ++-- examples/AutoBenchmark/stm32.txt | 47 +++++ examples/AutoBenchmark/teensy32.txt | 47 +++++ 11 files changed, 350 insertions(+), 210 deletions(-) create mode 100644 examples/AutoBenchmark/stm32.txt create mode 100644 examples/AutoBenchmark/teensy32.txt diff --git a/examples/AutoBenchmark/Benchmark.cpp b/examples/AutoBenchmark/Benchmark.cpp index 64c375ae2..101c0b07c 100644 --- a/examples/AutoBenchmark/Benchmark.cpp +++ b/examples/AutoBenchmark/Benchmark.cpp @@ -12,12 +12,14 @@ using ace_common::PrintStr; const uint32_t COUNT = 2500; #elif defined(ARDUINO_ARCH_SAMD) const uint32_t COUNT = 10000; +#elif defined(ARDUINO_ARCH_STM32) +const uint32_t COUNT = 10000; #elif defined(ESP8266) const uint32_t COUNT = 10000; #elif defined(ESP32) -const uint32_t COUNT = 100000; +const uint32_t COUNT = 50000; #elif defined(TEENSYDUINO) -const uint32_t COUNT = 100000; +const uint32_t COUNT = 50000; #elif defined(EPOXY_DUINO) // Linux or MacOS const uint32_t COUNT = 100000; @@ -300,7 +302,7 @@ static const uint16_t kBasicZoneRegistrySize = // ZonedDateTime::forEpochSeconds(seconds, tz), uncached static void runZonedDateTimeForEpochSecondsBasicZoneManager() { - BasicZoneManager<2> manager(kBasicZoneRegistrySize, kBasicZoneRegistry); + BasicZoneManager<1> manager(kBasicZoneRegistrySize, kBasicZoneRegistry); acetime_t offset = 0; unsigned long forEpochSecondsMillis = runLambda(COUNT, [&offset, &manager]() { @@ -322,7 +324,7 @@ static void runZonedDateTimeForEpochSecondsBasicZoneManager() { // ZonedDateTime::forEpochSeconds(seconds, tz) cached static void runZonedDateTimeForEpochSecondsBasicZoneManagerCached() { - BasicZoneManager<2> manager(kBasicZoneRegistrySize, kBasicZoneRegistry); + BasicZoneManager<1> manager(kBasicZoneRegistrySize, kBasicZoneRegistry); unsigned long forEpochSecondsMillis = runLambda(COUNT, [&manager]() { unsigned long fakeEpochSeconds = millis(); @@ -353,7 +355,7 @@ static const uint16_t kExtendedZoneRegistrySize = // ZonedDateTime::forEpochSeconds(seconds, tz), uncached static void runZonedDateTimeForEpochSecondsExtendedZoneManager() { - ExtendedZoneManager<2> manager( + ExtendedZoneManager<1> manager( kExtendedZoneRegistrySize, kExtendedZoneRegistry); acetime_t offset = 0; @@ -377,7 +379,7 @@ static void runZonedDateTimeForEpochSecondsExtendedZoneManager() { // ZonedDateTime::forEpochSeconds(seconds, tz) cached ExtendedZoneManager static void runZonedDateTimeForEpochSecondsExtendedZoneManagerCached() { - ExtendedZoneManager<2> manager( + ExtendedZoneManager<1> manager( kExtendedZoneRegistrySize, kExtendedZoneRegistry); unsigned long forEpochSecondsMillis = runLambda(COUNT, [&manager]() { @@ -401,14 +403,14 @@ static void runZonedDateTimeForEpochSecondsExtendedZoneManagerCached() { #if ! defined(ARDUINO_ARCH_AVR) static void runIndexForZoneName() { - ExtendedZoneRegistrar registrar( - zonedbx::kZoneRegistrySize, zonedbx::kZoneRegistry); + BasicZoneRegistrar registrar( + zonedb::kZoneRegistrySize, zonedb::kZoneRegistry); unsigned long runMillis = runLambda(COUNT, [®istrar]() { PrintStr<20> printStr; // deliberately short to truncate some zones - uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); - const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; - ExtendedZone(info).printNameTo(printStr); + uint16_t randomIndex = random(zonedb::kZoneRegistrySize); + const basic::ZoneInfo* info = zonedb::kZoneRegistry[randomIndex]; + BasicZone(info).printNameTo(printStr); uint16_t index = registrar.findIndexForName(printStr.getCstr()); disableOptimization(index); @@ -416,9 +418,9 @@ static void runIndexForZoneName() { unsigned long emptyLoopMillis = runLambda(COUNT, []() { PrintStr<20> printStr; // deliberately short to truncate some zones - uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); - const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; - ExtendedZone(info).printNameTo(printStr); + uint16_t randomIndex = random(zonedb::kZoneRegistrySize); + const basic::ZoneInfo* info = zonedb::kZoneRegistry[randomIndex]; + BasicZone(info).printNameTo(printStr); uint16_t len = printStr.length(); const char* s = printStr.getCstr(); @@ -431,65 +433,65 @@ static void runIndexForZoneName() { long elapsedMillis = runMillis - emptyLoopMillis; - SERIAL_PORT_MONITOR.print(F("ExtendedZoneManager::indexForZoneName(binary)")); + SERIAL_PORT_MONITOR.print(F("BasicZoneManager::indexForZoneName(binary)")); printMicrosPerIteration(elapsedMillis); SERIAL_PORT_MONITOR.println(); } -// non-static to allow friend access into ExtendedZoneRegistrar +// non-static to allow friend access into BasicZoneRegistrar void runIndexForZoneIdBinary() { - ExtendedZoneRegistrar registrar( - zonedbx::kZoneRegistrySize, zonedbx::kZoneRegistry); + BasicZoneRegistrar registrar( + zonedb::kZoneRegistrySize, zonedb::kZoneRegistry); unsigned long runMillis = runLambda(COUNT, [®istrar]() { - uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); - const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; - uint32_t zoneId = ExtendedZone(info).zoneId(); + uint16_t randomIndex = random(zonedb::kZoneRegistrySize); + const basic::ZoneInfo* info = zonedb::kZoneRegistry[randomIndex]; + uint32_t zoneId = BasicZone(info).zoneId(); uint16_t index = registrar.findIndexForIdBinary(zoneId); disableOptimization(index); }); unsigned long emptyLoopMillis = runLambda(COUNT, []() { - uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); - const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; - uint32_t zoneId = ExtendedZone(info).zoneId(); + uint16_t randomIndex = random(zonedb::kZoneRegistrySize); + const basic::ZoneInfo* info = zonedb::kZoneRegistry[randomIndex]; + uint32_t zoneId = BasicZone(info).zoneId(); disableOptimization(zoneId); }); long elapsedMillis = runMillis - emptyLoopMillis; - SERIAL_PORT_MONITOR.print(F("ExtendedZoneManager::indexForZoneId(binary)")); + SERIAL_PORT_MONITOR.print(F("BasicZoneManager::indexForZoneId(binary)")); printMicrosPerIteration(elapsedMillis); SERIAL_PORT_MONITOR.println(); } -// non-static to allow friend access into ExtendedZoneRegistrar +// non-static to allow friend access into BasicZoneRegistrar void runIndexForZoneIdLinear() { - ExtendedZoneRegistrar registrar( - zonedbx::kZoneRegistrySize, zonedbx::kZoneRegistry); + BasicZoneRegistrar registrar( + zonedb::kZoneRegistrySize, zonedb::kZoneRegistry); unsigned long runMillis = runLambda(COUNT, [®istrar]() { - uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); - const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; - uint32_t zoneId = ExtendedZone(info).zoneId(); + uint16_t randomIndex = random(zonedb::kZoneRegistrySize); + const basic::ZoneInfo* info = zonedb::kZoneRegistry[randomIndex]; + uint32_t zoneId = BasicZone(info).zoneId(); uint16_t index = registrar.findIndexForIdLinear(zoneId); disableOptimization(index); }); unsigned long emptyLoopMillis = runLambda(COUNT, []() { - uint16_t randomIndex = random(zonedbx::kZoneRegistrySize); - const extended::ZoneInfo* info = zonedbx::kZoneRegistry[randomIndex]; - uint32_t zoneId = ExtendedZone(info).zoneId(); + uint16_t randomIndex = random(zonedb::kZoneRegistrySize); + const basic::ZoneInfo* info = zonedb::kZoneRegistry[randomIndex]; + uint32_t zoneId = BasicZone(info).zoneId(); disableOptimization(zoneId); }); long elapsedMillis = runMillis - emptyLoopMillis; - SERIAL_PORT_MONITOR.print(F("ExtendedZoneManager::indexForZoneId(linear)")); + SERIAL_PORT_MONITOR.print(F("BasicZoneManager::indexForZoneId(linear)")); printMicrosPerIteration(elapsedMillis); SERIAL_PORT_MONITOR.println(); } diff --git a/examples/AutoBenchmark/Makefile b/examples/AutoBenchmark/Makefile index 3a30a3724..d7e412da0 100644 --- a/examples/AutoBenchmark/Makefile +++ b/examples/AutoBenchmark/Makefile @@ -10,7 +10,8 @@ include ../../../EpoxyDuino/EpoxyDuino.mk AUNITER_DIR := ../../../AUniter/tools -TARGETS := nano.txt micro.txt samd.txt esp8266.txt esp32.txt # teensy32.txt +TARGETS := nano.txt micro.txt samd.txt stm32.txt esp8266.txt esp32.txt \ +teensy32.txt # It is not possible to auto-generate the $(TARGETS) because the USB ports are # dynamic. @@ -19,29 +20,37 @@ README.md: generate_readme.py generate_table.awk $(TARGETS) benchmarks: $(TARGETS) -# These targets don't actually work because the tty ports (USB0, ACM0) can -# change dynamically. I may need to create a script to run these interactively, -# something like `collect.sh nano:USB0 micro:ACM0 esp8266:USB1 ...`. +# These targets cannot be automated because the tty ports (USB0, ACM0) can +# change dynamically. I activate one microcontroller at a time, verify its USB +# port (when only a single microcontroller is active, it becomes one of the +# USB0 or ACM0 ports listed below), then run 'make xxx.txt' manually the +# command line. nano.txt: - $(AUNITER_DIR)/auniter.sh upmon -o $@ --eof END nano:USB0 + $(AUNITER_DIR)/auniter.sh --cli upmon -o $@ --eof END nano:USB0 micro.txt: - $(AUNITER_DIR)/auniter.sh upmon -o $@ --eof END micro:ACM0 + $(AUNITER_DIR)/auniter.sh --ide upmon -o $@ --eof END micro:ACM0 samd.txt: - $(AUNITER_DIR)/auniter.sh upmon -o $@ --eof END samd:ACM0 + $(AUNITER_DIR)/auniter.sh --ide upmon -o $@ --eof END samd:ACM0 + +stm32.txt: + $(AUNITER_DIR)/auniter.sh --cli upmon -o $@ --eof END stm32:ACM0 esp8266.txt: - $(AUNITER_DIR)/auniter.sh upmon -o $@ --eof END nodemcu:USB0 + $(AUNITER_DIR)/auniter.sh --cli upmon -o $@ --eof END nodemcu:USB0 esp32.txt: - $(AUNITER_DIR)/auniter.sh upmon -o $@ --eof END esp32:USB0 - -# Teensy requires manual capture of teensy32.txt. I can't even do that manually -# on some of my laptops because Teensy refuses to connect. So this Makefile -# rule is an aspirational hope for consistency. + $(AUNITER_DIR)/auniter.sh --cli upmon -o $@ --eof END esp32:USB0 + +# Teensy cannot upload a Arduino sketch and capture its Serial output +# programmatically using a script, at least, I don't know how. To generate +# teesy32.txt, I have to manually upload the program using the IDE, then fire +# up the Serial Monitor, then copy and paste the Serial output manually into +# teensy.txt. This Makefile rule is an aspirational hope that Teensy might +# allow automation some day in the future. teensy32.txt: - $(AUNITER_DIR)/auniter.sh upmon -o $@ --eof END teensy32:ACM0 + $(AUNITER_DIR)/auniter.sh --cli upmon -o $@ --eof END teensy32:ACM0 more_clean: echo "Use 'make clean_benchmarks' to remove *.txt files" diff --git a/examples/AutoBenchmark/README.md b/examples/AutoBenchmark/README.md index a649d110b..fc591a238 100644 --- a/examples/AutoBenchmark/README.md +++ b/examples/AutoBenchmark/README.md @@ -4,15 +4,7 @@ Here are the results from `AutoBenchmark.ino` for various boards. These results show that integer division and modulus operations are incredibly slow on 8-bit AVR processors. -**Version**: AceTime v1.4.1 (This is a special README.md file that contains -benchmarks for `BasicZoneManager::indexForZoneName(binary)` (and -`BasicZoneManager::indexForZoneId(linear)` algorithms at v1.4.1, before these -algorithms were converted into using a binary search on zoneId. I should have -generated this before doing the major refactoring for v1.5. Failing that, I had -to go back to v1.4.1 and create this README.md as a one-off, then rebase this -version just before the results for v1.5. This allows me to compare the -performance improvements in from v1.4.1 to v1.5 after making the algorithmic -change.) +**Version**: AceTime v1.5 **NOTE**: This file was auto-generated using `make README.md`. DO NOT EDIT. @@ -61,7 +53,16 @@ The CPU times below are given in microseconds. ## CPU Time Changes -The CPU time did not change much from v0.8 to v1.4. +* The CPU time did not change much from v0.8 to v1.4. +* The CPU time of most classes did not change much from v1.4 to v1.5. The + big difference is that the Zone registries (kZoneRegistry, + kZoneAndLinkRegistry) are now sorted by zoneId instead of zoneName, and the + `ZoneManager::indexForZoneId()` will use a binary search, instead of a linear + search. This makes it 10-15X faster for ~266 entries. The + `ZoneManager::indexForZoneName()` also converts to a zoneId, then performs a + binary search, instead of doing a binary search on the zoneName directly. Even + with the extra level of indirection, the `indexForZoneName()` is between + 1.5-2X faster than the previous version. ## Arduino Nano @@ -90,9 +91,9 @@ sizeof(clock::DS3231Clock): 3 sizeof(clock::SystemClock): 17 sizeof(clock::SystemClockLoop): 34 sizeof(clock::SystemClockCoroutine): 43 -sizeof(basic::ZoneContext): 6 +sizeof(basic::ZoneContext): 9 sizeof(basic::ZoneEra): 11 -sizeof(basic::ZoneInfo): 12 +sizeof(basic::ZoneInfo): 11 sizeof(basic::ZoneRule): 9 sizeof(basic::ZonePolicy): 6 sizeof(basic::Transition): 21 @@ -113,10 +114,10 @@ CPU: | ZonedDateTime::toEpochSeconds() | 86.0 | | ZonedDateTime::toEpochDays() | 73.2 | | ZonedDateTime::forEpochSeconds(UTC) | 334.8 | -| ZonedDateTime::forEpochSeconds(Basic_nocache) | 1185.6 | -| ZonedDateTime::forEpochSeconds(Basic_cached) | 625.2 | -| ZonedDateTime::forEpochSeconds(Extended_nocache) | 2028.4 | -| ZonedDateTime::forEpochSeconds(Extended_cached) | 625.6 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 1183.6 | +| ZonedDateTime::forEpochSeconds(Basic_cached) | 623.6 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 2027.6 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 623.2 | +--------------------------------------------------+----------+ Iterations_per_run: 2500 @@ -149,9 +150,9 @@ sizeof(clock::DS3231Clock): 3 sizeof(clock::SystemClock): 17 sizeof(clock::SystemClockLoop): 34 sizeof(clock::SystemClockCoroutine): 43 -sizeof(basic::ZoneContext): 6 +sizeof(basic::ZoneContext): 9 sizeof(basic::ZoneEra): 11 -sizeof(basic::ZoneInfo): 12 +sizeof(basic::ZoneInfo): 11 sizeof(basic::ZoneRule): 9 sizeof(basic::ZonePolicy): 6 sizeof(basic::Transition): 21 @@ -165,17 +166,17 @@ CPU: | EmptyLoop | 5.2 | |--------------------------------------------------+----------| | LocalDate::forEpochDays() | 216.4 | -| LocalDate::toEpochDays() | 57.6 | -| LocalDate::dayOfWeek() | 50.8 | +| LocalDate::toEpochDays() | 56.8 | +| LocalDate::dayOfWeek() | 51.2 | | OffsetDateTime::forEpochSeconds() | 320.8 | | OffsetDateTime::toEpochSeconds() | 87.2 | | ZonedDateTime::toEpochSeconds() | 87.2 | | ZonedDateTime::toEpochDays() | 73.2 | | ZonedDateTime::forEpochSeconds(UTC) | 336.0 | -| ZonedDateTime::forEpochSeconds(Basic_nocache) | 1191.6 | -| ZonedDateTime::forEpochSeconds(Basic_cached) | 627.6 | -| ZonedDateTime::forEpochSeconds(Extended_nocache) | 2039.2 | -| ZonedDateTime::forEpochSeconds(Extended_cached) | 627.6 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 1189.6 | +| ZonedDateTime::forEpochSeconds(Basic_cached) | 625.6 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 2038.0 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 626.0 | +--------------------------------------------------+----------+ Iterations_per_run: 2500 @@ -196,10 +197,10 @@ sizeof(TimeOffset): 2 sizeof(OffsetDateTime): 8 sizeof(BasicZoneProcessor): 156 sizeof(ExtendedZoneProcessor): 532 -sizeof(BasicZoneRegistrar): 12 -sizeof(ExtendedZoneRegistrar): 12 -sizeof(BasicZoneManager<1>): 180 -sizeof(ExtendedZoneManager<1>): 556 +sizeof(BasicZoneRegistrar): 8 +sizeof(ExtendedZoneRegistrar): 8 +sizeof(BasicZoneManager<1>): 176 +sizeof(ExtendedZoneManager<1>): 552 sizeof(TimeZoneData): 8 sizeof(TimeZone): 12 sizeof(ZonedDateTime): 20 @@ -208,7 +209,7 @@ sizeof(clock::DS3231Clock): 8 sizeof(clock::SystemClock): 24 sizeof(clock::SystemClockLoop): 44 sizeof(clock::SystemClockCoroutine): 68 -sizeof(basic::ZoneContext): 8 +sizeof(basic::ZoneContext): 16 sizeof(basic::ZoneEra): 16 sizeof(basic::ZoneInfo): 20 sizeof(basic::ZoneRule): 9 @@ -221,22 +222,23 @@ CPU: +--------------------------------------------------+----------+ | Method | micros | |--------------------------------------------------+----------| -| EmptyLoop | 1.3 | +| EmptyLoop | 1.4 | |--------------------------------------------------+----------| -| LocalDate::forEpochDays() | 23.2 | -| LocalDate::toEpochDays() | 9.7 | +| LocalDate::forEpochDays() | 23.0 | +| LocalDate::toEpochDays() | 9.6 | | LocalDate::dayOfWeek() | 12.3 | -| OffsetDateTime::forEpochSeconds() | 34.9 | -| OffsetDateTime::toEpochSeconds() | 16.9 | -| ZonedDateTime::toEpochSeconds() | 18.2 | +| OffsetDateTime::forEpochSeconds() | 34.7 | +| OffsetDateTime::toEpochSeconds() | 17.1 | +| ZonedDateTime::toEpochSeconds() | 18.3 | | ZonedDateTime::toEpochDays() | 16.1 | -| ZonedDateTime::forEpochSeconds(UTC) | 41.3 | -| ZonedDateTime::forEpochSeconds(Basic_nocache) | 235.3 | -| ZonedDateTime::forEpochSeconds(Basic_cached) | 73.9 | -| ZonedDateTime::forEpochSeconds(Extended_nocache) | 436.1 | -| ZonedDateTime::forEpochSeconds(Extended_cached) | 74.3 | -| BasicZoneManager::indexForZoneName(binary) | 18.8 | -| BasicZoneManager::indexForZoneId(linear) | 44.9 | +| ZonedDateTime::forEpochSeconds(UTC) | 41.1 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 235.7 | +| ZonedDateTime::forEpochSeconds(Basic_cached) | 73.6 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 435.6 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 73.8 | +| BasicZoneManager::indexForZoneName(binary) | 14.9 | +| BasicZoneManager::indexForZoneId(binary) | 4.0 | +| BasicZoneManager::indexForZoneId(linear) | 55.6 | +--------------------------------------------------+----------+ Iterations_per_run: 10000 @@ -257,10 +259,10 @@ sizeof(TimeOffset): 2 sizeof(OffsetDateTime): 8 sizeof(BasicZoneProcessor): 156 sizeof(ExtendedZoneProcessor): 532 -sizeof(BasicZoneRegistrar): 12 -sizeof(ExtendedZoneRegistrar): 12 -sizeof(BasicZoneManager<1>): 180 -sizeof(ExtendedZoneManager<1>): 556 +sizeof(BasicZoneRegistrar): 8 +sizeof(ExtendedZoneRegistrar): 8 +sizeof(BasicZoneManager<1>): 176 +sizeof(ExtendedZoneManager<1>): 552 sizeof(TimeZoneData): 8 sizeof(TimeZone): 12 sizeof(ZonedDateTime): 20 @@ -269,7 +271,7 @@ sizeof(clock::DS3231Clock): 8 sizeof(clock::SystemClock): 24 sizeof(clock::SystemClockLoop): 44 sizeof(clock::SystemClockCoroutine): 68 -sizeof(basic::ZoneContext): 8 +sizeof(basic::ZoneContext): 16 sizeof(basic::ZoneEra): 16 sizeof(basic::ZoneInfo): 20 sizeof(basic::ZoneRule): 9 @@ -282,22 +284,23 @@ CPU: +--------------------------------------------------+----------+ | Method | micros | |--------------------------------------------------+----------| -| EmptyLoop | 1.3 | +| EmptyLoop | 1.2 | |--------------------------------------------------+----------| -| LocalDate::forEpochDays() | 2.1 | -| LocalDate::toEpochDays() | 0.9 | +| LocalDate::forEpochDays() | 2.3 | +| LocalDate::toEpochDays() | 1.0 | | LocalDate::dayOfWeek() | 1.2 | -| OffsetDateTime::forEpochSeconds() | 3.3 | +| OffsetDateTime::forEpochSeconds() | 3.5 | | OffsetDateTime::toEpochSeconds() | 4.4 | -| ZonedDateTime::toEpochSeconds() | 4.2 | +| ZonedDateTime::toEpochSeconds() | 4.3 | | ZonedDateTime::toEpochDays() | 3.1 | -| ZonedDateTime::forEpochSeconds(UTC) | 4.6 | -| ZonedDateTime::forEpochSeconds(Basic_nocache) | 66.7 | +| ZonedDateTime::forEpochSeconds(UTC) | 4.8 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 71.5 | | ZonedDateTime::forEpochSeconds(Basic_cached) | 11.0 | -| ZonedDateTime::forEpochSeconds(Extended_nocache) | 129.1 | -| ZonedDateTime::forEpochSeconds(Extended_cached) | 10.8 | -| BasicZoneManager::indexForZoneName(binary) | 17.6 | -| BasicZoneManager::indexForZoneId(linear) | 44.8 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 131.0 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 10.7 | +| BasicZoneManager::indexForZoneName(binary) | 11.9 | +| BasicZoneManager::indexForZoneId(binary) | 3.2 | +| BasicZoneManager::indexForZoneId(linear) | 44.2 | +--------------------------------------------------+----------+ Iterations_per_run: 10000 @@ -318,10 +321,10 @@ sizeof(TimeOffset): 2 sizeof(OffsetDateTime): 8 sizeof(BasicZoneProcessor): 156 sizeof(ExtendedZoneProcessor): 532 -sizeof(BasicZoneRegistrar): 12 -sizeof(ExtendedZoneRegistrar): 12 -sizeof(BasicZoneManager<1>): 180 -sizeof(ExtendedZoneManager<1>): 556 +sizeof(BasicZoneRegistrar): 8 +sizeof(ExtendedZoneRegistrar): 8 +sizeof(BasicZoneManager<1>): 176 +sizeof(ExtendedZoneManager<1>): 552 sizeof(TimeZoneData): 8 sizeof(TimeZone): 12 sizeof(ZonedDateTime): 20 @@ -331,7 +334,7 @@ sizeof(clock::NtpClock): 88 sizeof(clock::SystemClock): 24 sizeof(clock::SystemClockLoop): 44 sizeof(clock::SystemClockCoroutine): 68 -sizeof(basic::ZoneContext): 8 +sizeof(basic::ZoneContext): 16 sizeof(basic::ZoneEra): 16 sizeof(basic::ZoneInfo): 20 sizeof(basic::ZoneRule): 9 @@ -346,20 +349,21 @@ CPU: |--------------------------------------------------+----------| | EmptyLoop | 5.1 | |--------------------------------------------------+----------| -| LocalDate::forEpochDays() | 7.8 | -| LocalDate::toEpochDays() | 4.2 | -| LocalDate::dayOfWeek() | 4.0 | +| LocalDate::forEpochDays() | 7.7 | +| LocalDate::toEpochDays() | 4.3 | +| LocalDate::dayOfWeek() | 4.1 | | OffsetDateTime::forEpochSeconds() | 12.2 | -| OffsetDateTime::toEpochSeconds() | 7.1 | -| ZonedDateTime::toEpochSeconds() | 7.0 | +| OffsetDateTime::toEpochSeconds() | 7.2 | +| ZonedDateTime::toEpochSeconds() | 7.1 | | ZonedDateTime::toEpochDays() | 6.0 | -| ZonedDateTime::forEpochSeconds(UTC) | 13.1 | -| ZonedDateTime::forEpochSeconds(Basic_nocache) | 121.3 | +| ZonedDateTime::forEpochSeconds(UTC) | 13.4 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 115.4 | | ZonedDateTime::forEpochSeconds(Basic_cached) | 27.1 | -| ZonedDateTime::forEpochSeconds(Extended_nocache) | 177.1 | -| ZonedDateTime::forEpochSeconds(Extended_cached) | 27.3 | -| BasicZoneManager::indexForZoneName(binary) | 32.6 | -| BasicZoneManager::indexForZoneId(linear) | 135.4 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 177.0 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 27.2 | +| BasicZoneManager::indexForZoneName(binary) | 17.1 | +| BasicZoneManager::indexForZoneId(binary) | 9.0 | +| BasicZoneManager::indexForZoneId(linear) | 154.2 | +--------------------------------------------------+----------+ Iterations_per_run: 10000 @@ -380,10 +384,10 @@ sizeof(TimeOffset): 2 sizeof(OffsetDateTime): 8 sizeof(BasicZoneProcessor): 156 sizeof(ExtendedZoneProcessor): 532 -sizeof(BasicZoneRegistrar): 12 -sizeof(ExtendedZoneRegistrar): 12 -sizeof(BasicZoneManager<1>): 180 -sizeof(ExtendedZoneManager<1>): 556 +sizeof(BasicZoneRegistrar): 8 +sizeof(ExtendedZoneRegistrar): 8 +sizeof(BasicZoneManager<1>): 176 +sizeof(ExtendedZoneManager<1>): 552 sizeof(TimeZoneData): 8 sizeof(TimeZone): 12 sizeof(ZonedDateTime): 20 @@ -393,7 +397,7 @@ sizeof(clock::NtpClock): 116 sizeof(clock::SystemClock): 24 sizeof(clock::SystemClockLoop): 44 sizeof(clock::SystemClockCoroutine): 68 -sizeof(basic::ZoneContext): 8 +sizeof(basic::ZoneContext): 16 sizeof(basic::ZoneEra): 16 sizeof(basic::ZoneInfo): 20 sizeof(basic::ZoneRule): 9 @@ -410,18 +414,19 @@ CPU: |--------------------------------------------------+----------| | LocalDate::forEpochDays() | 0.5 | | LocalDate::toEpochDays() | 0.4 | -| LocalDate::dayOfWeek() | 0.4 | +| LocalDate::dayOfWeek() | 0.5 | | OffsetDateTime::forEpochSeconds() | 0.9 | | OffsetDateTime::toEpochSeconds() | 1.4 | | ZonedDateTime::toEpochSeconds() | 1.4 | | ZonedDateTime::toEpochDays() | 1.1 | | ZonedDateTime::forEpochSeconds(UTC) | 1.2 | | ZonedDateTime::forEpochSeconds(Basic_nocache) | 15.3 | -| ZonedDateTime::forEpochSeconds(Basic_cached) | 2.6 | -| ZonedDateTime::forEpochSeconds(Extended_nocache) | 30.0 | +| ZonedDateTime::forEpochSeconds(Basic_cached) | 2.5 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 29.9 | | ZonedDateTime::forEpochSeconds(Extended_cached) | 2.5 | -| BasicZoneManager::indexForZoneName(binary) | 2.5 | -| BasicZoneManager::indexForZoneId(linear) | 8.4 | +| BasicZoneManager::indexForZoneName(binary) | 3.1 | +| BasicZoneManager::indexForZoneId(binary) | 0.7 | +| BasicZoneManager::indexForZoneId(linear) | 13.9 | +--------------------------------------------------+----------+ Iterations_per_run: 100000 @@ -446,10 +451,10 @@ sizeof(TimeOffset): 2 sizeof(OffsetDateTime): 8 sizeof(BasicZoneProcessor): 156 sizeof(ExtendedZoneProcessor): 532 -sizeof(BasicZoneRegistrar): 12 -sizeof(ExtendedZoneRegistrar): 12 -sizeof(BasicZoneManager<1>): 180 -sizeof(ExtendedZoneManager<1>): 556 +sizeof(BasicZoneRegistrar): 8 +sizeof(ExtendedZoneRegistrar): 8 +sizeof(BasicZoneManager<1>): 176 +sizeof(ExtendedZoneManager<1>): 552 sizeof(TimeZoneData): 8 sizeof(TimeZone): 12 sizeof(ZonedDateTime): 20 @@ -458,7 +463,7 @@ sizeof(clock::DS3231Clock): 8 sizeof(clock::SystemClock): 24 sizeof(clock::SystemClockLoop): 44 sizeof(clock::SystemClockCoroutine): 68 -sizeof(basic::ZoneContext): 8 +sizeof(basic::ZoneContext): 16 sizeof(basic::ZoneEra): 16 sizeof(basic::ZoneInfo): 20 sizeof(basic::ZoneRule): 9 @@ -473,22 +478,23 @@ CPU: |--------------------------------------------------+----------| | EmptyLoop | 0.6 | |--------------------------------------------------+----------| -| LocalDate::forEpochDays() | 1.1 | -| LocalDate::toEpochDays() | 0.9 | +| LocalDate::forEpochDays() | 1.2 | +| LocalDate::toEpochDays() | 0.8 | | LocalDate::dayOfWeek() | 1.6 | -| OffsetDateTime::forEpochSeconds() | 1.9 | -| OffsetDateTime::toEpochSeconds() | 0.4 | +| OffsetDateTime::forEpochSeconds() | 2.0 | +| OffsetDateTime::toEpochSeconds() | 0.3 | | ZonedDateTime::toEpochSeconds() | 0.4 | -| ZonedDateTime::toEpochDays() | 0.2 | +| ZonedDateTime::toEpochDays() | 0.4 | | ZonedDateTime::forEpochSeconds(UTC) | 2.2 | -| ZonedDateTime::forEpochSeconds(Basic_nocache) | 30.6 | -| ZonedDateTime::forEpochSeconds(Basic_cached) | 6.3 | -| ZonedDateTime::forEpochSeconds(Extended_nocache) | 68.9 | -| ZonedDateTime::forEpochSeconds(Extended_cached) | 5.8 | -| BasicZoneManager::indexForZoneName(binary) | 11.2 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 30.2 | +| ZonedDateTime::forEpochSeconds(Basic_cached) | 5.6 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 67.3 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 5.4 | +| BasicZoneManager::indexForZoneName(binary) | 6.6 | +| BasicZoneManager::indexForZoneId(binary) | 2.6 | | BasicZoneManager::indexForZoneId(linear) | 25.6 | +--------------------------------------------------+----------+ -Iterations_per_run: 100000 +Iterations_per_run: 50000 ``` diff --git a/examples/AutoBenchmark/esp32.txt b/examples/AutoBenchmark/esp32.txt index 63c9af5c6..6ff1b8842 100644 --- a/examples/AutoBenchmark/esp32.txt +++ b/examples/AutoBenchmark/esp32.txt @@ -6,10 +6,10 @@ sizeof(TimeOffset): 2 sizeof(OffsetDateTime): 8 sizeof(BasicZoneProcessor): 156 sizeof(ExtendedZoneProcessor): 532 -sizeof(BasicZoneRegistrar): 12 -sizeof(ExtendedZoneRegistrar): 12 -sizeof(BasicZoneManager<1>): 180 -sizeof(ExtendedZoneManager<1>): 556 +sizeof(BasicZoneRegistrar): 8 +sizeof(ExtendedZoneRegistrar): 8 +sizeof(BasicZoneManager<1>): 176 +sizeof(ExtendedZoneManager<1>): 552 sizeof(TimeZoneData): 8 sizeof(TimeZone): 12 sizeof(ZonedDateTime): 20 @@ -19,7 +19,7 @@ sizeof(clock::NtpClock): 116 sizeof(clock::SystemClock): 24 sizeof(clock::SystemClockLoop): 44 sizeof(clock::SystemClockCoroutine): 68 -sizeof(basic::ZoneContext): 8 +sizeof(basic::ZoneContext): 16 sizeof(basic::ZoneEra): 16 sizeof(basic::ZoneInfo): 20 sizeof(basic::ZoneRule): 9 @@ -30,16 +30,19 @@ sizeof(extended::ZoneMatch): 16 BENCHMARKS EmptyLoop 1.400 LocalDate::forEpochDays() 0.470 -LocalDate::toEpochDays() 0.410 -LocalDate::dayOfWeek() 0.410 +LocalDate::toEpochDays() 0.380 +LocalDate::dayOfWeek() 0.450 OffsetDateTime::forEpochSeconds() 0.930 -OffsetDateTime::toEpochSeconds() 1.430 +OffsetDateTime::toEpochSeconds() 1.420 ZonedDateTime::toEpochSeconds() 1.410 ZonedDateTime::toEpochDays() 1.070 -ZonedDateTime::forEpochSeconds(UTC) 1.210 -ZonedDateTime::forEpochSeconds(Basic_nocache) 15.330 -ZonedDateTime::forEpochSeconds(Basic_cached) 2.600 -ZonedDateTime::forEpochSeconds(Extended_nocache) 29.960 -ZonedDateTime::forEpochSeconds(Extended_cached) 2.530 +ZonedDateTime::forEpochSeconds(UTC) 1.220 +ZonedDateTime::forEpochSeconds(Basic_nocache) 15.260 +ZonedDateTime::forEpochSeconds(Basic_cached) 2.540 +ZonedDateTime::forEpochSeconds(Extended_nocache) 29.850 +ZonedDateTime::forEpochSeconds(Extended_cached) 2.450 +BasicZoneManager::indexForZoneName(binary) 3.100 +BasicZoneManager::indexForZoneId(binary) 0.700 +BasicZoneManager::indexForZoneId(linear) 13.930 Iterations_per_run 100000 END diff --git a/examples/AutoBenchmark/esp8266.txt b/examples/AutoBenchmark/esp8266.txt index 9d4c247c0..66753a70c 100644 --- a/examples/AutoBenchmark/esp8266.txt +++ b/examples/AutoBenchmark/esp8266.txt @@ -6,10 +6,10 @@ sizeof(TimeOffset): 2 sizeof(OffsetDateTime): 8 sizeof(BasicZoneProcessor): 156 sizeof(ExtendedZoneProcessor): 532 -sizeof(BasicZoneRegistrar): 12 -sizeof(ExtendedZoneRegistrar): 12 -sizeof(BasicZoneManager<1>): 180 -sizeof(ExtendedZoneManager<1>): 556 +sizeof(BasicZoneRegistrar): 8 +sizeof(ExtendedZoneRegistrar): 8 +sizeof(BasicZoneManager<1>): 176 +sizeof(ExtendedZoneManager<1>): 552 sizeof(TimeZoneData): 8 sizeof(TimeZone): 12 sizeof(ZonedDateTime): 20 @@ -19,7 +19,7 @@ sizeof(clock::NtpClock): 88 sizeof(clock::SystemClock): 24 sizeof(clock::SystemClockLoop): 44 sizeof(clock::SystemClockCoroutine): 68 -sizeof(basic::ZoneContext): 8 +sizeof(basic::ZoneContext): 16 sizeof(basic::ZoneEra): 16 sizeof(basic::ZoneInfo): 20 sizeof(basic::ZoneRule): 9 @@ -29,17 +29,20 @@ sizeof(extended::Transition): 52 sizeof(extended::ZoneMatch): 16 BENCHMARKS EmptyLoop 5.100 -LocalDate::forEpochDays() 7.800 +LocalDate::forEpochDays() 7.700 LocalDate::toEpochDays() 4.300 LocalDate::dayOfWeek() 4.100 OffsetDateTime::forEpochSeconds() 12.200 -OffsetDateTime::toEpochSeconds() 7.000 -ZonedDateTime::toEpochSeconds() 7.000 +OffsetDateTime::toEpochSeconds() 7.200 +ZonedDateTime::toEpochSeconds() 7.100 ZonedDateTime::toEpochDays() 6.000 -ZonedDateTime::forEpochSeconds(UTC) 13.100 -ZonedDateTime::forEpochSeconds(Basic_nocache) 97.700 +ZonedDateTime::forEpochSeconds(UTC) 13.400 +ZonedDateTime::forEpochSeconds(Basic_nocache) 115.400 ZonedDateTime::forEpochSeconds(Basic_cached) 27.100 -ZonedDateTime::forEpochSeconds(Extended_nocache) 177.100 -ZonedDateTime::forEpochSeconds(Extended_cached) 27.300 +ZonedDateTime::forEpochSeconds(Extended_nocache) 177.000 +ZonedDateTime::forEpochSeconds(Extended_cached) 27.200 +BasicZoneManager::indexForZoneName(binary) 17.100 +BasicZoneManager::indexForZoneId(binary) 9.000 +BasicZoneManager::indexForZoneId(linear) 154.200 Iterations_per_run 10000 END diff --git a/examples/AutoBenchmark/generate_readme.py b/examples/AutoBenchmark/generate_readme.py index 4b28241ed..72f0799fe 100755 --- a/examples/AutoBenchmark/generate_readme.py +++ b/examples/AutoBenchmark/generate_readme.py @@ -12,13 +12,14 @@ "./generate_table.awk < micro.txt", shell=True, text=True) samd_results = check_output( "./generate_table.awk < samd.txt", shell=True, text=True) +stm32_results = check_output( + "./generate_table.awk < stm32.txt", shell=True, text=True) esp8266_results = check_output( "./generate_table.awk < esp8266.txt", shell=True, text=True) esp32_results = check_output( "./generate_table.awk < esp32.txt", shell=True, text=True) -#teensy32_results = check_output( -# "./generate_table.awk < teensy32.txt", shell=True, text=True) -teensy32_results = 'TBD' +teensy32_results = check_output( + "./generate_table.awk < teensy32.txt", shell=True, text=True) print(f"""\ # Auto Benchmark @@ -27,7 +28,7 @@ These results show that integer division and modulus operations are incredibly slow on 8-bit AVR processors. -**Version**: AceTime v1.4 +**Version**: AceTime v1.5 **NOTE**: This file was auto-generated using `make README.md`. DO NOT EDIT. @@ -76,7 +77,16 @@ ## CPU Time Changes -The CPU time did not change much from v0.8 to v1.4. +* The CPU time did not change much from v0.8 to v1.4. +* The CPU time of most classes did not change much from v1.4 to v1.5. The + big difference is that the Zone registries (kZoneRegistry, + kZoneAndLinkRegistry) are now sorted by zoneId instead of zoneName, and the + `ZoneManager::indexForZoneId()` will use a binary search, instead of a linear + search. This makes it 10-15X faster for ~266 entries. The + `ZoneManager::indexForZoneName()` also converts to a zoneId, then performs a + binary search, instead of doing a binary search on the zoneName directly. Even + with the extra level of indirection, the `indexForZoneName()` is between + 1.5-2X faster than the previous version. ## Arduino Nano @@ -108,6 +118,16 @@ {samd_results} ``` +## STM32 Blue Pill + +* STM32F103C8, 72 MHz ARM Cortex-M3 +* Arduino IDE 1.8.13 +* STM32duino 1.9.0 + +``` +{stm32_results} +``` + ## ESP8266 * NodeMCU 1.0 clone, 80MHz ESP8266 diff --git a/examples/AutoBenchmark/micro.txt b/examples/AutoBenchmark/micro.txt index 6c22701bd..3561b7e06 100644 --- a/examples/AutoBenchmark/micro.txt +++ b/examples/AutoBenchmark/micro.txt @@ -18,9 +18,9 @@ sizeof(clock::DS3231Clock): 3 sizeof(clock::SystemClock): 17 sizeof(clock::SystemClockLoop): 34 sizeof(clock::SystemClockCoroutine): 43 -sizeof(basic::ZoneContext): 6 +sizeof(basic::ZoneContext): 9 sizeof(basic::ZoneEra): 11 -sizeof(basic::ZoneInfo): 12 +sizeof(basic::ZoneInfo): 11 sizeof(basic::ZoneRule): 9 sizeof(basic::ZonePolicy): 6 sizeof(basic::Transition): 21 @@ -29,16 +29,16 @@ sizeof(extended::ZoneMatch): 14 BENCHMARKS EmptyLoop 5.200 LocalDate::forEpochDays() 216.400 -LocalDate::toEpochDays() 57.600 -LocalDate::dayOfWeek() 50.800 +LocalDate::toEpochDays() 56.800 +LocalDate::dayOfWeek() 51.200 OffsetDateTime::forEpochSeconds() 320.800 OffsetDateTime::toEpochSeconds() 87.200 ZonedDateTime::toEpochSeconds() 87.200 ZonedDateTime::toEpochDays() 73.200 ZonedDateTime::forEpochSeconds(UTC) 336.000 -ZonedDateTime::forEpochSeconds(Basic_nocache) 1191.600 -ZonedDateTime::forEpochSeconds(Basic_cached) 627.600 -ZonedDateTime::forEpochSeconds(Extended_nocache) 2039.200 -ZonedDateTime::forEpochSeconds(Extended_cached) 627.600 +ZonedDateTime::forEpochSeconds(Basic_nocache) 1189.600 +ZonedDateTime::forEpochSeconds(Basic_cached) 625.600 +ZonedDateTime::forEpochSeconds(Extended_nocache) 2038.000 +ZonedDateTime::forEpochSeconds(Extended_cached) 626.000 Iterations_per_run 2500 END diff --git a/examples/AutoBenchmark/nano.txt b/examples/AutoBenchmark/nano.txt index cdeab7a3a..afbe87d19 100644 --- a/examples/AutoBenchmark/nano.txt +++ b/examples/AutoBenchmark/nano.txt @@ -18,9 +18,9 @@ sizeof(clock::DS3231Clock): 3 sizeof(clock::SystemClock): 17 sizeof(clock::SystemClockLoop): 34 sizeof(clock::SystemClockCoroutine): 43 -sizeof(basic::ZoneContext): 6 +sizeof(basic::ZoneContext): 9 sizeof(basic::ZoneEra): 11 -sizeof(basic::ZoneInfo): 12 +sizeof(basic::ZoneInfo): 11 sizeof(basic::ZoneRule): 9 sizeof(basic::ZonePolicy): 6 sizeof(basic::Transition): 21 @@ -33,12 +33,12 @@ LocalDate::toEpochDays() 56.800 LocalDate::dayOfWeek() 51.200 OffsetDateTime::forEpochSeconds() 318.800 OffsetDateTime::toEpochSeconds() 87.200 -ZonedDateTime::toEpochSeconds() 85.600 +ZonedDateTime::toEpochSeconds() 86.000 ZonedDateTime::toEpochDays() 73.200 ZonedDateTime::forEpochSeconds(UTC) 334.800 -ZonedDateTime::forEpochSeconds(Basic_nocache) 1185.600 -ZonedDateTime::forEpochSeconds(Basic_cached) 625.200 -ZonedDateTime::forEpochSeconds(Extended_nocache) 2028.400 -ZonedDateTime::forEpochSeconds(Extended_cached) 625.600 +ZonedDateTime::forEpochSeconds(Basic_nocache) 1183.600 +ZonedDateTime::forEpochSeconds(Basic_cached) 623.600 +ZonedDateTime::forEpochSeconds(Extended_nocache) 2027.600 +ZonedDateTime::forEpochSeconds(Extended_cached) 623.200 Iterations_per_run 2500 END diff --git a/examples/AutoBenchmark/samd.txt b/examples/AutoBenchmark/samd.txt index 0f7c221a8..6974d8a83 100644 --- a/examples/AutoBenchmark/samd.txt +++ b/examples/AutoBenchmark/samd.txt @@ -6,10 +6,10 @@ sizeof(TimeOffset): 2 sizeof(OffsetDateTime): 8 sizeof(BasicZoneProcessor): 156 sizeof(ExtendedZoneProcessor): 532 -sizeof(BasicZoneRegistrar): 12 -sizeof(ExtendedZoneRegistrar): 12 -sizeof(BasicZoneManager<1>): 180 -sizeof(ExtendedZoneManager<1>): 556 +sizeof(BasicZoneRegistrar): 8 +sizeof(ExtendedZoneRegistrar): 8 +sizeof(BasicZoneManager<1>): 176 +sizeof(ExtendedZoneManager<1>): 552 sizeof(TimeZoneData): 8 sizeof(TimeZone): 12 sizeof(ZonedDateTime): 20 @@ -18,7 +18,7 @@ sizeof(clock::DS3231Clock): 8 sizeof(clock::SystemClock): 24 sizeof(clock::SystemClockLoop): 44 sizeof(clock::SystemClockCoroutine): 68 -sizeof(basic::ZoneContext): 8 +sizeof(basic::ZoneContext): 16 sizeof(basic::ZoneEra): 16 sizeof(basic::ZoneInfo): 20 sizeof(basic::ZoneRule): 9 @@ -27,18 +27,21 @@ sizeof(basic::Transition): 28 sizeof(extended::Transition): 52 sizeof(extended::ZoneMatch): 16 BENCHMARKS -EmptyLoop 1.300 -LocalDate::forEpochDays() 23.200 -LocalDate::toEpochDays() 9.700 +EmptyLoop 1.400 +LocalDate::forEpochDays() 23.000 +LocalDate::toEpochDays() 9.600 LocalDate::dayOfWeek() 12.300 -OffsetDateTime::forEpochSeconds() 35.000 +OffsetDateTime::forEpochSeconds() 34.700 OffsetDateTime::toEpochSeconds() 17.100 -ZonedDateTime::toEpochSeconds() 18.200 -ZonedDateTime::toEpochDays() 16.300 -ZonedDateTime::forEpochSeconds(UTC) 41.300 -ZonedDateTime::forEpochSeconds(Basic_nocache) 235.200 -ZonedDateTime::forEpochSeconds(Basic_cached) 73.800 -ZonedDateTime::forEpochSeconds(Extended_nocache) 435.100 -ZonedDateTime::forEpochSeconds(Extended_cached) 74.100 +ZonedDateTime::toEpochSeconds() 18.300 +ZonedDateTime::toEpochDays() 16.100 +ZonedDateTime::forEpochSeconds(UTC) 41.100 +ZonedDateTime::forEpochSeconds(Basic_nocache) 235.700 +ZonedDateTime::forEpochSeconds(Basic_cached) 73.600 +ZonedDateTime::forEpochSeconds(Extended_nocache) 435.600 +ZonedDateTime::forEpochSeconds(Extended_cached) 73.800 +BasicZoneManager::indexForZoneName(binary) 14.900 +BasicZoneManager::indexForZoneId(binary) 4.000 +BasicZoneManager::indexForZoneId(linear) 55.600 Iterations_per_run 10000 END diff --git a/examples/AutoBenchmark/stm32.txt b/examples/AutoBenchmark/stm32.txt new file mode 100644 index 000000000..6b9d31b53 --- /dev/null +++ b/examples/AutoBenchmark/stm32.txt @@ -0,0 +1,47 @@ +SIZEOF +sizeof(LocalDate): 3 +sizeof(LocalTime): 3 +sizeof(LocalDateTime): 6 +sizeof(TimeOffset): 2 +sizeof(OffsetDateTime): 8 +sizeof(BasicZoneProcessor): 156 +sizeof(ExtendedZoneProcessor): 532 +sizeof(BasicZoneRegistrar): 8 +sizeof(ExtendedZoneRegistrar): 8 +sizeof(BasicZoneManager<1>): 176 +sizeof(ExtendedZoneManager<1>): 552 +sizeof(TimeZoneData): 8 +sizeof(TimeZone): 12 +sizeof(ZonedDateTime): 20 +sizeof(TimePeriod): 4 +sizeof(clock::DS3231Clock): 8 +sizeof(clock::SystemClock): 24 +sizeof(clock::SystemClockLoop): 44 +sizeof(clock::SystemClockCoroutine): 68 +sizeof(basic::ZoneContext): 16 +sizeof(basic::ZoneEra): 16 +sizeof(basic::ZoneInfo): 20 +sizeof(basic::ZoneRule): 9 +sizeof(basic::ZonePolicy): 12 +sizeof(basic::Transition): 28 +sizeof(extended::Transition): 52 +sizeof(extended::ZoneMatch): 16 +BENCHMARKS +EmptyLoop 1.200 +LocalDate::forEpochDays() 2.300 +LocalDate::toEpochDays() 1.000 +LocalDate::dayOfWeek() 1.200 +OffsetDateTime::forEpochSeconds() 3.500 +OffsetDateTime::toEpochSeconds() 4.400 +ZonedDateTime::toEpochSeconds() 4.300 +ZonedDateTime::toEpochDays() 3.100 +ZonedDateTime::forEpochSeconds(UTC) 4.800 +ZonedDateTime::forEpochSeconds(Basic_nocache) 71.500 +ZonedDateTime::forEpochSeconds(Basic_cached) 11.000 +ZonedDateTime::forEpochSeconds(Extended_nocache) 131.000 +ZonedDateTime::forEpochSeconds(Extended_cached) 10.700 +BasicZoneManager::indexForZoneName(binary) 11.900 +BasicZoneManager::indexForZoneId(binary) 3.200 +BasicZoneManager::indexForZoneId(linear) 44.200 +Iterations_per_run 10000 +END diff --git a/examples/AutoBenchmark/teensy32.txt b/examples/AutoBenchmark/teensy32.txt new file mode 100644 index 000000000..55cac9cd1 --- /dev/null +++ b/examples/AutoBenchmark/teensy32.txt @@ -0,0 +1,47 @@ +SIZEOF +sizeof(LocalDate): 3 +sizeof(LocalTime): 3 +sizeof(LocalDateTime): 6 +sizeof(TimeOffset): 2 +sizeof(OffsetDateTime): 8 +sizeof(BasicZoneProcessor): 156 +sizeof(ExtendedZoneProcessor): 532 +sizeof(BasicZoneRegistrar): 8 +sizeof(ExtendedZoneRegistrar): 8 +sizeof(BasicZoneManager<1>): 176 +sizeof(ExtendedZoneManager<1>): 552 +sizeof(TimeZoneData): 8 +sizeof(TimeZone): 12 +sizeof(ZonedDateTime): 20 +sizeof(TimePeriod): 4 +sizeof(clock::DS3231Clock): 8 +sizeof(clock::SystemClock): 24 +sizeof(clock::SystemClockLoop): 44 +sizeof(clock::SystemClockCoroutine): 68 +sizeof(basic::ZoneContext): 16 +sizeof(basic::ZoneEra): 16 +sizeof(basic::ZoneInfo): 20 +sizeof(basic::ZoneRule): 9 +sizeof(basic::ZonePolicy): 12 +sizeof(basic::Transition): 28 +sizeof(extended::Transition): 52 +sizeof(extended::ZoneMatch): 16 +BENCHMARKS +EmptyLoop 0.580 +LocalDate::forEpochDays() 1.240 +LocalDate::toEpochDays() 0.840 +LocalDate::dayOfWeek() 1.620 +OffsetDateTime::forEpochSeconds() 1.960 +OffsetDateTime::toEpochSeconds() 0.340 +ZonedDateTime::toEpochSeconds() 0.420 +ZonedDateTime::toEpochDays() 0.400 +ZonedDateTime::forEpochSeconds(UTC) 2.180 +ZonedDateTime::forEpochSeconds(Basic_nocache) 30.160 +ZonedDateTime::forEpochSeconds(Basic_cached) 5.560 +ZonedDateTime::forEpochSeconds(Extended_nocache) 67.280 +ZonedDateTime::forEpochSeconds(Extended_cached) 5.420 +BasicZoneManager::indexForZoneName(binary) 6.620 +BasicZoneManager::indexForZoneId(binary) 2.580 +BasicZoneManager::indexForZoneId(linear) 25.620 +Iterations_per_run 50000 +END From 8fd30f1150f7a2afa80e9d99a22126f187346e6e Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 26 Jan 2021 13:52:04 -0800 Subject: [PATCH 70/74] Bump version to 1.5; update CPU and Memory benchmark numbers --- CHANGELOG.md | 14 +++++---- README.md | 71 ++++++++++++++++++++++++++++++---------------- USER_GUIDE.md | 2 +- docs/doxygen.cfg | 2 +- library.properties | 2 +- src/AceTime.h | 4 +-- 6 files changed, 60 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85250c819..940984685 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog * Unreleased +* 1.5 * Use binary search for both `ZoneManager::createForZoneName()` and `ZoneManager::createForZoneId()`. * Previously, the `zone_registry.cpp` was sorted by zoneName, so only @@ -14,7 +15,7 @@ a final verification against the exact `zoneName` is performed to make sure that there was no hash collision. * Updated `AutoBenchmark.ino` to determine that a binary search on the - 386 zones in `zonedbx/zone_registry.cpp` is 9-10X faster (on average) + 266 zones in `zonedb/zone_registry.cpp` is 9-10X faster (on average) than a linear search through the same list. (Linear search takes ~190 iterations; binary search takes ~9 iterations.) * Upgrade Link entries to be "fat links". @@ -43,9 +44,11 @@ static memory buffers. * I expect almost no one to be using the `BasicZone` and `ExtendedZone` classes, since they are mostly useful for internal algorithms. - * Client code that needs the old functionality can print to a - `ace_common::PrintStr<>` object, then extract the c-string using - `PrintStr::getCstr()`. + * Client code that needs the old functionality can use + `BasicZone::printNameTo(Print&)`, + `BasicZone::printShortNameTo(Print&)` (similarly for `ExtendedZone`) + to print to a `ace_common::PrintStr<>` object, then extract the + c-string using `PrintStr::getCstr()`. * Update UnixHostDuino 0.4 to EpoxyDuino 0.5. * Explicitly blacklist megaAVR boards, and SAMD21 boards using `arduino:samd` Core >= 1.8.10. @@ -53,8 +56,7 @@ pages and pages of compiler errors. * Update TZ Database to 2021a. * https://mm.icann.org/pipermail/tz-announce/2021-January/000065.html - * "South Sudan changes from +03 to +02 on 2021-02-01 at 00:00. - (Thanks to Steffen Thorsen.)" + * "South Sudan changes from +03 to +02 on 2021-02-01 at 00:00." * 1.4.1 (2020-12-30, TZDB version 2020f for real) * Actually update `src/ace_time/zonedb` and `src/ace_time/zonedbx` zone info files to 2020f. Oops. diff --git a/README.md b/README.md index 288076f2d..31b481e57 100644 --- a/README.md +++ b/README.md @@ -49,13 +49,13 @@ C++ namespaces: * TZ Database zone files * data structures generated from the TZ Database zone files * intended to be used as opaque data objects - * `ace_time::zonedb` (270 zones and 182 links) + * `ace_time::zonedb` (266 zones and 183 links) * `ace_time::zonedb::kZoneAfrica_Abidjan` * `ace_time::zonedb::kZoneAfrica_Accra` * ... * `ace_time::zonedb::kZonePacific_Wake` * `ace_time::zonedb::kZonePacific_Wallis` - * `ace_time::zonedbx` (387 zones and 205 links) + * `ace_time::zonedbx` (386 zones and 207 links) * `ace_time::zonedbx::kZoneAfrica_Abidjan` * `ace_time::zonedbx::kZoneAfrica_Accra` * ... @@ -124,7 +124,7 @@ The library provides 2 sets of zoneinfo files created from the IANA TZ Database: from the year 2000 until 2050. These zones have (relatively) simple time zone transition rules, which can handled by the `BasicZoneProcessor` class. * [zonedbx/zone_infos.h](src/ace_time/zonedbx/zone_infos.h) contains `kZone*` - declarations (e.g. `kZoneAfrica_Casablanca`) for 387 zones and 205 links in + declarations (e.g. `kZoneAfrica_Casablanca`) for 386 zones and 207 links in the TZ Database (essentially the entire database) from the year 2000 until 2050. These are intended to be used with the `ExtendedZoneProcessor` class. @@ -187,20 +187,30 @@ time. The zoneinfo files are stored in flash memory (using the `PROGMEM` compiler directive) if the microcontroller allows it (e.g. AVR, ESP8266) so that they do not consume static RAM. The -[examples/MemoryBenchmark](examples/MemoryBenchmark/) program shows that: - -* 270 timezones supported by `BasicZoneProcessor`consume about: - * 15 kB of flash on an 8-bit processor (AVR) - * 20 kB of flash on a 32-bit processor (ESP8266) -* 387 timezones supported by `ExtendedZoneProcessor` consume: - * 24 kB of flash on an 8-bit processor (AVR) - * 33 kB of flash on a 32-bit processor (ESP8266) +[examples/MemoryBenchmark](examples/MemoryBenchmark/) program shows the +flash memory consumption for the ZoneInfo data files are: + +* `BasicZoneProcessor` + * 266 Zones + * 13 kB (8-bit processor) + * 17 kB (32-bit processor) + * 266 Zones and 183 Links + * 22 kB (8-bit processor) + * 27 kB (32-bit processor) +* `ExtendedZoneProcessor` + * 386 Zones + * 22 kB (8-bit processor) + * 30 kB (32-bit processor) + * 386 Zones and 207 Links + * 30 kB (8-bit processor) + * 37 kB (32-bit processor) Normally a small application will use only a small number of timezones. The AceTime library with one timezone using the `BasicZoneProcessor` and the `SystemClock` consumes: -* 9-10 kB of flash and 350 bytes of RAM on an 8-bit AVR processors, -* 6-22 kB of flash and 900-1800 bytes of RAM on a 32-bit processors. + +* 9-10 kB of flash and 4-500 bytes of RAM on an 8-bit AVR processors, +* 6-23 kB of flash and 900-1800 bytes of RAM on a 32-bit processors. An example of more complex application is the WorldClock (https://github.com/bxparks/clocks/tree/master/WorldClock) @@ -212,21 +222,34 @@ debouncing and event dispatching provided by the AceButton Conversion from date-time components (year, month, day, etc) to epochSeconds (`ZonedDateTime::toEpochSeconds()`) takes about: -* 90 microseconds on an 8-bit AVR processor, -* 14 microseconds on an SAMD21, -* 7 microseconds on an ESP8266, -* 1.4 microseconds on an ESP32, -* 0.5 microseconds on a Teensy 3.2. + +* ~90 microseconds on an 8-bit AVR processor, +* ~17 microseconds on a SAMD21, +* ~4 microseconds on an STM32 Blue Pill, +* ~7 microseconds on an ESP8266, +* ~1.4 microseconds on an ESP32, +* ~0.4 microseconds on a Teensy 3.2. Conversion from an epochSeconds to date-time components including timezone (`ZonedDateTime::forEpochSeconds()`) takes (assuming cache hits): -* 600 microseconds on an 8-bit AVR, -* 50 microseconds on an SAMD21, -* 27 microseconds on an ESP8266, -* 2.8 microseconds on an ESP32, -* 6 microseconds on a Teensy 3.2. -**Version**: 1.4.1 (2020-12-30, TZ DB version 2020f) +* ~600 microseconds on an 8-bit AVR, +* ~70 microseconds on an SAMD21, +* ~10-11 microseconds on an STM32 Blue Pill, +* ~27 microseconds on an ESP8266, +* ~2.5 microseconds on an ESP32, +* ~5-6 microseconds on a Teensy 3.2. + +The creation of a TimeZone from its zoneName or its zoneId through the +`ZoneManager`, using the 266 entries of `zonedb::kZoneRegistry`, takes about: + +* 4-14 microseconds, for a SAMD21 +* 3-12 microseconds for an STM32 Blue Pill, +* 9-17 microseconds for an ESP8266, +* 0.7-3 microseconds for an ESP32, +* 3-7 microseconds for a Teensy 3.2. + +**Version**: 1.5 (2021-01-26, TZ DB version 2021a) **Changelog**: [CHANGELOG.md](CHANGELOG.md) diff --git a/USER_GUIDE.md b/USER_GUIDE.md index dfef85ffb..b1e7603ad 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -2,7 +2,7 @@ See the [README.md](README.md) for introductory background. -**Version**: 1.4.1 (2020-12-30, TZ DB version 2020f) +**Version**: 1.5 (2021-01-26, TZ DB version 2021a) ## Table of Contents diff --git a/docs/doxygen.cfg b/docs/doxygen.cfg index 4267c54de..3953d4934 100644 --- a/docs/doxygen.cfg +++ b/docs/doxygen.cfg @@ -38,7 +38,7 @@ PROJECT_NAME = "AceTime" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.4.1 +PROJECT_NUMBER = 1.5 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/library.properties b/library.properties index cb7aca979..495aa1a7b 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=AceTime -version=1.4.1 +version=1.5 author=Brian T. Park maintainer=Brian T. Park sentence=Date, time, clock, and TZ Database timezones for Arduino. diff --git a/src/AceTime.h b/src/AceTime.h index ad417d6fb..fbf3d12d5 100644 --- a/src/AceTime.h +++ b/src/AceTime.h @@ -73,7 +73,7 @@ // Version format: xxyyzz == "xx.yy.zz" -#define ACE_TIME_VERSION 10401 -#define ACE_TIME_VERSION_STRING "1.4.1" +#define ACE_TIME_VERSION 10500 +#define ACE_TIME_VERSION_STRING "1.5" #endif From 684c2ad411308d86a348e36fb4d4608e0e70b331 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 26 Jan 2021 18:14:04 -0800 Subject: [PATCH 71/74] AutoBenchmark: Use custom ZoneRegistry of 85 zones to enable all benchmarks on Nano and Pro Micro wi/ only 32kB of flash; fix incorrect extraction of ZoneInfo stored in PROGMEM; simplify lambdas to allow passing as a function pointer --- README.md | 15 +- examples/AutoBenchmark/AutoBenchmark.ino | 6 +- examples/AutoBenchmark/Benchmark.cpp | 371 ++++++++++++----------- examples/AutoBenchmark/README.md | 212 ++++++------- examples/AutoBenchmark/esp32.txt | 34 +-- examples/AutoBenchmark/esp8266.txt | 30 +- examples/AutoBenchmark/micro.txt | 31 +- examples/AutoBenchmark/nano.txt | 31 +- examples/AutoBenchmark/samd.txt | 32 +- examples/AutoBenchmark/stm32.txt | 30 +- examples/AutoBenchmark/teensy32.txt | 30 +- examples/AutoBenchmark/zone_registry.cpp | 101 ++++++ examples/AutoBenchmark/zone_registry.h | 14 + 13 files changed, 539 insertions(+), 398 deletions(-) create mode 100644 examples/AutoBenchmark/zone_registry.cpp create mode 100644 examples/AutoBenchmark/zone_registry.h diff --git a/README.md b/README.md index 31b481e57..e823a9638 100644 --- a/README.md +++ b/README.md @@ -223,7 +223,7 @@ debouncing and event dispatching provided by the AceButton Conversion from date-time components (year, month, day, etc) to epochSeconds (`ZonedDateTime::toEpochSeconds()`) takes about: -* ~90 microseconds on an 8-bit AVR processor, +* ~90 microseconds on an 8-bit AVR, * ~17 microseconds on a SAMD21, * ~4 microseconds on an STM32 Blue Pill, * ~7 microseconds on an ESP8266, @@ -240,14 +240,15 @@ Conversion from an epochSeconds to date-time components including timezone * ~2.5 microseconds on an ESP32, * ~5-6 microseconds on a Teensy 3.2. -The creation of a TimeZone from its zoneName or its zoneId through the -`ZoneManager`, using the 266 entries of `zonedb::kZoneRegistry`, takes about: +The creation of a TimeZone from its zoneName or its zoneId using a +`BasicZoneManager` configured with a custom ZoneRegistry with 85 zones takes: +* 36-400 microseconds, for an 8-bit AVR, * 4-14 microseconds, for a SAMD21 -* 3-12 microseconds for an STM32 Blue Pill, -* 9-17 microseconds for an ESP8266, -* 0.7-3 microseconds for an ESP32, -* 3-7 microseconds for a Teensy 3.2. +* 3-18 microseconds for an STM32 Blue Pill, +* 7-50 microseconds for an ESP8266, +* 0.6-3 microseconds for an ESP32, +* 3-10 microseconds for a Teensy 3.2. **Version**: 1.5 (2021-01-26, TZ DB version 2021a) diff --git a/examples/AutoBenchmark/AutoBenchmark.ino b/examples/AutoBenchmark/AutoBenchmark.ino index b9f03c9b7..d81f1fd99 100644 --- a/examples/AutoBenchmark/AutoBenchmark.ino +++ b/examples/AutoBenchmark/AutoBenchmark.ino @@ -20,7 +20,7 @@ void setup() { SERIAL_PORT_MONITOR.begin(115200); while (!SERIAL_PORT_MONITOR); // Wait until ready - Leonardo/Micro - SERIAL_PORT_MONITOR.println("SIZEOF"); + SERIAL_PORT_MONITOR.println(F("SIZEOF")); // print sizeof() various ace_time primitives @@ -116,9 +116,9 @@ void setup() { SERIAL_PORT_MONITOR.print(F("sizeof(extended::ZoneMatch): ")); SERIAL_PORT_MONITOR.println(sizeof(extended::ZoneMatch)); - SERIAL_PORT_MONITOR.println("BENCHMARKS"); + SERIAL_PORT_MONITOR.println(F("BENCHMARKS")); runBenchmarks(); - SERIAL_PORT_MONITOR.println("END"); + SERIAL_PORT_MONITOR.println(F("END")); #if defined(EPOXY_DUINO) exit(0); diff --git a/examples/AutoBenchmark/Benchmark.cpp b/examples/AutoBenchmark/Benchmark.cpp index 101c0b07c..9c776ac7d 100644 --- a/examples/AutoBenchmark/Benchmark.cpp +++ b/examples/AutoBenchmark/Benchmark.cpp @@ -1,15 +1,49 @@ +/* + * Here are various attempts to reduce program size to < 32kB so that this can + * run on an Arduino Nano w/ only 32kB of flash. + * + * * Sketch uses 36830 bytes (119%) of program storage space. Maximum is 30720 + * bytes. (original, with 266 Basic zones) + * + * * Sketch uses 36378 bytes (118%) of program storage space. Maximum is 30720 + * bytes (after converting Lambda to function pointer). + * + * * Sketch uses 36074 bytes (117%) of program storage space. Maximum is 30720 + * bytes. (after creating common printResult()). + * + * * Sketch uses 35898 bytes (116%) of program storage space. Maximum is 30720 + * bytes. (after commenting out runLocalDateForEpochDays() and + * runLocalDateToEpochDays(), reverted). + * + * * Sketch uses 28136 bytes (91%) of program storage space. Maximum is 30720 + * bytes. (After creating a custom kBenchmarkZoneRegistry with only 83 zones.) + * + * * Sketch uses 28036 bytes (91%) of program storage space. Maximum is 30720 + * bytes. (After moving elapsedMillis calculation into printResult(). + * + * * Sketch uses 27990 bytes (91%) of program storage space. Maximum is 30720 + * bytes. (After replacing 2 zones with America/Denver and + * America/Los_Angeles, since they are already used in the kBasicZoneRegistry + * anyway. + * + * * Sketch uses 26298 bytes (85%) of program storage space. Maximum is 30720 + * bytes. (After replace BasicZoneManager and ExtendedZoneManager with + * BasicZoneProcessor and ExtendedZoneProcessor, since the ZoneManagers were + * not needed for the benchmark.) + */ + #include #include -#include #include // PrintStr #include #include "Benchmark.h" +#include "zone_registry.h" using namespace ace_time; using ace_common::PrintStr; #if defined(ARDUINO_ARCH_AVR) -const uint32_t COUNT = 2500; +const uint32_t COUNT = 1000; #elif defined(ARDUINO_ARCH_SAMD) const uint32_t COUNT = 10000; #elif defined(ARDUINO_ARCH_STM32) @@ -22,7 +56,7 @@ const uint32_t COUNT = 50000; const uint32_t COUNT = 50000; #elif defined(EPOXY_DUINO) // Linux or MacOS -const uint32_t COUNT = 100000; +const uint32_t COUNT = 50000; #else // A generic Arduino board that we have not looked at. const uint32_t COUNT = 10000; @@ -30,14 +64,6 @@ const uint32_t COUNT = 10000; const uint32_t MILLIS_TO_NANO_PER_ITERATION = ((uint32_t) 1000000 / COUNT); -// The FPSTR() macro converts these (const char*) into (const -// __FlashHelperString*) so that the correct version of println() or print() is -// called. ESP8266 and ESP32 already define this. AVR and Teensy do not. -#ifndef FPSTR -#define FPSTR(pstr_pointer) \ - (reinterpret_cast(pstr_pointer)) -#endif - // The compiler is extremelly good about removing code that does nothing. This // volatile variable is used to create side-effects that prevent the compiler // from optimizing out the code that's being tested. Each disableOptimization() @@ -73,22 +99,20 @@ void disableOptimization(const OffsetDateTime& dt) { } void disableOptimization(uint32_t value) { - // Two temp variables allows 2 more XOR operations, for a total of 6. - uint8_t tmp1, tmp2; - guard ^= value & 0xff; guard ^= (value >> 8) & 0xff; - guard ^= (tmp1 = (value >> 16) & 0xff); - guard ^= (tmp2 = (value >> 24) & 0xff); - guard ^= tmp1; - guard ^= tmp2; + guard ^= (value >> 16) & 0xff; + guard ^= (value >> 24) & 0xff; } +// Type declaration of the Lambda. +typedef void (*Lambda)(); + // A small helper that runs the given lamba expression in a loop // and returns how long it took. -template -unsigned long runLambda(uint32_t count, F&& lambda) { +unsigned long runLambda(Lambda lambda) { yield(); + uint32_t count = COUNT; unsigned long startMillis = millis(); while (count--) { lambda(); @@ -119,9 +143,20 @@ static void printMicrosPerIteration(long elapsedMillis) { ace_common::printPad3To(SERIAL_PORT_MONITOR, frac, '0'); } +static void printResult( + const __FlashStringHelper* label, + unsigned long benchmarkMillis, + unsigned long baselineMillis +) { + long elapsedMillis = benchmarkMillis - baselineMillis; + SERIAL_PORT_MONITOR.print(label); + printMicrosPerIteration(elapsedMillis < 0 ? 0 : elapsedMillis); + SERIAL_PORT_MONITOR.println(); +} + // Return how long the empty lookup takes. unsigned long runEmptyLoopMillis() { - return runLambda(COUNT, []() { + return runLambda([]() { unsigned long tickMillis = millis(); disableOptimization(tickMillis); }); @@ -129,297 +164,277 @@ unsigned long runEmptyLoopMillis() { static void runEmptyLoop() { unsigned long emptyLoopMillis = runEmptyLoopMillis(); - SERIAL_PORT_MONITOR.print(F("EmptyLoop")); - printMicrosPerIteration(emptyLoopMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("EmptyLoop"), emptyLoopMillis, 0); } // LocalDate::forEpochDays() static void runLocalDateForEpochDays() { - unsigned long localDateForDaysMillis = runLambda(COUNT, []() { + unsigned long localDateForDaysMillis = runLambda([]() { unsigned long fakeEpochDays = millis(); LocalDate localDate = LocalDate::forEpochDays(fakeEpochDays); disableOptimization(localDate); }); unsigned long emptyLoopMillis = runEmptyLoopMillis(); - long elapsedMillis = localDateForDaysMillis - emptyLoopMillis; - SERIAL_PORT_MONITOR.print(F("LocalDate::forEpochDays()")); - printMicrosPerIteration(elapsedMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("LocalDate::forEpochDays()"), localDateForDaysMillis, + emptyLoopMillis); } // LocalDate::toEpochDays() static void runLocalDateToEpochDays() { - unsigned long localDateToEpochDaysMillis = runLambda(COUNT, []() { + unsigned long localDateToEpochDaysMillis = runLambda([]() { unsigned long fakeEpochDays = millis(); LocalDate localDate = LocalDate::forEpochDays(fakeEpochDays); acetime_t epochDays = localDate.toEpochDays(); disableOptimization(epochDays); }); - unsigned long forEpochDaysMillis = runLambda(COUNT, []() { + unsigned long forEpochDaysMillis = runLambda([]() { unsigned long fakeEpochDays = millis(); LocalDate localDate = LocalDate::forEpochDays(fakeEpochDays); disableOptimization(localDate); }); - long elapsedMillis = localDateToEpochDaysMillis - forEpochDaysMillis; - SERIAL_PORT_MONITOR.print(F("LocalDate::toEpochDays()")); - printMicrosPerIteration(elapsedMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("LocalDate::toEpochDays()"), localDateToEpochDaysMillis, + forEpochDaysMillis); } // LocalDate::dayOfWeek() static void runLocalDateDaysOfWeek() { - unsigned long localDateDayOfWeekMillis = runLambda(COUNT, []() { + unsigned long localDateDayOfWeekMillis = runLambda([]() { unsigned long fakeEpochDays = millis(); LocalDate localDate = LocalDate::forEpochDays(fakeEpochDays); uint8_t dayOfWeek = localDate.dayOfWeek(); disableOptimization(localDate); disableOptimization(dayOfWeek); }); - unsigned long forEpochDaysMillis = runLambda(COUNT, []() { + unsigned long forEpochDaysMillis = runLambda([]() { unsigned long fakeEpochDays = millis(); LocalDate localDate = LocalDate::forEpochDays(fakeEpochDays); disableOptimization(localDate); }); - long elapsedMillis = localDateDayOfWeekMillis - forEpochDaysMillis; - SERIAL_PORT_MONITOR.print(F("LocalDate::dayOfWeek()")); - printMicrosPerIteration(elapsedMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("LocalDate::dayOfWeek()"), localDateDayOfWeekMillis, + forEpochDaysMillis); } // OffsetDateTime::forEpochSeconds() static void runOffsetDateTimeForEpochSeconds() { - unsigned long localDateForDaysMillis = runLambda(COUNT, []() { + unsigned long localDateForDaysMillis = runLambda([]() { unsigned long fakeEpochSeconds = millis(); OffsetDateTime odt = OffsetDateTime::forEpochSeconds( fakeEpochSeconds, TimeOffset()); disableOptimization(odt); }); unsigned long emptyLoopMillis = runEmptyLoopMillis(); - long elapsedMillis = localDateForDaysMillis - emptyLoopMillis; - SERIAL_PORT_MONITOR.print(F("OffsetDateTime::forEpochSeconds()")); - printMicrosPerIteration(elapsedMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("OffsetDateTime::forEpochSeconds()"), localDateForDaysMillis, + emptyLoopMillis); } // OffsetDateTime::toEpochSeconds() static void runOffsetDateTimeToEpochSeconds() { - unsigned long localDateToEpochDaysMillis = runLambda(COUNT, []() { + unsigned long localDateToEpochDaysMillis = runLambda([]() { unsigned long fakeEpochSeconds = millis(); OffsetDateTime odt = OffsetDateTime::forEpochSeconds( fakeEpochSeconds, TimeOffset()); acetime_t epochDays = odt.toEpochSeconds(); disableOptimization(epochDays); }); - unsigned long forEpochDaysMillis = runLambda(COUNT, []() { + unsigned long forEpochDaysMillis = runLambda([]() { unsigned long fakeEpochSeconds = millis(); OffsetDateTime odt = OffsetDateTime::forEpochSeconds( fakeEpochSeconds, TimeOffset()); disableOptimization(odt); }); - long elapsedMillis = localDateToEpochDaysMillis - forEpochDaysMillis; - SERIAL_PORT_MONITOR.print(F("OffsetDateTime::toEpochSeconds()")); - printMicrosPerIteration(elapsedMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("OffsetDateTime::toEpochSeconds()"), localDateToEpochDaysMillis, + forEpochDaysMillis); } // ZonedDateTime::forEpochSeconds(seconds) static void runZonedDateTimeForEpochSeconds() { - unsigned long forEpochSecondsMillis = runLambda(COUNT, []() { + unsigned long forEpochSecondsMillis = runLambda([]() { unsigned long fakeEpochDays = millis(); ZonedDateTime dateTime = ZonedDateTime::forEpochSeconds(fakeEpochDays, TimeZone()); disableOptimization(dateTime); }); unsigned long emptyLoopMillis = runEmptyLoopMillis(); - long elapsedMillis = forEpochSecondsMillis - emptyLoopMillis; - SERIAL_PORT_MONITOR.print(F("ZonedDateTime::forEpochSeconds(UTC)")); - printMicrosPerIteration(elapsedMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("ZonedDateTime::forEpochSeconds(UTC)"), forEpochSecondsMillis, + emptyLoopMillis); } // ZonedDateTime::toEpochDays() static void runZonedDateTimeToEpochDays() { - unsigned long toEpochDaysMillis = runLambda(COUNT, []() { + unsigned long toEpochDaysMillis = runLambda([]() { unsigned long fakeEpochDays = millis(); ZonedDateTime dateTime = ZonedDateTime::forEpochSeconds(fakeEpochDays, TimeZone()); acetime_t epochDays = dateTime.toEpochDays(); disableOptimization(epochDays); }); - unsigned long forEpochSecondsMillis = runLambda(COUNT, []() { + unsigned long forEpochSecondsMillis = runLambda([]() { unsigned long fakeEpochDays = millis(); ZonedDateTime dateTime = ZonedDateTime::forEpochSeconds(fakeEpochDays, TimeZone()); disableOptimization(dateTime); }); - long elapsedMillis = toEpochDaysMillis - forEpochSecondsMillis; - SERIAL_PORT_MONITOR.print(F("ZonedDateTime::toEpochDays()")); - printMicrosPerIteration(elapsedMillis < 0 ? 0 : elapsedMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("ZonedDateTime::toEpochDays()"), toEpochDaysMillis, + forEpochSecondsMillis); } // ZonedDateTime::toEpochSeconds() static void runZonedDateTimeToEpochSeconds() { - unsigned long toEpochSecondsMillis = runLambda(COUNT, []() { + unsigned long toEpochSecondsMillis = runLambda([]() { unsigned long tickMillis = millis(); ZonedDateTime dateTime = ZonedDateTime::forEpochSeconds(tickMillis, TimeZone()); acetime_t epochSeconds = dateTime.toEpochSeconds(); disableOptimization(epochSeconds); }); - unsigned long forEpochSecondsMillis = runLambda(COUNT, []() { + unsigned long forEpochSecondsMillis = runLambda([]() { unsigned long fakeEpochDays = millis(); ZonedDateTime dateTime = ZonedDateTime::forEpochSeconds(fakeEpochDays, TimeZone()); disableOptimization(dateTime); }); - long elapsedMillis = toEpochSecondsMillis - forEpochSecondsMillis; - SERIAL_PORT_MONITOR.print(F("ZonedDateTime::toEpochSeconds()")); - printMicrosPerIteration(elapsedMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("ZonedDateTime::toEpochSeconds()"), toEpochSecondsMillis, + forEpochSecondsMillis); } +// Epoch seconds offset alternating between 0 and kTwoYears on each iterations, +// used to prevent caching to obtain benchmarking number without caching. +static acetime_t offset = 0; static const acetime_t kTwoYears = 2 * 365 * 24 * 3600L; -static const basic::ZoneInfo* const kBasicZoneRegistry[] ACE_TIME_PROGMEM = { - &zonedb::kZoneAmerica_Chicago, - &zonedb::kZoneAmerica_Denver, - &zonedb::kZoneAmerica_Los_Angeles, - &zonedb::kZoneAmerica_New_York, -}; - -static const uint16_t kBasicZoneRegistrySize = - sizeof(kBasicZoneRegistry) / sizeof(kBasicZoneRegistry[0]); +// Pointer to BasicZoneManager and ExtendedZoneManager, whose actual instances +// are created within the specific test on the stack. These global variables +// allows the lamba functions below to avoid captures, which allows passing the +// lambdas into runLambda() as a function pointer, which I hope lowers the +// flash memory consumption of this program enough to run on a 32kB Arduino +// Nano. +static BasicZoneProcessor* basicZoneProcessor; +static ExtendedZoneProcessor* extendedZoneProcessor; // ZonedDateTime::forEpochSeconds(seconds, tz), uncached static void runZonedDateTimeForEpochSecondsBasicZoneManager() { - BasicZoneManager<1> manager(kBasicZoneRegistrySize, kBasicZoneRegistry); - acetime_t offset = 0; + BasicZoneProcessor processor; + basicZoneProcessor = &processor; + offset = 0; - unsigned long forEpochSecondsMillis = runLambda(COUNT, [&offset, &manager]() { + unsigned long forEpochSecondsMillis = runLambda([]() { offset = (offset) ? 0 : kTwoYears; unsigned long fakeEpochSeconds = millis() + offset; - TimeZone tzLosAngeles = manager.createForZoneInfo( - &zonedb::kZoneAmerica_Los_Angeles); + TimeZone tzLosAngeles = TimeZone::forZoneInfo( + &zonedb::kZoneAmerica_Los_Angeles, + basicZoneProcessor); ZonedDateTime dateTime = ZonedDateTime::forEpochSeconds( fakeEpochSeconds, tzLosAngeles); disableOptimization(dateTime); }); unsigned long emptyLoopMillis = runEmptyLoopMillis(); - long elapsedMillis = forEpochSecondsMillis - emptyLoopMillis; - SERIAL_PORT_MONITOR.print(F("ZonedDateTime::forEpochSeconds(Basic_nocache)")); - printMicrosPerIteration(elapsedMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("ZonedDateTime::forEpochSeconds(Basic_nocache)"), + forEpochSecondsMillis, emptyLoopMillis); } // ZonedDateTime::forEpochSeconds(seconds, tz) cached static void runZonedDateTimeForEpochSecondsBasicZoneManagerCached() { - BasicZoneManager<1> manager(kBasicZoneRegistrySize, kBasicZoneRegistry); + BasicZoneProcessor processor; + basicZoneProcessor = &processor; - unsigned long forEpochSecondsMillis = runLambda(COUNT, [&manager]() { + unsigned long forEpochSecondsMillis = runLambda([]() { unsigned long fakeEpochSeconds = millis(); - TimeZone tzLosAngeles = manager.createForZoneInfo( - &zonedb::kZoneAmerica_Los_Angeles); + TimeZone tzLosAngeles = TimeZone::forZoneInfo( + &zonedb::kZoneAmerica_Los_Angeles, + basicZoneProcessor); ZonedDateTime dateTime = ZonedDateTime::forEpochSeconds( fakeEpochSeconds, tzLosAngeles); disableOptimization(dateTime); }); unsigned long emptyLoopMillis = runEmptyLoopMillis(); - long elapsedMillis = forEpochSecondsMillis - emptyLoopMillis; - SERIAL_PORT_MONITOR.print(F("ZonedDateTime::forEpochSeconds(Basic_cached)")); - printMicrosPerIteration(elapsedMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("ZonedDateTime::forEpochSeconds(Basic_cached)"), + forEpochSecondsMillis, emptyLoopMillis); } -static const extended::ZoneInfo* const kExtendedZoneRegistry[] - ACE_TIME_PROGMEM = { - &zonedbx::kZoneAmerica_Chicago, - &zonedbx::kZoneAmerica_Denver, - &zonedbx::kZoneAmerica_Los_Angeles, - &zonedbx::kZoneAmerica_New_York, -}; - -static const uint16_t kExtendedZoneRegistrySize = - sizeof(kExtendedZoneRegistry) / sizeof(kExtendedZoneRegistry[0]); - // ZonedDateTime::forEpochSeconds(seconds, tz), uncached static void runZonedDateTimeForEpochSecondsExtendedZoneManager() { - ExtendedZoneManager<1> manager( - kExtendedZoneRegistrySize, kExtendedZoneRegistry); - acetime_t offset = 0; + ExtendedZoneProcessor processor; + extendedZoneProcessor = &processor; + offset = 0; - unsigned long forEpochSecondsMillis = runLambda(COUNT, [&offset, &manager]() { + unsigned long forEpochSecondsMillis = runLambda([]() { offset = (offset) ? 0 : kTwoYears; unsigned long fakeEpochSeconds = millis() + offset; - TimeZone tzLosAngeles = manager.createForZoneInfo( - &zonedbx::kZoneAmerica_Los_Angeles); + TimeZone tzLosAngeles = TimeZone::forZoneInfo( + &zonedbx::kZoneAmerica_Los_Angeles, + extendedZoneProcessor); ZonedDateTime dateTime = ZonedDateTime::forEpochSeconds( fakeEpochSeconds, tzLosAngeles); disableOptimization(dateTime); }); unsigned long emptyLoopMillis = runEmptyLoopMillis(); - long elapsedMillis = forEpochSecondsMillis - emptyLoopMillis; - SERIAL_PORT_MONITOR.print( - F("ZonedDateTime::forEpochSeconds(Extended_nocache)")); - printMicrosPerIteration(elapsedMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("ZonedDateTime::forEpochSeconds(Extended_nocache)"), + forEpochSecondsMillis, emptyLoopMillis); } -// ZonedDateTime::forEpochSeconds(seconds, tz) cached ExtendedZoneManager +// ZonedDateTime::forEpochSeconds(seconds, tz) cached static void runZonedDateTimeForEpochSecondsExtendedZoneManagerCached() { - ExtendedZoneManager<1> manager( - kExtendedZoneRegistrySize, kExtendedZoneRegistry); + ExtendedZoneProcessor processor; + extendedZoneProcessor = &processor; - unsigned long forEpochSecondsMillis = runLambda(COUNT, [&manager]() { + unsigned long forEpochSecondsMillis = runLambda([]() { unsigned long fakeEpochSeconds = millis(); - TimeZone tzLosAngeles = manager.createForZoneInfo( - &zonedbx::kZoneAmerica_Los_Angeles); + TimeZone tzLosAngeles = TimeZone::forZoneInfo( + &zonedbx::kZoneAmerica_Los_Angeles, + extendedZoneProcessor); ZonedDateTime dateTime = ZonedDateTime::forEpochSeconds( fakeEpochSeconds, tzLosAngeles); disableOptimization(dateTime); }); unsigned long emptyLoopMillis = runEmptyLoopMillis(); - long elapsedMillis = forEpochSecondsMillis - emptyLoopMillis; - SERIAL_PORT_MONITOR.print( - F("ZonedDateTime::forEpochSeconds(Extended_cached)")); - printMicrosPerIteration(elapsedMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("ZonedDateTime::forEpochSeconds(Extended_cached)"), + forEpochSecondsMillis, emptyLoopMillis); } -// These are too big for small AVR chips -#if ! defined(ARDUINO_ARCH_AVR) +// This sketch is small enough to run on an Arduino Nano with about ~32kB. It +// currently squeezes just under the ~30kB limit for a SparkFun Pro Micro. +// "Sketch uses 28394 bytes (99%) of program storage space. Maximum is 28672 +// bytes." +//#if ! defined(ARDUINO_AVR_PROMICRO) -static void runIndexForZoneName() { - BasicZoneRegistrar registrar( - zonedb::kZoneRegistrySize, zonedb::kZoneRegistry); +BasicZoneRegistrar* basicRegistrar; - unsigned long runMillis = runLambda(COUNT, [®istrar]() { - PrintStr<20> printStr; // deliberately short to truncate some zones - uint16_t randomIndex = random(zonedb::kZoneRegistrySize); - const basic::ZoneInfo* info = zonedb::kZoneRegistry[randomIndex]; +static void runIndexForZoneName() { + BasicZoneRegistrar registrar(kBenchmarkZoneRegistrySize, + kBenchmarkZoneRegistry); + basicRegistrar = ®istrar; + + unsigned long runMillis = runLambda([]() { + PrintStr<40> printStr; + uint16_t randomIndex = random(kBenchmarkZoneRegistrySize); + const basic::ZoneInfo* info = basicRegistrar->getZoneInfoForIndex( + randomIndex); BasicZone(info).printNameTo(printStr); - uint16_t index = registrar.findIndexForName(printStr.getCstr()); + uint16_t index = basicRegistrar->findIndexForName(printStr.getCstr()); + if (index == BasicZoneRegistrar::kInvalidIndex) { + SERIAL_PORT_MONITOR.println(F("Not found")); + } disableOptimization(index); }); - unsigned long emptyLoopMillis = runLambda(COUNT, []() { - PrintStr<20> printStr; // deliberately short to truncate some zones - uint16_t randomIndex = random(zonedb::kZoneRegistrySize); - const basic::ZoneInfo* info = zonedb::kZoneRegistry[randomIndex]; + unsigned long emptyLoopMillis = runLambda([]() { + PrintStr<40> printStr; + uint16_t randomIndex = random(kBenchmarkZoneRegistrySize); + const basic::ZoneInfo* info = basicRegistrar->getZoneInfoForIndex( + randomIndex); BasicZone(info).printNameTo(printStr); uint16_t len = printStr.length(); @@ -431,72 +446,70 @@ static void runIndexForZoneName() { disableOptimization((uint32_t) tmp); }); - long elapsedMillis = runMillis - emptyLoopMillis; - - SERIAL_PORT_MONITOR.print(F("BasicZoneManager::indexForZoneName(binary)")); - printMicrosPerIteration(elapsedMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("BasicZoneManager::indexForZoneName(binary)"), runMillis, + emptyLoopMillis); } // non-static to allow friend access into BasicZoneRegistrar void runIndexForZoneIdBinary() { - BasicZoneRegistrar registrar( - zonedb::kZoneRegistrySize, zonedb::kZoneRegistry); - - unsigned long runMillis = runLambda(COUNT, [®istrar]() { - uint16_t randomIndex = random(zonedb::kZoneRegistrySize); - const basic::ZoneInfo* info = zonedb::kZoneRegistry[randomIndex]; + BasicZoneRegistrar registrar(kBenchmarkZoneRegistrySize, + kBenchmarkZoneRegistry); + basicRegistrar = ®istrar; + + unsigned long runMillis = runLambda([]() { + uint16_t randomIndex = random(kBenchmarkZoneRegistrySize); + const basic::ZoneInfo* info = basicRegistrar->getZoneInfoForIndex( + randomIndex); uint32_t zoneId = BasicZone(info).zoneId(); - uint16_t index = registrar.findIndexForIdBinary(zoneId); + uint16_t index = basicRegistrar->findIndexForIdBinary(zoneId); + if (index == BasicZoneRegistrar::kInvalidIndex) { + SERIAL_PORT_MONITOR.println(F("Not found")); + } disableOptimization(index); }); - unsigned long emptyLoopMillis = runLambda(COUNT, []() { - uint16_t randomIndex = random(zonedb::kZoneRegistrySize); - const basic::ZoneInfo* info = zonedb::kZoneRegistry[randomIndex]; + unsigned long emptyLoopMillis = runLambda([]() { + uint16_t randomIndex = random(kBenchmarkZoneRegistrySize); + const basic::ZoneInfo* info = basicRegistrar->getZoneInfoForIndex( + randomIndex); uint32_t zoneId = BasicZone(info).zoneId(); disableOptimization(zoneId); }); - long elapsedMillis = runMillis - emptyLoopMillis; - - SERIAL_PORT_MONITOR.print(F("BasicZoneManager::indexForZoneId(binary)")); - printMicrosPerIteration(elapsedMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("BasicZoneManager::indexForZoneId(binary)"), runMillis, + emptyLoopMillis); } // non-static to allow friend access into BasicZoneRegistrar void runIndexForZoneIdLinear() { - BasicZoneRegistrar registrar( - zonedb::kZoneRegistrySize, zonedb::kZoneRegistry); + BasicZoneRegistrar registrar(kBenchmarkZoneRegistrySize, + kBenchmarkZoneRegistry); + basicRegistrar = ®istrar; - unsigned long runMillis = runLambda(COUNT, [®istrar]() { - uint16_t randomIndex = random(zonedb::kZoneRegistrySize); - const basic::ZoneInfo* info = zonedb::kZoneRegistry[randomIndex]; + unsigned long runMillis = runLambda([]() { + uint16_t randomIndex = random(kBenchmarkZoneRegistrySize); + const basic::ZoneInfo* info = kBenchmarkZoneRegistry[randomIndex]; uint32_t zoneId = BasicZone(info).zoneId(); - uint16_t index = registrar.findIndexForIdLinear(zoneId); + uint16_t index = basicRegistrar->findIndexForIdLinear(zoneId); disableOptimization(index); }); - unsigned long emptyLoopMillis = runLambda(COUNT, []() { - uint16_t randomIndex = random(zonedb::kZoneRegistrySize); - const basic::ZoneInfo* info = zonedb::kZoneRegistry[randomIndex]; + unsigned long emptyLoopMillis = runLambda([]() { + uint16_t randomIndex = random(kBenchmarkZoneRegistrySize); + const basic::ZoneInfo* info = kBenchmarkZoneRegistry[randomIndex]; uint32_t zoneId = BasicZone(info).zoneId(); disableOptimization(zoneId); }); - long elapsedMillis = runMillis - emptyLoopMillis; - - SERIAL_PORT_MONITOR.print(F("BasicZoneManager::indexForZoneId(linear)")); - printMicrosPerIteration(elapsedMillis); - SERIAL_PORT_MONITOR.println(); + printResult(F("BasicZoneManager::indexForZoneId(linear)"), runMillis, + emptyLoopMillis); } -#endif // defined(ARDUINO_ARCH_AVR) +//#endif // defined(ARDUINO_AVR_PROMICRO) void runBenchmarks() { runEmptyLoop(); @@ -517,11 +530,11 @@ void runBenchmarks() { runZonedDateTimeForEpochSecondsExtendedZoneManager(); runZonedDateTimeForEpochSecondsExtendedZoneManagerCached(); -#if ! defined(ARDUINO_ARCH_AVR) +//#if ! defined(ARDUINO_AVR_PROMICRO) runIndexForZoneName(); runIndexForZoneIdBinary(); runIndexForZoneIdLinear(); -#endif +//#endif SERIAL_PORT_MONITOR.print(F("Iterations_per_run ")); SERIAL_PORT_MONITOR.println(COUNT); diff --git a/examples/AutoBenchmark/README.md b/examples/AutoBenchmark/README.md index fc591a238..31140d337 100644 --- a/examples/AutoBenchmark/README.md +++ b/examples/AutoBenchmark/README.md @@ -104,22 +104,25 @@ CPU: +--------------------------------------------------+----------+ | Method | micros | |--------------------------------------------------+----------| -| EmptyLoop | 6.0 | +| EmptyLoop | 5.0 | |--------------------------------------------------+----------| -| LocalDate::forEpochDays() | 215.6 | -| LocalDate::toEpochDays() | 56.8 | -| LocalDate::dayOfWeek() | 51.2 | -| OffsetDateTime::forEpochSeconds() | 318.8 | -| OffsetDateTime::toEpochSeconds() | 87.2 | -| ZonedDateTime::toEpochSeconds() | 86.0 | -| ZonedDateTime::toEpochDays() | 73.2 | -| ZonedDateTime::forEpochSeconds(UTC) | 334.8 | -| ZonedDateTime::forEpochSeconds(Basic_nocache) | 1183.6 | -| ZonedDateTime::forEpochSeconds(Basic_cached) | 623.6 | -| ZonedDateTime::forEpochSeconds(Extended_nocache) | 2027.6 | -| ZonedDateTime::forEpochSeconds(Extended_cached) | 623.2 | +| LocalDate::forEpochDays() | 219.0 | +| LocalDate::toEpochDays() | 55.0 | +| LocalDate::dayOfWeek() | 50.0 | +| OffsetDateTime::forEpochSeconds() | 324.0 | +| OffsetDateTime::toEpochSeconds() | 86.0 | +| ZonedDateTime::toEpochSeconds() | 83.0 | +| ZonedDateTime::toEpochDays() | 73.0 | +| ZonedDateTime::forEpochSeconds(UTC) | 338.0 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 1180.0 | +| ZonedDateTime::forEpochSeconds(Basic_cached) | 617.0 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 2022.0 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 618.0 | +| BasicZoneManager::indexForZoneName(binary) | 110.0 | +| BasicZoneManager::indexForZoneId(binary) | 36.0 | +| BasicZoneManager::indexForZoneId(linear) | 392.0 | +--------------------------------------------------+----------+ -Iterations_per_run: 2500 +Iterations_per_run: 1000 ``` @@ -163,22 +166,25 @@ CPU: +--------------------------------------------------+----------+ | Method | micros | |--------------------------------------------------+----------| -| EmptyLoop | 5.2 | +| EmptyLoop | 3.0 | |--------------------------------------------------+----------| -| LocalDate::forEpochDays() | 216.4 | -| LocalDate::toEpochDays() | 56.8 | -| LocalDate::dayOfWeek() | 51.2 | -| OffsetDateTime::forEpochSeconds() | 320.8 | -| OffsetDateTime::toEpochSeconds() | 87.2 | -| ZonedDateTime::toEpochSeconds() | 87.2 | -| ZonedDateTime::toEpochDays() | 73.2 | -| ZonedDateTime::forEpochSeconds(UTC) | 336.0 | -| ZonedDateTime::forEpochSeconds(Basic_nocache) | 1189.6 | -| ZonedDateTime::forEpochSeconds(Basic_cached) | 625.6 | -| ZonedDateTime::forEpochSeconds(Extended_nocache) | 2038.0 | -| ZonedDateTime::forEpochSeconds(Extended_cached) | 626.0 | +| LocalDate::forEpochDays() | 219.0 | +| LocalDate::toEpochDays() | 56.0 | +| LocalDate::dayOfWeek() | 49.0 | +| OffsetDateTime::forEpochSeconds() | 325.0 | +| OffsetDateTime::toEpochSeconds() | 85.0 | +| ZonedDateTime::toEpochSeconds() | 83.0 | +| ZonedDateTime::toEpochDays() | 72.0 | +| ZonedDateTime::forEpochSeconds(UTC) | 341.0 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 1187.0 | +| ZonedDateTime::forEpochSeconds(Basic_cached) | 619.0 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 2034.0 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 621.0 | +| BasicZoneManager::indexForZoneName(binary) | 110.0 | +| BasicZoneManager::indexForZoneId(binary) | 38.0 | +| BasicZoneManager::indexForZoneId(linear) | 398.0 | +--------------------------------------------------+----------+ -Iterations_per_run: 2500 +Iterations_per_run: 1000 ``` @@ -222,23 +228,23 @@ CPU: +--------------------------------------------------+----------+ | Method | micros | |--------------------------------------------------+----------| -| EmptyLoop | 1.4 | +| EmptyLoop | 1.3 | |--------------------------------------------------+----------| -| LocalDate::forEpochDays() | 23.0 | -| LocalDate::toEpochDays() | 9.6 | -| LocalDate::dayOfWeek() | 12.3 | -| OffsetDateTime::forEpochSeconds() | 34.7 | -| OffsetDateTime::toEpochSeconds() | 17.1 | -| ZonedDateTime::toEpochSeconds() | 18.3 | -| ZonedDateTime::toEpochDays() | 16.1 | -| ZonedDateTime::forEpochSeconds(UTC) | 41.1 | -| ZonedDateTime::forEpochSeconds(Basic_nocache) | 235.7 | -| ZonedDateTime::forEpochSeconds(Basic_cached) | 73.6 | -| ZonedDateTime::forEpochSeconds(Extended_nocache) | 435.6 | -| ZonedDateTime::forEpochSeconds(Extended_cached) | 73.8 | -| BasicZoneManager::indexForZoneName(binary) | 14.9 | -| BasicZoneManager::indexForZoneId(binary) | 4.0 | -| BasicZoneManager::indexForZoneId(linear) | 55.6 | +| LocalDate::forEpochDays() | 23.7 | +| LocalDate::toEpochDays() | 9.4 | +| LocalDate::dayOfWeek() | 12.2 | +| OffsetDateTime::forEpochSeconds() | 35.3 | +| OffsetDateTime::toEpochSeconds() | 16.6 | +| ZonedDateTime::toEpochSeconds() | 18.1 | +| ZonedDateTime::toEpochDays() | 15.8 | +| ZonedDateTime::forEpochSeconds(UTC) | 41.4 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 234.5 | +| ZonedDateTime::forEpochSeconds(Basic_cached) | 73.0 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 435.8 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 73.2 | +| BasicZoneManager::indexForZoneName(binary) | 15.5 | +| BasicZoneManager::indexForZoneId(binary) | 3.5 | +| BasicZoneManager::indexForZoneId(linear) | 14.4 | +--------------------------------------------------+----------+ Iterations_per_run: 10000 @@ -284,23 +290,23 @@ CPU: +--------------------------------------------------+----------+ | Method | micros | |--------------------------------------------------+----------| -| EmptyLoop | 1.2 | +| EmptyLoop | 1.1 | |--------------------------------------------------+----------| -| LocalDate::forEpochDays() | 2.3 | -| LocalDate::toEpochDays() | 1.0 | +| LocalDate::forEpochDays() | 2.5 | +| LocalDate::toEpochDays() | 0.8 | | LocalDate::dayOfWeek() | 1.2 | -| OffsetDateTime::forEpochSeconds() | 3.5 | -| OffsetDateTime::toEpochSeconds() | 4.4 | -| ZonedDateTime::toEpochSeconds() | 4.3 | -| ZonedDateTime::toEpochDays() | 3.1 | -| ZonedDateTime::forEpochSeconds(UTC) | 4.8 | -| ZonedDateTime::forEpochSeconds(Basic_nocache) | 71.5 | -| ZonedDateTime::forEpochSeconds(Basic_cached) | 11.0 | -| ZonedDateTime::forEpochSeconds(Extended_nocache) | 131.0 | -| ZonedDateTime::forEpochSeconds(Extended_cached) | 10.7 | -| BasicZoneManager::indexForZoneName(binary) | 11.9 | -| BasicZoneManager::indexForZoneId(binary) | 3.2 | -| BasicZoneManager::indexForZoneId(linear) | 44.2 | +| OffsetDateTime::forEpochSeconds() | 3.6 | +| OffsetDateTime::toEpochSeconds() | 4.2 | +| ZonedDateTime::toEpochSeconds() | 4.2 | +| ZonedDateTime::toEpochDays() | 3.3 | +| ZonedDateTime::forEpochSeconds(UTC) | 4.9 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 66.3 | +| ZonedDateTime::forEpochSeconds(Basic_cached) | 10.3 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 128.4 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 10.1 | +| BasicZoneManager::indexForZoneName(binary) | 11.8 | +| BasicZoneManager::indexForZoneId(binary) | 2.6 | +| BasicZoneManager::indexForZoneId(linear) | 17.9 | +--------------------------------------------------+----------+ Iterations_per_run: 10000 @@ -347,23 +353,23 @@ CPU: +--------------------------------------------------+----------+ | Method | micros | |--------------------------------------------------+----------| -| EmptyLoop | 5.1 | +| EmptyLoop | 5.0 | |--------------------------------------------------+----------| -| LocalDate::forEpochDays() | 7.7 | -| LocalDate::toEpochDays() | 4.3 | -| LocalDate::dayOfWeek() | 4.1 | -| OffsetDateTime::forEpochSeconds() | 12.2 | -| OffsetDateTime::toEpochSeconds() | 7.2 | -| ZonedDateTime::toEpochSeconds() | 7.1 | -| ZonedDateTime::toEpochDays() | 6.0 | +| LocalDate::forEpochDays() | 7.9 | +| LocalDate::toEpochDays() | 4.1 | +| LocalDate::dayOfWeek() | 4.0 | +| OffsetDateTime::forEpochSeconds() | 12.3 | +| OffsetDateTime::toEpochSeconds() | 7.0 | +| ZonedDateTime::toEpochSeconds() | 6.9 | +| ZonedDateTime::toEpochDays() | 5.9 | | ZonedDateTime::forEpochSeconds(UTC) | 13.4 | -| ZonedDateTime::forEpochSeconds(Basic_nocache) | 115.4 | -| ZonedDateTime::forEpochSeconds(Basic_cached) | 27.1 | -| ZonedDateTime::forEpochSeconds(Extended_nocache) | 177.0 | -| ZonedDateTime::forEpochSeconds(Extended_cached) | 27.2 | -| BasicZoneManager::indexForZoneName(binary) | 17.1 | -| BasicZoneManager::indexForZoneId(binary) | 9.0 | -| BasicZoneManager::indexForZoneId(linear) | 154.2 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 97.2 | +| ZonedDateTime::forEpochSeconds(Basic_cached) | 26.5 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 200.2 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 26.6 | +| BasicZoneManager::indexForZoneName(binary) | 15.9 | +| BasicZoneManager::indexForZoneId(binary) | 7.4 | +| BasicZoneManager::indexForZoneId(linear) | 50.6 | +--------------------------------------------------+----------+ Iterations_per_run: 10000 @@ -412,23 +418,23 @@ CPU: |--------------------------------------------------+----------| | EmptyLoop | 1.4 | |--------------------------------------------------+----------| -| LocalDate::forEpochDays() | 0.5 | -| LocalDate::toEpochDays() | 0.4 | -| LocalDate::dayOfWeek() | 0.5 | -| OffsetDateTime::forEpochSeconds() | 0.9 | -| OffsetDateTime::toEpochSeconds() | 1.4 | -| ZonedDateTime::toEpochSeconds() | 1.4 | -| ZonedDateTime::toEpochDays() | 1.1 | -| ZonedDateTime::forEpochSeconds(UTC) | 1.2 | -| ZonedDateTime::forEpochSeconds(Basic_nocache) | 15.3 | +| LocalDate::forEpochDays() | 0.6 | +| LocalDate::toEpochDays() | 0.3 | +| LocalDate::dayOfWeek() | 0.3 | +| OffsetDateTime::forEpochSeconds() | 1.0 | +| OffsetDateTime::toEpochSeconds() | 1.3 | +| ZonedDateTime::toEpochSeconds() | 1.3 | +| ZonedDateTime::toEpochDays() | 1.0 | +| ZonedDateTime::forEpochSeconds(UTC) | 1.3 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 15.5 | | ZonedDateTime::forEpochSeconds(Basic_cached) | 2.5 | -| ZonedDateTime::forEpochSeconds(Extended_nocache) | 29.9 | -| ZonedDateTime::forEpochSeconds(Extended_cached) | 2.5 | -| BasicZoneManager::indexForZoneName(binary) | 3.1 | -| BasicZoneManager::indexForZoneId(binary) | 0.7 | -| BasicZoneManager::indexForZoneId(linear) | 13.9 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 30.1 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 2.4 | +| BasicZoneManager::indexForZoneName(binary) | 2.9 | +| BasicZoneManager::indexForZoneId(binary) | 0.6 | +| BasicZoneManager::indexForZoneId(linear) | 2.6 | +--------------------------------------------------+----------+ -Iterations_per_run: 100000 +Iterations_per_run: 50000 ``` @@ -476,23 +482,23 @@ CPU: +--------------------------------------------------+----------+ | Method | micros | |--------------------------------------------------+----------| -| EmptyLoop | 0.6 | +| EmptyLoop | 0.4 | |--------------------------------------------------+----------| -| LocalDate::forEpochDays() | 1.2 | -| LocalDate::toEpochDays() | 0.8 | -| LocalDate::dayOfWeek() | 1.6 | -| OffsetDateTime::forEpochSeconds() | 2.0 | +| LocalDate::forEpochDays() | 1.9 | +| LocalDate::toEpochDays() | 0.1 | +| LocalDate::dayOfWeek() | 1.0 | +| OffsetDateTime::forEpochSeconds() | 2.5 | | OffsetDateTime::toEpochSeconds() | 0.3 | -| ZonedDateTime::toEpochSeconds() | 0.4 | -| ZonedDateTime::toEpochDays() | 0.4 | -| ZonedDateTime::forEpochSeconds(UTC) | 2.2 | -| ZonedDateTime::forEpochSeconds(Basic_nocache) | 30.2 | -| ZonedDateTime::forEpochSeconds(Basic_cached) | 5.6 | -| ZonedDateTime::forEpochSeconds(Extended_nocache) | 67.3 | -| ZonedDateTime::forEpochSeconds(Extended_cached) | 5.4 | +| ZonedDateTime::toEpochSeconds() | 0.3 | +| ZonedDateTime::toEpochDays() | 0.2 | +| ZonedDateTime::forEpochSeconds(UTC) | 2.5 | +| ZonedDateTime::forEpochSeconds(Basic_nocache) | 30.0 | +| ZonedDateTime::forEpochSeconds(Basic_cached) | 6.0 | +| ZonedDateTime::forEpochSeconds(Extended_nocache) | 67.6 | +| ZonedDateTime::forEpochSeconds(Extended_cached) | 5.8 | | BasicZoneManager::indexForZoneName(binary) | 6.6 | -| BasicZoneManager::indexForZoneId(binary) | 2.6 | -| BasicZoneManager::indexForZoneId(linear) | 25.6 | +| BasicZoneManager::indexForZoneId(binary) | 2.3 | +| BasicZoneManager::indexForZoneId(linear) | 10.5 | +--------------------------------------------------+----------+ Iterations_per_run: 50000 diff --git a/examples/AutoBenchmark/esp32.txt b/examples/AutoBenchmark/esp32.txt index 6ff1b8842..de70a345f 100644 --- a/examples/AutoBenchmark/esp32.txt +++ b/examples/AutoBenchmark/esp32.txt @@ -28,21 +28,21 @@ sizeof(basic::Transition): 28 sizeof(extended::Transition): 52 sizeof(extended::ZoneMatch): 16 BENCHMARKS -EmptyLoop 1.400 -LocalDate::forEpochDays() 0.470 -LocalDate::toEpochDays() 0.380 -LocalDate::dayOfWeek() 0.450 -OffsetDateTime::forEpochSeconds() 0.930 -OffsetDateTime::toEpochSeconds() 1.420 -ZonedDateTime::toEpochSeconds() 1.410 -ZonedDateTime::toEpochDays() 1.070 -ZonedDateTime::forEpochSeconds(UTC) 1.220 -ZonedDateTime::forEpochSeconds(Basic_nocache) 15.260 -ZonedDateTime::forEpochSeconds(Basic_cached) 2.540 -ZonedDateTime::forEpochSeconds(Extended_nocache) 29.850 -ZonedDateTime::forEpochSeconds(Extended_cached) 2.450 -BasicZoneManager::indexForZoneName(binary) 3.100 -BasicZoneManager::indexForZoneId(binary) 0.700 -BasicZoneManager::indexForZoneId(linear) 13.930 -Iterations_per_run 100000 +EmptyLoop 1.380 +LocalDate::forEpochDays() 0.560 +LocalDate::toEpochDays() 0.300 +LocalDate::dayOfWeek() 0.340 +OffsetDateTime::forEpochSeconds() 1.040 +OffsetDateTime::toEpochSeconds() 1.300 +ZonedDateTime::toEpochSeconds() 1.280 +ZonedDateTime::toEpochDays() 0.960 +ZonedDateTime::forEpochSeconds(UTC) 1.320 +ZonedDateTime::forEpochSeconds(Basic_nocache) 15.460 +ZonedDateTime::forEpochSeconds(Basic_cached) 2.500 +ZonedDateTime::forEpochSeconds(Extended_nocache) 30.100 +ZonedDateTime::forEpochSeconds(Extended_cached) 2.440 +BasicZoneManager::indexForZoneName(binary) 2.940 +BasicZoneManager::indexForZoneId(binary) 0.600 +BasicZoneManager::indexForZoneId(linear) 2.560 +Iterations_per_run 50000 END diff --git a/examples/AutoBenchmark/esp8266.txt b/examples/AutoBenchmark/esp8266.txt index 66753a70c..750772606 100644 --- a/examples/AutoBenchmark/esp8266.txt +++ b/examples/AutoBenchmark/esp8266.txt @@ -28,21 +28,21 @@ sizeof(basic::Transition): 28 sizeof(extended::Transition): 52 sizeof(extended::ZoneMatch): 16 BENCHMARKS -EmptyLoop 5.100 -LocalDate::forEpochDays() 7.700 -LocalDate::toEpochDays() 4.300 -LocalDate::dayOfWeek() 4.100 -OffsetDateTime::forEpochSeconds() 12.200 -OffsetDateTime::toEpochSeconds() 7.200 -ZonedDateTime::toEpochSeconds() 7.100 -ZonedDateTime::toEpochDays() 6.000 +EmptyLoop 5.000 +LocalDate::forEpochDays() 7.900 +LocalDate::toEpochDays() 4.100 +LocalDate::dayOfWeek() 4.000 +OffsetDateTime::forEpochSeconds() 12.300 +OffsetDateTime::toEpochSeconds() 7.000 +ZonedDateTime::toEpochSeconds() 6.900 +ZonedDateTime::toEpochDays() 5.900 ZonedDateTime::forEpochSeconds(UTC) 13.400 -ZonedDateTime::forEpochSeconds(Basic_nocache) 115.400 -ZonedDateTime::forEpochSeconds(Basic_cached) 27.100 -ZonedDateTime::forEpochSeconds(Extended_nocache) 177.000 -ZonedDateTime::forEpochSeconds(Extended_cached) 27.200 -BasicZoneManager::indexForZoneName(binary) 17.100 -BasicZoneManager::indexForZoneId(binary) 9.000 -BasicZoneManager::indexForZoneId(linear) 154.200 +ZonedDateTime::forEpochSeconds(Basic_nocache) 97.200 +ZonedDateTime::forEpochSeconds(Basic_cached) 26.500 +ZonedDateTime::forEpochSeconds(Extended_nocache) 200.200 +ZonedDateTime::forEpochSeconds(Extended_cached) 26.600 +BasicZoneManager::indexForZoneName(binary) 15.900 +BasicZoneManager::indexForZoneId(binary) 7.400 +BasicZoneManager::indexForZoneId(linear) 50.600 Iterations_per_run 10000 END diff --git a/examples/AutoBenchmark/micro.txt b/examples/AutoBenchmark/micro.txt index 3561b7e06..6c069b724 100644 --- a/examples/AutoBenchmark/micro.txt +++ b/examples/AutoBenchmark/micro.txt @@ -27,18 +27,21 @@ sizeof(basic::Transition): 21 sizeof(extended::Transition): 46 sizeof(extended::ZoneMatch): 14 BENCHMARKS -EmptyLoop 5.200 -LocalDate::forEpochDays() 216.400 -LocalDate::toEpochDays() 56.800 -LocalDate::dayOfWeek() 51.200 -OffsetDateTime::forEpochSeconds() 320.800 -OffsetDateTime::toEpochSeconds() 87.200 -ZonedDateTime::toEpochSeconds() 87.200 -ZonedDateTime::toEpochDays() 73.200 -ZonedDateTime::forEpochSeconds(UTC) 336.000 -ZonedDateTime::forEpochSeconds(Basic_nocache) 1189.600 -ZonedDateTime::forEpochSeconds(Basic_cached) 625.600 -ZonedDateTime::forEpochSeconds(Extended_nocache) 2038.000 -ZonedDateTime::forEpochSeconds(Extended_cached) 626.000 -Iterations_per_run 2500 +EmptyLoop 3.000 +LocalDate::forEpochDays() 219.000 +LocalDate::toEpochDays() 56.000 +LocalDate::dayOfWeek() 49.000 +OffsetDateTime::forEpochSeconds() 325.000 +OffsetDateTime::toEpochSeconds() 85.000 +ZonedDateTime::toEpochSeconds() 83.000 +ZonedDateTime::toEpochDays() 72.000 +ZonedDateTime::forEpochSeconds(UTC) 341.000 +ZonedDateTime::forEpochSeconds(Basic_nocache) 1187.000 +ZonedDateTime::forEpochSeconds(Basic_cached) 619.000 +ZonedDateTime::forEpochSeconds(Extended_nocache) 2034.000 +ZonedDateTime::forEpochSeconds(Extended_cached) 621.000 +BasicZoneManager::indexForZoneName(binary) 110.000 +BasicZoneManager::indexForZoneId(binary) 38.000 +BasicZoneManager::indexForZoneId(linear) 398.000 +Iterations_per_run 1000 END diff --git a/examples/AutoBenchmark/nano.txt b/examples/AutoBenchmark/nano.txt index afbe87d19..30536662f 100644 --- a/examples/AutoBenchmark/nano.txt +++ b/examples/AutoBenchmark/nano.txt @@ -27,18 +27,21 @@ sizeof(basic::Transition): 21 sizeof(extended::Transition): 46 sizeof(extended::ZoneMatch): 14 BENCHMARKS -EmptyLoop 6.000 -LocalDate::forEpochDays() 215.600 -LocalDate::toEpochDays() 56.800 -LocalDate::dayOfWeek() 51.200 -OffsetDateTime::forEpochSeconds() 318.800 -OffsetDateTime::toEpochSeconds() 87.200 -ZonedDateTime::toEpochSeconds() 86.000 -ZonedDateTime::toEpochDays() 73.200 -ZonedDateTime::forEpochSeconds(UTC) 334.800 -ZonedDateTime::forEpochSeconds(Basic_nocache) 1183.600 -ZonedDateTime::forEpochSeconds(Basic_cached) 623.600 -ZonedDateTime::forEpochSeconds(Extended_nocache) 2027.600 -ZonedDateTime::forEpochSeconds(Extended_cached) 623.200 -Iterations_per_run 2500 +EmptyLoop 5.000 +LocalDate::forEpochDays() 219.000 +LocalDate::toEpochDays() 55.000 +LocalDate::dayOfWeek() 50.000 +OffsetDateTime::forEpochSeconds() 324.000 +OffsetDateTime::toEpochSeconds() 86.000 +ZonedDateTime::toEpochSeconds() 83.000 +ZonedDateTime::toEpochDays() 73.000 +ZonedDateTime::forEpochSeconds(UTC) 338.000 +ZonedDateTime::forEpochSeconds(Basic_nocache) 1180.000 +ZonedDateTime::forEpochSeconds(Basic_cached) 617.000 +ZonedDateTime::forEpochSeconds(Extended_nocache) 2022.000 +ZonedDateTime::forEpochSeconds(Extended_cached) 618.000 +BasicZoneManager::indexForZoneName(binary) 110.000 +BasicZoneManager::indexForZoneId(binary) 36.000 +BasicZoneManager::indexForZoneId(linear) 392.000 +Iterations_per_run 1000 END diff --git a/examples/AutoBenchmark/samd.txt b/examples/AutoBenchmark/samd.txt index 6974d8a83..abfc0d999 100644 --- a/examples/AutoBenchmark/samd.txt +++ b/examples/AutoBenchmark/samd.txt @@ -27,21 +27,21 @@ sizeof(basic::Transition): 28 sizeof(extended::Transition): 52 sizeof(extended::ZoneMatch): 16 BENCHMARKS -EmptyLoop 1.400 -LocalDate::forEpochDays() 23.000 -LocalDate::toEpochDays() 9.600 -LocalDate::dayOfWeek() 12.300 -OffsetDateTime::forEpochSeconds() 34.700 -OffsetDateTime::toEpochSeconds() 17.100 -ZonedDateTime::toEpochSeconds() 18.300 -ZonedDateTime::toEpochDays() 16.100 -ZonedDateTime::forEpochSeconds(UTC) 41.100 -ZonedDateTime::forEpochSeconds(Basic_nocache) 235.700 -ZonedDateTime::forEpochSeconds(Basic_cached) 73.600 -ZonedDateTime::forEpochSeconds(Extended_nocache) 435.600 -ZonedDateTime::forEpochSeconds(Extended_cached) 73.800 -BasicZoneManager::indexForZoneName(binary) 14.900 -BasicZoneManager::indexForZoneId(binary) 4.000 -BasicZoneManager::indexForZoneId(linear) 55.600 +EmptyLoop 1.300 +LocalDate::forEpochDays() 23.700 +LocalDate::toEpochDays() 9.400 +LocalDate::dayOfWeek() 12.200 +OffsetDateTime::forEpochSeconds() 35.300 +OffsetDateTime::toEpochSeconds() 16.600 +ZonedDateTime::toEpochSeconds() 18.100 +ZonedDateTime::toEpochDays() 15.800 +ZonedDateTime::forEpochSeconds(UTC) 41.400 +ZonedDateTime::forEpochSeconds(Basic_nocache) 234.500 +ZonedDateTime::forEpochSeconds(Basic_cached) 73.000 +ZonedDateTime::forEpochSeconds(Extended_nocache) 435.800 +ZonedDateTime::forEpochSeconds(Extended_cached) 73.200 +BasicZoneManager::indexForZoneName(binary) 15.500 +BasicZoneManager::indexForZoneId(binary) 3.500 +BasicZoneManager::indexForZoneId(linear) 14.400 Iterations_per_run 10000 END diff --git a/examples/AutoBenchmark/stm32.txt b/examples/AutoBenchmark/stm32.txt index 6b9d31b53..ab2bbd7e5 100644 --- a/examples/AutoBenchmark/stm32.txt +++ b/examples/AutoBenchmark/stm32.txt @@ -27,21 +27,21 @@ sizeof(basic::Transition): 28 sizeof(extended::Transition): 52 sizeof(extended::ZoneMatch): 16 BENCHMARKS -EmptyLoop 1.200 -LocalDate::forEpochDays() 2.300 -LocalDate::toEpochDays() 1.000 +EmptyLoop 1.100 +LocalDate::forEpochDays() 2.500 +LocalDate::toEpochDays() 0.800 LocalDate::dayOfWeek() 1.200 -OffsetDateTime::forEpochSeconds() 3.500 -OffsetDateTime::toEpochSeconds() 4.400 -ZonedDateTime::toEpochSeconds() 4.300 -ZonedDateTime::toEpochDays() 3.100 -ZonedDateTime::forEpochSeconds(UTC) 4.800 -ZonedDateTime::forEpochSeconds(Basic_nocache) 71.500 -ZonedDateTime::forEpochSeconds(Basic_cached) 11.000 -ZonedDateTime::forEpochSeconds(Extended_nocache) 131.000 -ZonedDateTime::forEpochSeconds(Extended_cached) 10.700 -BasicZoneManager::indexForZoneName(binary) 11.900 -BasicZoneManager::indexForZoneId(binary) 3.200 -BasicZoneManager::indexForZoneId(linear) 44.200 +OffsetDateTime::forEpochSeconds() 3.600 +OffsetDateTime::toEpochSeconds() 4.200 +ZonedDateTime::toEpochSeconds() 4.200 +ZonedDateTime::toEpochDays() 3.300 +ZonedDateTime::forEpochSeconds(UTC) 4.900 +ZonedDateTime::forEpochSeconds(Basic_nocache) 66.300 +ZonedDateTime::forEpochSeconds(Basic_cached) 10.300 +ZonedDateTime::forEpochSeconds(Extended_nocache) 128.400 +ZonedDateTime::forEpochSeconds(Extended_cached) 10.100 +BasicZoneManager::indexForZoneName(binary) 11.800 +BasicZoneManager::indexForZoneId(binary) 2.600 +BasicZoneManager::indexForZoneId(linear) 17.900 Iterations_per_run 10000 END diff --git a/examples/AutoBenchmark/teensy32.txt b/examples/AutoBenchmark/teensy32.txt index 55cac9cd1..7846ea525 100644 --- a/examples/AutoBenchmark/teensy32.txt +++ b/examples/AutoBenchmark/teensy32.txt @@ -27,21 +27,21 @@ sizeof(basic::Transition): 28 sizeof(extended::Transition): 52 sizeof(extended::ZoneMatch): 16 BENCHMARKS -EmptyLoop 0.580 -LocalDate::forEpochDays() 1.240 -LocalDate::toEpochDays() 0.840 -LocalDate::dayOfWeek() 1.620 -OffsetDateTime::forEpochSeconds() 1.960 +EmptyLoop 0.420 +LocalDate::forEpochDays() 1.900 +LocalDate::toEpochDays() 0.120 +LocalDate::dayOfWeek() 1.040 +OffsetDateTime::forEpochSeconds() 2.500 OffsetDateTime::toEpochSeconds() 0.340 -ZonedDateTime::toEpochSeconds() 0.420 -ZonedDateTime::toEpochDays() 0.400 -ZonedDateTime::forEpochSeconds(UTC) 2.180 -ZonedDateTime::forEpochSeconds(Basic_nocache) 30.160 -ZonedDateTime::forEpochSeconds(Basic_cached) 5.560 -ZonedDateTime::forEpochSeconds(Extended_nocache) 67.280 -ZonedDateTime::forEpochSeconds(Extended_cached) 5.420 -BasicZoneManager::indexForZoneName(binary) 6.620 -BasicZoneManager::indexForZoneId(binary) 2.580 -BasicZoneManager::indexForZoneId(linear) 25.620 +ZonedDateTime::toEpochSeconds() 0.300 +ZonedDateTime::toEpochDays() 0.160 +ZonedDateTime::forEpochSeconds(UTC) 2.540 +ZonedDateTime::forEpochSeconds(Basic_nocache) 29.960 +ZonedDateTime::forEpochSeconds(Basic_cached) 6.020 +ZonedDateTime::forEpochSeconds(Extended_nocache) 67.620 +ZonedDateTime::forEpochSeconds(Extended_cached) 5.840 +BasicZoneManager::indexForZoneName(binary) 6.580 +BasicZoneManager::indexForZoneId(binary) 2.340 +BasicZoneManager::indexForZoneId(linear) 10.500 Iterations_per_run 50000 END diff --git a/examples/AutoBenchmark/zone_registry.cpp b/examples/AutoBenchmark/zone_registry.cpp new file mode 100644 index 000000000..a7e628414 --- /dev/null +++ b/examples/AutoBenchmark/zone_registry.cpp @@ -0,0 +1,101 @@ +// This file was copied from src/ace_time/zonedb/zone_registry.cpp, then reduced +// to 85 zones so that AutoBenchmark can fit inside the 32kB limit of an +// Arduino Nano. + +#include +#include "zone_registry.h" + +using namespace ace_time; + +//--------------------------------------------------------------------------- +// Zone registry. Sorted by zoneId. +//--------------------------------------------------------------------------- +const basic::ZoneInfo* const kBenchmarkZoneRegistry[kBenchmarkZoneRegistrySize] + ACE_TIME_PROGMEM = { + &zonedb::kZoneAsia_Kuala_Lumpur, // 0x014763c4, Asia/Kuala_Lumpur + &zonedb::kZoneIndian_Cocos, // 0x021e86de, Indian/Cocos + &zonedb::kZoneAmerica_Mazatlan, // 0x0532189e, America/Mazatlan + &zonedb::kZoneAmerica_Guatemala, // 0x0c8259f7, America/Guatemala + &zonedb::kZoneAmerica_Yellowknife, // 0x0f76c76f, America/Yellowknife + &zonedb::kZoneAmerica_Sao_Paulo, // 0x1063bfc9, America/Sao_Paulo + &zonedb::kZoneAmerica_Indiana_Vevay, // 0x10aca054, America/Indiana/Vevay + &zonedb::kZoneAsia_Dhaka, // 0x14c07b8b, Asia/Dhaka + &zonedb::kZoneAsia_Qatar, // 0x15a8330b, Asia/Qatar + &zonedb::kZoneAmerica_Guayaquil, // 0x17e64958, America/Guayaquil + &zonedb::kZoneAmerica_New_York, // 0x1e2a7654, America/New_York + &zonedb::kZoneAsia_Ho_Chi_Minh, // 0x20f2d127, Asia/Ho_Chi_Minh + &zonedb::kZonePacific_Wake, // 0x23416c2b, Pacific/Wake + &zonedb::kZoneAmerica_Monterrey, // 0x269a1deb, America/Monterrey + &zonedb::kZoneAmerica_Vancouver, // 0x2c6f6b1f, America/Vancouver + &zonedb::kZoneAustralia_Hobart, // 0x32bf951a, Australia/Hobart + &zonedb::kZoneAmerica_Cayenne, // 0x3c617269, America/Cayenne + &zonedb::kZoneEurope_Athens, // 0x4318fa27, Europe/Athens + &zonedb::kZoneIndian_Chagos, // 0x456f7c3c, Indian/Chagos + &zonedb::kZoneAmerica_Chicago, // 0x4b92b5d4, America/Chicago + &zonedb::kZoneAmerica_Asuncion, // 0x50ec79a6, America/Asuncion + &zonedb::kZonePacific_Gambier, // 0x53720c3a, Pacific/Gambier + &zonedb::kZoneAmerica_Jamaica, // 0x565dad6c, America/Jamaica + &zonedb::kZonePacific_Marquesas, // 0x57ca7135, Pacific/Marquesas + &zonedb::kZoneAsia_Jerusalem, // 0x5becd23a, Asia/Jerusalem + &zonedb::kZoneEurope_London, // 0x5c6a84ae, Europe/London + &zonedb::kZonePacific_Pago_Pago, // 0x603aebd0, Pacific/Pago_Pago + &zonedb::kZoneEurope_Prague, // 0x65ee5d48, Europe/Prague + &zonedb::kZoneAsia_Makassar, // 0x6aa21c85, Asia/Makassar + &zonedb::kZoneAmerica_Dawson_Creek, // 0x6cf24e5b, America/Dawson_Creek + &zonedb::kZoneAsia_Kolkata, // 0x72c06cd9, Asia/Kolkata + &zonedb::kZoneAmerica_El_Salvador, // 0x752ad652, America/El_Salvador + &zonedb::kZoneAmerica_Toronto, // 0x792e851b, America/Toronto + &zonedb::kZoneIndian_Mauritius, // 0x7b09c02a, Indian/Mauritius + &zonedb::kZoneAsia_Kuching, // 0x801b003b, Asia/Kuching + &zonedb::kZoneAmerica_Atikokan, // 0x81b92098, America/Atikokan + &zonedb::kZoneAmerica_Chihuahua, // 0x8827d776, America/Chihuahua + &zonedb::kZonePacific_Chuuk, // 0x8a090b23, Pacific/Chuuk + &zonedb::kZonePacific_Nauru, // 0x8acc41ae, Pacific/Nauru + &zonedb::kZonePacific_Kwajalein, // 0x8e216759, Pacific/Kwajalein + &zonedb::kZoneAmerica_Detroit, // 0x925cfbc1, America/Detroit + &zonedb::kZoneAmerica_Denver, // 0x97d10b2a, America/Denver + &zonedb::kZoneAmerica_Belem, // 0x97da580b, America/Belem + &zonedb::kZoneAmerica_Nuuk, // 0x9805b5a9, America/Nuuk + &zonedb::kZonePacific_Rarotonga, // 0x9981a3b0, Pacific/Rarotonga + &zonedb::kZoneAsia_Baghdad, // 0x9ceffbed, Asia/Baghdad + &zonedb::kZoneAfrica_Ndjamena, // 0x9fe09898, Africa/Ndjamena + &zonedb::kZoneAmerica_Havana, // 0xa0e15675, America/Havana + &zonedb::kZoneEurope_Oslo, // 0xa2c3fba1, Europe/Oslo + &zonedb::kZoneEurope_Rome, // 0xa2c58fd7, Europe/Rome + &zonedb::kZoneAmerica_Inuvik, // 0xa42189fc, America/Inuvik + &zonedb::kZoneAmerica_Juneau, // 0xa6f13e2e, America/Juneau + &zonedb::kZoneAustralia_Lord_Howe, // 0xa748b67d, Australia/Lord_Howe + &zonedb::kZonePacific_Port_Moresby, // 0xa7ba7f68, Pacific/Port_Moresby + &zonedb::kZoneAsia_Beirut, // 0xa7f3d5fd, Asia/Beirut + &zonedb::kZoneAfrica_Nairobi, // 0xa87ab57e, Africa/Nairobi + &zonedb::kZoneAsia_Brunei, // 0xa8e595f7, Asia/Brunei + &zonedb::kZonePacific_Galapagos, // 0xa952f752, Pacific/Galapagos + &zonedb::kZoneAmerica_La_Paz, // 0xaa29125d, America/La_Paz + &zonedb::kZoneAmerica_Manaus, // 0xac86bf8b, America/Manaus + &zonedb::kZoneAmerica_Merida, // 0xacd172d8, America/Merida + &zonedb::kZoneEurope_Chisinau, // 0xad58aa18, Europe/Chisinau + &zonedb::kZoneAmerica_Nassau, // 0xaedef011, America/Nassau + &zonedb::kZoneEurope_Uzhgorod, // 0xb066f5d6, Europe/Uzhgorod + &zonedb::kZoneAustralia_Broken_Hill, // 0xb06eada3, Australia/Broken_Hill + &zonedb::kZoneAmerica_Paramaribo, // 0xb319e4c4, America/Paramaribo + &zonedb::kZoneAmerica_Panama, // 0xb3863854, America/Panama + &zonedb::kZoneAmerica_Los_Angeles, // 0xb7f7e8f2, America/Los_Angeles + &zonedb::kZoneAmerica_Regina, // 0xb875371c, America/Regina + &zonedb::kZoneAmerica_Halifax, // 0xbc5b7183, America/Halifax + &zonedb::kZoneAsia_Riyadh, // 0xcd973d93, Asia/Riyadh + &zonedb::kZoneAsia_Singapore, // 0xcf8581fa, Asia/Singapore + &zonedb::kZoneAsia_Tehran, // 0xd1f02254, Asia/Tehran + &zonedb::kZoneAfrica_Johannesburg, // 0xd5d157a0, Africa/Johannesburg + &zonedb::kZoneEtc_UTC, // 0xd8e31abc, Etc/UTC + &zonedb::kZoneEurope_Brussels, // 0xdee07337, Europe/Brussels + &zonedb::kZoneAntarctica_Syowa, // 0xe330c7e1, Antarctica/Syowa + &zonedb::kZoneMST7MDT, // 0xf2af9375, MST7MDT + &zonedb::kZoneEurope_Gibraltar, // 0xf8e325fc, Europe/Gibraltar + &zonedb::kZoneAmerica_Montevideo, // 0xfa214780, America/Montevideo + &zonedb::kZoneEurope_Bucharest, // 0xfb349ec5, Europe/Bucharest + &zonedb::kZoneEurope_Paris, // 0xfb4bc2a3, Europe/Paris + &zonedb::kZoneEurope_Sofia, // 0xfb898656, Europe/Sofia + &zonedb::kZoneAtlantic_Canary, // 0xfc23f2c2, Atlantic/Canary + &zonedb::kZoneAmerica_Campo_Grande, // 0xfec3e7a6, America/Campo_Grande + +}; diff --git a/examples/AutoBenchmark/zone_registry.h b/examples/AutoBenchmark/zone_registry.h new file mode 100644 index 000000000..bb0a9d645 --- /dev/null +++ b/examples/AutoBenchmark/zone_registry.h @@ -0,0 +1,14 @@ +// This file was copied from src/ace_time/zonedb/zone_registry.cpp, then reduced +// to 85 zones so that AutoBenchmark can fit inside the 32kB limit of an +// Arduino Nano. + +#ifndef AUTO_BENCHMARK_ZONE_REGISTRY_H +#define AUTO_BENCHMARK_ZONE_REGISTRY_H + +#include + +const uint16_t kBenchmarkZoneRegistrySize = 85; +extern const ace_time::basic::ZoneInfo* const + kBenchmarkZoneRegistry[kBenchmarkZoneRegistrySize]; + +#endif From 76cff2673ecea4c40c9dc95b0e05674c2521524d Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 26 Jan 2021 18:34:58 -0800 Subject: [PATCH 72/74] AutoBenchmark: Change labels from ZoneManager::indexForXxx() to createForXxx() --- examples/AutoBenchmark/Benchmark.cpp | 6 +-- examples/AutoBenchmark/README.md | 48 +++++++++++------------ examples/AutoBenchmark/esp32.txt | 6 +-- examples/AutoBenchmark/esp8266.txt | 6 +-- examples/AutoBenchmark/generate_readme.py | 6 +-- examples/AutoBenchmark/micro.txt | 6 +-- examples/AutoBenchmark/nano.txt | 6 +-- examples/AutoBenchmark/samd.txt | 6 +-- examples/AutoBenchmark/stm32.txt | 6 +-- examples/AutoBenchmark/teensy32.txt | 6 +-- 10 files changed, 51 insertions(+), 51 deletions(-) diff --git a/examples/AutoBenchmark/Benchmark.cpp b/examples/AutoBenchmark/Benchmark.cpp index 9c776ac7d..4cf2a68c4 100644 --- a/examples/AutoBenchmark/Benchmark.cpp +++ b/examples/AutoBenchmark/Benchmark.cpp @@ -446,7 +446,7 @@ static void runIndexForZoneName() { disableOptimization((uint32_t) tmp); }); - printResult(F("BasicZoneManager::indexForZoneName(binary)"), runMillis, + printResult(F("BasicZoneManager::createForZoneName(binary)"), runMillis, emptyLoopMillis); } @@ -478,7 +478,7 @@ void runIndexForZoneIdBinary() { disableOptimization(zoneId); }); - printResult(F("BasicZoneManager::indexForZoneId(binary)"), runMillis, + printResult(F("BasicZoneManager::createForZoneId(binary)"), runMillis, emptyLoopMillis); } @@ -505,7 +505,7 @@ void runIndexForZoneIdLinear() { disableOptimization(zoneId); }); - printResult(F("BasicZoneManager::indexForZoneId(linear)"), runMillis, + printResult(F("BasicZoneManager::createForZoneId(linear)"), runMillis, emptyLoopMillis); } diff --git a/examples/AutoBenchmark/README.md b/examples/AutoBenchmark/README.md index 31140d337..d5f8adddc 100644 --- a/examples/AutoBenchmark/README.md +++ b/examples/AutoBenchmark/README.md @@ -57,11 +57,11 @@ The CPU times below are given in microseconds. * The CPU time of most classes did not change much from v1.4 to v1.5. The big difference is that the Zone registries (kZoneRegistry, kZoneAndLinkRegistry) are now sorted by zoneId instead of zoneName, and the - `ZoneManager::indexForZoneId()` will use a binary search, instead of a linear + `ZoneManager::createForZoneId()` will use a binary search, instead of a linear search. This makes it 10-15X faster for ~266 entries. The - `ZoneManager::indexForZoneName()` also converts to a zoneId, then performs a + `ZoneManager::createForZoneName()` also converts to a zoneId, then performs a binary search, instead of doing a binary search on the zoneName directly. Even - with the extra level of indirection, the `indexForZoneName()` is between + with the extra level of indirection, the `createForZoneName()` is between 1.5-2X faster than the previous version. ## Arduino Nano @@ -118,9 +118,9 @@ CPU: | ZonedDateTime::forEpochSeconds(Basic_cached) | 617.0 | | ZonedDateTime::forEpochSeconds(Extended_nocache) | 2022.0 | | ZonedDateTime::forEpochSeconds(Extended_cached) | 618.0 | -| BasicZoneManager::indexForZoneName(binary) | 110.0 | -| BasicZoneManager::indexForZoneId(binary) | 36.0 | -| BasicZoneManager::indexForZoneId(linear) | 392.0 | +| BasicZoneManager::createForZoneName(binary) | 110.0 | +| BasicZoneManager::createForZoneId(binary) | 36.0 | +| BasicZoneManager::createForZoneId(linear) | 392.0 | +--------------------------------------------------+----------+ Iterations_per_run: 1000 @@ -180,9 +180,9 @@ CPU: | ZonedDateTime::forEpochSeconds(Basic_cached) | 619.0 | | ZonedDateTime::forEpochSeconds(Extended_nocache) | 2034.0 | | ZonedDateTime::forEpochSeconds(Extended_cached) | 621.0 | -| BasicZoneManager::indexForZoneName(binary) | 110.0 | -| BasicZoneManager::indexForZoneId(binary) | 38.0 | -| BasicZoneManager::indexForZoneId(linear) | 398.0 | +| BasicZoneManager::createForZoneName(binary) | 110.0 | +| BasicZoneManager::createForZoneId(binary) | 38.0 | +| BasicZoneManager::createForZoneId(linear) | 398.0 | +--------------------------------------------------+----------+ Iterations_per_run: 1000 @@ -242,9 +242,9 @@ CPU: | ZonedDateTime::forEpochSeconds(Basic_cached) | 73.0 | | ZonedDateTime::forEpochSeconds(Extended_nocache) | 435.8 | | ZonedDateTime::forEpochSeconds(Extended_cached) | 73.2 | -| BasicZoneManager::indexForZoneName(binary) | 15.5 | -| BasicZoneManager::indexForZoneId(binary) | 3.5 | -| BasicZoneManager::indexForZoneId(linear) | 14.4 | +| BasicZoneManager::createForZoneName(binary) | 15.5 | +| BasicZoneManager::createForZoneId(binary) | 3.5 | +| BasicZoneManager::createForZoneId(linear) | 14.4 | +--------------------------------------------------+----------+ Iterations_per_run: 10000 @@ -304,9 +304,9 @@ CPU: | ZonedDateTime::forEpochSeconds(Basic_cached) | 10.3 | | ZonedDateTime::forEpochSeconds(Extended_nocache) | 128.4 | | ZonedDateTime::forEpochSeconds(Extended_cached) | 10.1 | -| BasicZoneManager::indexForZoneName(binary) | 11.8 | -| BasicZoneManager::indexForZoneId(binary) | 2.6 | -| BasicZoneManager::indexForZoneId(linear) | 17.9 | +| BasicZoneManager::createForZoneName(binary) | 11.8 | +| BasicZoneManager::createForZoneId(binary) | 2.6 | +| BasicZoneManager::createForZoneId(linear) | 17.9 | +--------------------------------------------------+----------+ Iterations_per_run: 10000 @@ -367,9 +367,9 @@ CPU: | ZonedDateTime::forEpochSeconds(Basic_cached) | 26.5 | | ZonedDateTime::forEpochSeconds(Extended_nocache) | 200.2 | | ZonedDateTime::forEpochSeconds(Extended_cached) | 26.6 | -| BasicZoneManager::indexForZoneName(binary) | 15.9 | -| BasicZoneManager::indexForZoneId(binary) | 7.4 | -| BasicZoneManager::indexForZoneId(linear) | 50.6 | +| BasicZoneManager::createForZoneName(binary) | 15.9 | +| BasicZoneManager::createForZoneId(binary) | 7.4 | +| BasicZoneManager::createForZoneId(linear) | 50.6 | +--------------------------------------------------+----------+ Iterations_per_run: 10000 @@ -430,9 +430,9 @@ CPU: | ZonedDateTime::forEpochSeconds(Basic_cached) | 2.5 | | ZonedDateTime::forEpochSeconds(Extended_nocache) | 30.1 | | ZonedDateTime::forEpochSeconds(Extended_cached) | 2.4 | -| BasicZoneManager::indexForZoneName(binary) | 2.9 | -| BasicZoneManager::indexForZoneId(binary) | 0.6 | -| BasicZoneManager::indexForZoneId(linear) | 2.6 | +| BasicZoneManager::createForZoneName(binary) | 2.9 | +| BasicZoneManager::createForZoneId(binary) | 0.6 | +| BasicZoneManager::createForZoneId(linear) | 2.6 | +--------------------------------------------------+----------+ Iterations_per_run: 50000 @@ -496,9 +496,9 @@ CPU: | ZonedDateTime::forEpochSeconds(Basic_cached) | 6.0 | | ZonedDateTime::forEpochSeconds(Extended_nocache) | 67.6 | | ZonedDateTime::forEpochSeconds(Extended_cached) | 5.8 | -| BasicZoneManager::indexForZoneName(binary) | 6.6 | -| BasicZoneManager::indexForZoneId(binary) | 2.3 | -| BasicZoneManager::indexForZoneId(linear) | 10.5 | +| BasicZoneManager::createForZoneName(binary) | 6.6 | +| BasicZoneManager::createForZoneId(binary) | 2.3 | +| BasicZoneManager::createForZoneId(linear) | 10.5 | +--------------------------------------------------+----------+ Iterations_per_run: 50000 diff --git a/examples/AutoBenchmark/esp32.txt b/examples/AutoBenchmark/esp32.txt index de70a345f..d5fce9387 100644 --- a/examples/AutoBenchmark/esp32.txt +++ b/examples/AutoBenchmark/esp32.txt @@ -41,8 +41,8 @@ ZonedDateTime::forEpochSeconds(Basic_nocache) 15.460 ZonedDateTime::forEpochSeconds(Basic_cached) 2.500 ZonedDateTime::forEpochSeconds(Extended_nocache) 30.100 ZonedDateTime::forEpochSeconds(Extended_cached) 2.440 -BasicZoneManager::indexForZoneName(binary) 2.940 -BasicZoneManager::indexForZoneId(binary) 0.600 -BasicZoneManager::indexForZoneId(linear) 2.560 +BasicZoneManager::createForZoneName(binary) 2.940 +BasicZoneManager::createForZoneId(binary) 0.600 +BasicZoneManager::createForZoneId(linear) 2.560 Iterations_per_run 50000 END diff --git a/examples/AutoBenchmark/esp8266.txt b/examples/AutoBenchmark/esp8266.txt index 750772606..b0396bef2 100644 --- a/examples/AutoBenchmark/esp8266.txt +++ b/examples/AutoBenchmark/esp8266.txt @@ -41,8 +41,8 @@ ZonedDateTime::forEpochSeconds(Basic_nocache) 97.200 ZonedDateTime::forEpochSeconds(Basic_cached) 26.500 ZonedDateTime::forEpochSeconds(Extended_nocache) 200.200 ZonedDateTime::forEpochSeconds(Extended_cached) 26.600 -BasicZoneManager::indexForZoneName(binary) 15.900 -BasicZoneManager::indexForZoneId(binary) 7.400 -BasicZoneManager::indexForZoneId(linear) 50.600 +BasicZoneManager::createForZoneName(binary) 15.900 +BasicZoneManager::createForZoneId(binary) 7.400 +BasicZoneManager::createForZoneId(linear) 50.600 Iterations_per_run 10000 END diff --git a/examples/AutoBenchmark/generate_readme.py b/examples/AutoBenchmark/generate_readme.py index 72f0799fe..9dd299732 100755 --- a/examples/AutoBenchmark/generate_readme.py +++ b/examples/AutoBenchmark/generate_readme.py @@ -81,11 +81,11 @@ * The CPU time of most classes did not change much from v1.4 to v1.5. The big difference is that the Zone registries (kZoneRegistry, kZoneAndLinkRegistry) are now sorted by zoneId instead of zoneName, and the - `ZoneManager::indexForZoneId()` will use a binary search, instead of a linear + `ZoneManager::createForZoneId()` will use a binary search, instead of a linear search. This makes it 10-15X faster for ~266 entries. The - `ZoneManager::indexForZoneName()` also converts to a zoneId, then performs a + `ZoneManager::createForZoneName()` also converts to a zoneId, then performs a binary search, instead of doing a binary search on the zoneName directly. Even - with the extra level of indirection, the `indexForZoneName()` is between + with the extra level of indirection, the `createForZoneName()` is between 1.5-2X faster than the previous version. ## Arduino Nano diff --git a/examples/AutoBenchmark/micro.txt b/examples/AutoBenchmark/micro.txt index 6c069b724..d4353fe62 100644 --- a/examples/AutoBenchmark/micro.txt +++ b/examples/AutoBenchmark/micro.txt @@ -40,8 +40,8 @@ ZonedDateTime::forEpochSeconds(Basic_nocache) 1187.000 ZonedDateTime::forEpochSeconds(Basic_cached) 619.000 ZonedDateTime::forEpochSeconds(Extended_nocache) 2034.000 ZonedDateTime::forEpochSeconds(Extended_cached) 621.000 -BasicZoneManager::indexForZoneName(binary) 110.000 -BasicZoneManager::indexForZoneId(binary) 38.000 -BasicZoneManager::indexForZoneId(linear) 398.000 +BasicZoneManager::createForZoneName(binary) 110.000 +BasicZoneManager::createForZoneId(binary) 38.000 +BasicZoneManager::createForZoneId(linear) 398.000 Iterations_per_run 1000 END diff --git a/examples/AutoBenchmark/nano.txt b/examples/AutoBenchmark/nano.txt index 30536662f..8697d8d8d 100644 --- a/examples/AutoBenchmark/nano.txt +++ b/examples/AutoBenchmark/nano.txt @@ -40,8 +40,8 @@ ZonedDateTime::forEpochSeconds(Basic_nocache) 1180.000 ZonedDateTime::forEpochSeconds(Basic_cached) 617.000 ZonedDateTime::forEpochSeconds(Extended_nocache) 2022.000 ZonedDateTime::forEpochSeconds(Extended_cached) 618.000 -BasicZoneManager::indexForZoneName(binary) 110.000 -BasicZoneManager::indexForZoneId(binary) 36.000 -BasicZoneManager::indexForZoneId(linear) 392.000 +BasicZoneManager::createForZoneName(binary) 110.000 +BasicZoneManager::createForZoneId(binary) 36.000 +BasicZoneManager::createForZoneId(linear) 392.000 Iterations_per_run 1000 END diff --git a/examples/AutoBenchmark/samd.txt b/examples/AutoBenchmark/samd.txt index abfc0d999..578739c2f 100644 --- a/examples/AutoBenchmark/samd.txt +++ b/examples/AutoBenchmark/samd.txt @@ -40,8 +40,8 @@ ZonedDateTime::forEpochSeconds(Basic_nocache) 234.500 ZonedDateTime::forEpochSeconds(Basic_cached) 73.000 ZonedDateTime::forEpochSeconds(Extended_nocache) 435.800 ZonedDateTime::forEpochSeconds(Extended_cached) 73.200 -BasicZoneManager::indexForZoneName(binary) 15.500 -BasicZoneManager::indexForZoneId(binary) 3.500 -BasicZoneManager::indexForZoneId(linear) 14.400 +BasicZoneManager::createForZoneName(binary) 15.500 +BasicZoneManager::createForZoneId(binary) 3.500 +BasicZoneManager::createForZoneId(linear) 14.400 Iterations_per_run 10000 END diff --git a/examples/AutoBenchmark/stm32.txt b/examples/AutoBenchmark/stm32.txt index ab2bbd7e5..0edcc3774 100644 --- a/examples/AutoBenchmark/stm32.txt +++ b/examples/AutoBenchmark/stm32.txt @@ -40,8 +40,8 @@ ZonedDateTime::forEpochSeconds(Basic_nocache) 66.300 ZonedDateTime::forEpochSeconds(Basic_cached) 10.300 ZonedDateTime::forEpochSeconds(Extended_nocache) 128.400 ZonedDateTime::forEpochSeconds(Extended_cached) 10.100 -BasicZoneManager::indexForZoneName(binary) 11.800 -BasicZoneManager::indexForZoneId(binary) 2.600 -BasicZoneManager::indexForZoneId(linear) 17.900 +BasicZoneManager::createForZoneName(binary) 11.800 +BasicZoneManager::createForZoneId(binary) 2.600 +BasicZoneManager::createForZoneId(linear) 17.900 Iterations_per_run 10000 END diff --git a/examples/AutoBenchmark/teensy32.txt b/examples/AutoBenchmark/teensy32.txt index 7846ea525..09e69ce3a 100644 --- a/examples/AutoBenchmark/teensy32.txt +++ b/examples/AutoBenchmark/teensy32.txt @@ -40,8 +40,8 @@ ZonedDateTime::forEpochSeconds(Basic_nocache) 29.960 ZonedDateTime::forEpochSeconds(Basic_cached) 6.020 ZonedDateTime::forEpochSeconds(Extended_nocache) 67.620 ZonedDateTime::forEpochSeconds(Extended_cached) 5.840 -BasicZoneManager::indexForZoneName(binary) 6.580 -BasicZoneManager::indexForZoneId(binary) 2.340 -BasicZoneManager::indexForZoneId(linear) 10.500 +BasicZoneManager::createForZoneName(binary) 6.580 +BasicZoneManager::createForZoneId(binary) 2.340 +BasicZoneManager::createForZoneId(linear) 10.500 Iterations_per_run 50000 END From 29e1133478adffb166e9cdd2fef8887775115fd2 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 26 Jan 2021 18:40:21 -0800 Subject: [PATCH 73/74] CHANGELOG.md: Add official support for STM32 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 940984685..a3da7dccd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ * Update TZ Database to 2021a. * https://mm.icann.org/pipermail/tz-announce/2021-January/000065.html * "South Sudan changes from +03 to +02 on 2021-02-01 at 00:00." + * Officially support STM32 and STM32duino after testing on STM32 Blue Pill. * 1.4.1 (2020-12-30, TZDB version 2020f for real) * Actually update `src/ace_time/zonedb` and `src/ace_time/zonedbx` zone info files to 2020f. Oops. From 42e8e49b4ec4f17ae67bb1fd5ec672405238da02 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 26 Jan 2021 18:40:52 -0800 Subject: [PATCH 74/74] docs: Regenerate doxygen docs for v1.5 --- docs/html/AceTime_8h_source.html | 111 +- docs/html/BasicZoneProcessor_8cpp_source.html | 8 +- docs/html/BasicZoneProcessor_8h_source.html | 2 +- docs/html/BasicZone_8cpp_source.html | 160 + docs/html/BasicZone_8h_source.html | 84 +- docs/html/Brokers_8h.html | 69 +- docs/html/Brokers_8h__dep__incl.map | 34 +- docs/html/Brokers_8h__dep__incl.md5 | 2 +- docs/html/Brokers_8h__dep__incl.png | Bin 155554 -> 162379 bytes docs/html/Brokers_8h__incl.map | 23 +- docs/html/Brokers_8h__incl.md5 | 2 +- docs/html/Brokers_8h__incl.png | Bin 37519 -> 33485 bytes docs/html/Brokers_8h_source.html | 754 +- docs/html/Clock_8h_source.html | 2 +- docs/html/DS3231Clock_8h_source.html | 4 +- docs/html/DS3231_8cpp_source.html | 4 +- docs/html/DS3231_8h_source.html | 4 +- docs/html/DateStrings_8cpp_source.html | 2 +- docs/html/DateStrings_8h_source.html | 2 +- .../ExtendedZoneProcessor_8cpp_source.html | 8 +- .../html/ExtendedZoneProcessor_8h_source.html | 1432 +- docs/html/ExtendedZone_8cpp_source.html | 160 + docs/html/ExtendedZone_8h_source.html | 86 +- docs/html/HardwareDateTime_8cpp_source.html | 4 +- docs/html/HardwareDateTime_8h_source.html | 2 +- docs/html/HardwareTemperature_8h_source.html | 2 +- docs/html/LocalDateTime_8cpp_source.html | 2 +- docs/html/LocalDateTime_8h_source.html | 2 +- docs/html/LocalDate_8cpp_source.html | 2 +- docs/html/LocalDate_8h_source.html | 2 +- docs/html/LocalTime_8cpp_source.html | 2 +- docs/html/LocalTime_8h_source.html | 2 +- docs/html/NtpClock_8cpp_source.html | 2 +- docs/html/NtpClock_8h_source.html | 2 +- docs/html/OffsetDateTime_8cpp_source.html | 2 +- docs/html/OffsetDateTime_8h_source.html | 2 +- docs/html/StmRtcClock_8h_source.html | 6 +- docs/html/StmRtc_8cpp_source.html | 6 +- docs/html/StmRtc_8h_source.html | 6 +- docs/html/SystemClockCoroutine_8h_source.html | 2 +- docs/html/SystemClockLoop_8h_source.html | 2 +- docs/html/SystemClock_8h_source.html | 2 +- docs/html/TimeOffset_8cpp_source.html | 2 +- docs/html/TimeOffset_8h_source.html | 2 +- docs/html/TimePeriod_8cpp_source.html | 2 +- docs/html/TimePeriod_8h_source.html | 2 +- docs/html/TimeZoneData_8h_source.html | 2 +- docs/html/TimeZone_8cpp_source.html | 2 +- docs/html/TimeZone_8h_source.html | 6 +- docs/html/UnixClock_8h_source.html | 4 +- docs/html/ZoneContext_8h_source.html | 2 +- docs/html/ZoneContext_8inc_source.html | 8 +- docs/html/ZoneInfo_8h_source.html | 2 +- docs/html/ZoneInfo_8inc_source.html | 12 +- docs/html/ZoneManager_8h_source.html | 114 +- docs/html/ZonePolicy_8h_source.html | 2 +- docs/html/ZonePolicy_8inc_source.html | 2 +- docs/html/ZoneProcessorCache_8h_source.html | 4 +- docs/html/ZoneProcessor_8h_source.html | 2 +- docs/html/ZoneRegistrar_8h_source.html | 373 +- docs/html/ZonedDateTime_8cpp_source.html | 2 +- docs/html/ZonedDateTime_8h_source.html | 2 +- docs/html/_2zone__infos_8cpp_source.html | 36470 +++++++++------- docs/html/_2zone__infos_8h_source.html | 1087 +- docs/html/_2zone__policies_8cpp_source.html | 16333 +++---- docs/html/_2zone__policies_8h_source.html | 6 +- docs/html/_2zone__registry_8cpp_source.html | 1384 +- docs/html/_2zone__registry_8h_source.html | 20 +- docs/html/annotated.html | 2 +- .../classace__time_1_1BasicZone-members.html | 6 +- docs/html/classace__time_1_1BasicZone.html | 19 +- ...ace__time_1_1BasicZoneManager-members.html | 2 +- .../classace__time_1_1BasicZoneManager.html | 2 +- ...e__time_1_1BasicZoneProcessor-members.html | 2 +- .../classace__time_1_1BasicZoneProcessor.html | 2 +- ...me_1_1BasicZoneProcessorCache-members.html | 2 +- ...sace__time_1_1BasicZoneProcessorCache.html | 2 +- ...classace__time_1_1DateStrings-members.html | 2 +- docs/html/classace__time_1_1DateStrings.html | 2 +- ...lassace__time_1_1ExtendedZone-members.html | 6 +- docs/html/classace__time_1_1ExtendedZone.html | 19 +- ...__time_1_1ExtendedZoneManager-members.html | 2 +- ...classace__time_1_1ExtendedZoneManager.html | 4 +- ...time_1_1ExtendedZoneProcessor-members.html | 2 +- ...assace__time_1_1ExtendedZoneProcessor.html | 2 +- ...1_1ExtendedZoneProcessorCache-members.html | 2 +- ...e__time_1_1ExtendedZoneProcessorCache.html | 2 +- .../classace__time_1_1LocalDate-members.html | 2 +- docs/html/classace__time_1_1LocalDate.html | 2 +- ...assace__time_1_1LocalDateTime-members.html | 2 +- .../html/classace__time_1_1LocalDateTime.html | 2 +- .../classace__time_1_1LocalTime-members.html | 2 +- docs/html/classace__time_1_1LocalTime.html | 2 +- ...ce__time_1_1ManualZoneManager-members.html | 2 +- .../classace__time_1_1ManualZoneManager.html | 4 +- ...ssace__time_1_1OffsetDateTime-members.html | 2 +- .../classace__time_1_1OffsetDateTime.html | 2 +- .../classace__time_1_1TimeOffset-members.html | 2 +- docs/html/classace__time_1_1TimeOffset.html | 2 +- .../classace__time_1_1TimePeriod-members.html | 2 +- docs/html/classace__time_1_1TimePeriod.html | 2 +- .../classace__time_1_1TimeZone-members.html | 2 +- docs/html/classace__time_1_1TimeZone.html | 2 +- ...classace__time_1_1ZoneManager-members.html | 2 +- docs/html/classace__time_1_1ZoneManager.html | 2 +- ...sace__time_1_1ZoneManagerImpl-members.html | 2 +- .../classace__time_1_1ZoneManagerImpl.html | 2 +- ...assace__time_1_1ZoneProcessor-members.html | 2 +- .../html/classace__time_1_1ZoneProcessor.html | 2 +- ...e__time_1_1ZoneProcessorCache-members.html | 2 +- .../classace__time_1_1ZoneProcessorCache.html | 2 +- ...ime_1_1ZoneProcessorCacheImpl-members.html | 2 +- ...ssace__time_1_1ZoneProcessorCacheImpl.html | 2 +- ...assace__time_1_1ZoneRegistrar-members.html | 66 +- .../html/classace__time_1_1ZoneRegistrar.html | 265 +- ...assace__time_1_1ZonedDateTime-members.html | 2 +- .../html/classace__time_1_1ZonedDateTime.html | 2 +- ...ime_1_1basic_1_1ZoneEraBroker-members.html | 2 +- ...ssace__time_1_1basic_1_1ZoneEraBroker.html | 2 +- ...me_1_1basic_1_1ZoneInfoBroker-members.html | 11 +- ...sace__time_1_1basic_1_1ZoneInfoBroker.html | 5 +- ..._1_1basic_1_1ZonePolicyBroker-members.html | 2 +- ...ce__time_1_1basic_1_1ZonePolicyBroker.html | 2 +- ..._1basic_1_1ZoneRegistryBroker-members.html | 2 +- ...__time_1_1basic_1_1ZoneRegistryBroker.html | 4 +- ...me_1_1basic_1_1ZoneRuleBroker-members.html | 2 +- ...sace__time_1_1basic_1_1ZoneRuleBroker.html | 2 +- ...ssace__time_1_1clock_1_1Clock-members.html | 2 +- .../classace__time_1_1clock_1_1Clock.html | 2 +- ..._time_1_1clock_1_1DS3231Clock-members.html | 2 +- ...lassace__time_1_1clock_1_1DS3231Clock.html | 2 +- ...ce__time_1_1clock_1_1NtpClock-members.html | 2 +- .../classace__time_1_1clock_1_1NtpClock.html | 2 +- ..._time_1_1clock_1_1SystemClock-members.html | 2 +- ...lassace__time_1_1clock_1_1SystemClock.html | 2 +- ...e_1_1clock_1_1SystemClockLoop-members.html | 2 +- ...ace__time_1_1clock_1_1SystemClockLoop.html | 2 +- ...extended_1_1TransitionStorage-members.html | 2 +- ...time_1_1extended_1_1TransitionStorage.html | 2 +- ..._1_1extended_1_1ZoneEraBroker-members.html | 2 +- ...ce__time_1_1extended_1_1ZoneEraBroker.html | 4 +- ...1_1extended_1_1ZoneInfoBroker-members.html | 11 +- ...e__time_1_1extended_1_1ZoneInfoBroker.html | 7 +- ...1extended_1_1ZonePolicyBroker-members.html | 2 +- ..._time_1_1extended_1_1ZonePolicyBroker.html | 4 +- ...xtended_1_1ZoneRegistryBroker-members.html | 2 +- ...ime_1_1extended_1_1ZoneRegistryBroker.html | 4 +- ...1_1extended_1_1ZoneRuleBroker-members.html | 2 +- ...e__time_1_1extended_1_1ZoneRuleBroker.html | 4 +- ...lassace__time_1_1hw_1_1DS3231-members.html | 2 +- docs/html/classace__time_1_1hw_1_1DS3231.html | 2 +- docs/html/classes.html | 2 +- docs/html/common_8h_source.html | 2 +- docs/html/compat_8cpp_source.html | 2 +- docs/html/compat_8h.html | 79 +- docs/html/compat_8h__dep__incl.map | 64 +- docs/html/compat_8h__dep__incl.md5 | 2 +- docs/html/compat_8h__dep__incl.png | Bin 254461 -> 254409 bytes docs/html/compat_8h__incl.map | 3 +- docs/html/compat_8h__incl.md5 | 2 +- docs/html/compat_8h__incl.png | Bin 10340 -> 8174 bytes docs/html/compat_8h_source.html | 140 +- docs/html/dir_000001_000003.html | 4 +- docs/html/dir_000001_000005.html | 2 +- docs/html/dir_000002_000003.html | 2 +- docs/html/dir_000005_000003.html | 2 +- docs/html/dir_000006_000003.html | 2 +- docs/html/dir_000007_000003.html | 2 +- .../dir_173dd563440c1e02d7e3957b90659cd7.html | 4 +- ...r_173dd563440c1e02d7e3957b90659cd7_dep.map | 2 +- ...r_173dd563440c1e02d7e3957b90659cd7_dep.md5 | 2 +- ...r_173dd563440c1e02d7e3957b90659cd7_dep.png | Bin 14663 -> 14630 bytes .../dir_1a3db1509c5a81eeb8e8fbfe5ac0febc.html | 2 +- .../dir_50235a35a18cf9820d15ab2ee5526aee.html | 2 +- .../dir_68267d1309a1af8e8297ef4c3efbcdba.html | 2 +- .../dir_710a5327734d15938c9752b39a7d94e5.html | 2 +- .../dir_a39208a208c368a08eb059033749c10e.html | 2 +- .../dir_afb2025690de77b1a5b5001a410c869c.html | 2 +- .../dir_b09928b61a970651c46b44aee9ef9d8f.html | 2 +- docs/html/files.html | 66 +- docs/html/functions.html | 2 +- docs/html/functions_b.html | 6 +- docs/html/functions_c.html | 2 +- docs/html/functions_d.html | 2 +- docs/html/functions_e.html | 2 +- docs/html/functions_f.html | 14 +- docs/html/functions_func.html | 2 +- docs/html/functions_func_b.html | 6 +- docs/html/functions_func_c.html | 2 +- docs/html/functions_func_d.html | 2 +- docs/html/functions_func_e.html | 2 +- docs/html/functions_func_f.html | 14 +- docs/html/functions_func_g.html | 8 +- docs/html/functions_func_h.html | 2 +- docs/html/functions_func_i.html | 4 +- docs/html/functions_func_k.html | 2 +- docs/html/functions_func_l.html | 7 +- docs/html/functions_func_m.html | 2 +- docs/html/functions_func_n.html | 2 +- docs/html/functions_func_o.html | 2 +- docs/html/functions_func_p.html | 2 +- docs/html/functions_func_r.html | 4 +- docs/html/functions_func_s.html | 2 +- docs/html/functions_func_t.html | 2 +- docs/html/functions_func_y.html | 2 +- docs/html/functions_func_z.html | 4 +- docs/html/functions_func_~.html | 2 +- docs/html/functions_g.html | 8 +- docs/html/functions_h.html | 2 +- docs/html/functions_i.html | 4 +- docs/html/functions_k.html | 6 +- docs/html/functions_l.html | 7 +- docs/html/functions_m.html | 2 +- docs/html/functions_n.html | 2 +- docs/html/functions_o.html | 2 +- docs/html/functions_p.html | 2 +- docs/html/functions_r.html | 4 +- docs/html/functions_rela.html | 2 +- docs/html/functions_s.html | 2 +- docs/html/functions_t.html | 2 +- docs/html/functions_u.html | 2 +- docs/html/functions_vars.html | 6 +- docs/html/functions_y.html | 2 +- docs/html/functions_z.html | 4 +- docs/html/functions_~.html | 2 +- docs/html/globals.html | 2 +- docs/html/globals_defs.html | 2 +- docs/html/graph_legend.html | 2 +- docs/html/hierarchy.html | 4 +- docs/html/index.html | 2 +- docs/html/inherit_graph_43.map | 2 +- docs/html/inherit_graph_43.md5 | 2 +- docs/html/inherit_graph_43.png | Bin 4068 -> 2694 bytes docs/html/inherits.html | 8 +- .../html/local__date__mutation_8h_source.html | 2 +- docs/html/logging_8h_source.html | 2 +- ..._AceTime_src_ace_time_internal_README.html | 2 +- docs/html/pages.html | 2 +- docs/html/search/all_1.js | 2 +- docs/html/search/all_10.js | 32 +- docs/html/search/all_11.js | 50 +- docs/html/search/all_12.js | 2 +- docs/html/search/all_13.js | 6 +- docs/html/search/all_14.js | 40 +- docs/html/search/all_15.js | 2 +- docs/html/search/all_5.js | 54 +- docs/html/search/all_6.js | 38 +- docs/html/search/all_7.js | 6 +- docs/html/search/all_8.js | 36 +- docs/html/search/all_9.js | 68 +- docs/html/search/all_a.js | 17 +- docs/html/search/all_b.js | 20 +- docs/html/search/all_c.js | 4 +- docs/html/search/all_d.js | 8 +- docs/html/search/all_e.js | 4 +- docs/html/search/all_f.js | 18 +- docs/html/search/classes_0.js | 8 +- docs/html/search/classes_1.js | 2 +- docs/html/search/classes_2.js | 8 +- docs/html/search/classes_3.js | 8 +- docs/html/search/classes_4.js | 4 +- docs/html/search/classes_5.js | 6 +- docs/html/search/classes_6.js | 4 +- docs/html/search/classes_7.js | 2 +- docs/html/search/classes_8.js | 2 +- docs/html/search/classes_9.js | 4 +- docs/html/search/classes_a.js | 14 +- docs/html/search/classes_b.js | 2 +- docs/html/search/classes_c.js | 34 +- docs/html/search/defines_0.js | 2 +- docs/html/search/files_0.js | 2 +- docs/html/search/files_1.js | 2 +- docs/html/search/files_2.js | 4 +- docs/html/search/files_3.js | 2 +- docs/html/search/functions_0.js | 8 +- docs/html/search/functions_1.js | 6 +- docs/html/search/functions_10.js | 28 +- docs/html/search/functions_11.js | 36 +- docs/html/search/functions_12.js | 4 +- docs/html/search/functions_13.js | 8 +- docs/html/search/functions_14.js | 2 +- docs/html/search/functions_2.js | 20 +- docs/html/search/functions_3.js | 12 +- docs/html/search/functions_4.js | 4 +- docs/html/search/functions_5.js | 54 +- docs/html/search/functions_6.js | 38 +- docs/html/search/functions_7.js | 2 +- docs/html/search/functions_8.js | 36 +- docs/html/search/functions_9.js | 2 +- docs/html/search/functions_a.js | 15 +- docs/html/search/functions_b.js | 8 +- docs/html/search/functions_c.js | 4 +- docs/html/search/functions_d.js | 2 +- docs/html/search/functions_e.js | 4 +- docs/html/search/functions_f.js | 16 +- docs/html/search/pages_0.js | 2 +- docs/html/search/pages_1.js | 2 +- docs/html/search/related_0.js | 2 +- docs/html/search/variables_0.js | 4 +- docs/html/search/variables_1.js | 2 +- docs/html/search/variables_2.js | 2 +- docs/html/search/variables_3.js | 66 +- docs/html/search/variables_4.js | 2 +- docs/html/search/variables_5.js | 10 +- docs/html/search/variables_6.js | 4 +- docs/html/search/variables_7.js | 2 +- docs/html/search/variables_8.js | 4 +- docs/html/search/variables_9.js | 6 +- docs/html/search/variables_a.js | 2 +- docs/html/search/variables_b.js | 2 +- docs/html/search/variables_c.js | 2 +- ...ructace__time_1_1TimeZoneData-members.html | 2 +- .../html/structace__time_1_1TimeZoneData.html | 2 +- ...ce__time_1_1basic_1_1MonthDay-members.html | 2 +- .../structace__time_1_1basic_1_1MonthDay.html | 2 +- ...__time_1_1basic_1_1Transition-members.html | 2 +- ...tructace__time_1_1basic_1_1Transition.html | 2 +- ...time_1_1extended_1_1DateTuple-members.html | 2 +- ...uctace__time_1_1extended_1_1DateTuple.html | 2 +- ...ime_1_1extended_1_1Transition-members.html | 2 +- ...ctace__time_1_1extended_1_1Transition.html | 2 +- ...1_1extended_1_1YearMonthTuple-members.html | 2 +- ...e__time_1_1extended_1_1YearMonthTuple.html | 2 +- ...time_1_1extended_1_1ZoneMatch-members.html | 2 +- ...uctace__time_1_1extended_1_1ZoneMatch.html | 2 +- ...ime_1_1hw_1_1HardwareDateTime-members.html | 2 +- ...ctace__time_1_1hw_1_1HardwareDateTime.html | 2 +- ..._1_1hw_1_1HardwareTemperature-members.html | 2 +- ...ce__time_1_1hw_1_1HardwareTemperature.html | 2 +- docs/html/time__offset__mutation_8h.html | 2 +- .../time__offset__mutation_8h_source.html | 2 +- docs/html/time__period__mutation_8h.html | 2 +- .../time__period__mutation_8h_source.html | 2 +- docs/html/zone__infos_8cpp_source.html | 21341 +++++---- docs/html/zone__infos_8h_source.html | 1179 +- docs/html/zone__policies_8cpp_source.html | 10999 ++--- docs/html/zone__policies_8h_source.html | 6 +- docs/html/zone__registry_8cpp_source.html | 1000 +- docs/html/zone__registry_8h_source.html | 20 +- docs/html/zoned__date__time__mutation_8h.html | 70 +- .../zoned__date__time__mutation_8h__incl.map | 68 +- .../zoned__date__time__mutation_8h__incl.md5 | 2 +- .../zoned__date__time__mutation_8h__incl.png | Bin 440022 -> 421238 bytes ...zoned__date__time__mutation_8h_source.html | 2 +- 344 files changed, 51896 insertions(+), 43796 deletions(-) create mode 100644 docs/html/BasicZone_8cpp_source.html create mode 100644 docs/html/ExtendedZone_8cpp_source.html diff --git a/docs/html/AceTime_8h_source.html b/docs/html/AceTime_8h_source.html index 6938ebb1c..a5f472fd2 100644 --- a/docs/html/AceTime_8h_source.html +++ b/docs/html/AceTime_8h_source.html @@ -22,7 +22,7 @@
AceTime -  1.4.1 +  1.5
Date and time classes for Arduino that support timezones from the TZ Database, and a system clock that can synchronize from an NTP server or an RTC chip.
@@ -79,57 +79,66 @@
17 #ifndef ACE_TIME_ACE_TIME_H
18 #define ACE_TIME_ACE_TIME_H
19 
-
20 #include "ace_time/common/compat.h"
-
21 #include "ace_time/common/common.h"
-
22 #include "ace_time/common/DateStrings.h"
-
23 #include "ace_time/internal/ZoneContext.h"
-
24 #include "ace_time/internal/ZoneInfo.h"
-
25 #include "ace_time/internal/ZonePolicy.h"
-
26 #include "ace_time/zonedb/zone_policies.h"
-
27 #include "ace_time/zonedb/zone_infos.h"
-
28 #include "ace_time/zonedb/zone_registry.h"
-
29 #include "ace_time/zonedbx/zone_policies.h"
-
30 #include "ace_time/zonedbx/zone_infos.h"
-
31 #include "ace_time/zonedbx/zone_registry.h"
-
32 #include "ace_time/ZoneRegistrar.h"
-
33 #include "ace_time/LocalDate.h"
-
34 #include "ace_time/local_date_mutation.h"
-
35 #include "ace_time/LocalTime.h"
-
36 #include "ace_time/LocalDateTime.h"
-
37 #include "ace_time/TimeOffset.h"
- -
39 #include "ace_time/OffsetDateTime.h"
-
40 #include "ace_time/ZoneProcessor.h"
-
41 #include "ace_time/BasicZoneProcessor.h"
-
42 #include "ace_time/ExtendedZoneProcessor.h"
-
43 #include "ace_time/ZoneProcessorCache.h"
-
44 #include "ace_time/ZoneManager.h"
-
45 #include "ace_time/TimeZoneData.h"
-
46 #include "ace_time/TimeZone.h"
-
47 #include "ace_time/BasicZone.h"
-
48 #include "ace_time/ExtendedZone.h"
-
49 #include "ace_time/ZonedDateTime.h"
- -
51 #include "ace_time/TimePeriod.h"
- -
53 #include "ace_time/clock/Clock.h"
-
54 #include "ace_time/clock/NtpClock.h"
-
55 #include "ace_time/clock/DS3231Clock.h"
-
56 #include "ace_time/clock/UnixClock.h"
-
57 #include "ace_time/clock/SystemClock.h"
-
58 #include "ace_time/clock/SystemClockLoop.h"
-
59 #include "ace_time/clock/SystemClockCoroutine.h"
-
60 
-
61 #if defined(ARDUINO_ARCH_STM32)
-
62 #include "ace_time/clock/StmRtcClock.h"
-
63 #endif // #if defined(STM32_ARCH_STM32)
-
64 
-
65 
-
66 // Version format: xxyyzz == "xx.yy.zz"
-
67 #define ACE_TIME_VERSION 10401
-
68 #define ACE_TIME_VERSION_STRING "1.4.1"
+
20 // Blacklist boards using new Arduino API due to incompatibilities. This
+
21 // currently includes all megaAVR boards and SAMD21 boards using arduino::samd
+
22 // >= 1.8.10. Boards using arduino:samd <= 1.8.9 or SparkFun:samd are fine.
+
23 #if defined(ARDUINO_ARCH_MEGAAVR)
+
24 #error MegaAVR not supported, https://github.com/bxparks/AceTime/issues/44
+
25 #elif defined(ARDUINO_ARCH_SAMD) && defined(ARDUINO_API_VERSION)
+
26 #error SAMD21 with arduino:samd >= 1.8.10 not supported, https://github.com/bxparks/AceTime/issues/45
+
27 #endif
+
28 
+
29 #include "ace_time/common/compat.h"
+
30 #include "ace_time/common/common.h"
+
31 #include "ace_time/common/DateStrings.h"
+
32 #include "ace_time/internal/ZoneContext.h"
+
33 #include "ace_time/internal/ZoneInfo.h"
+
34 #include "ace_time/internal/ZonePolicy.h"
+
35 #include "ace_time/zonedb/zone_policies.h"
+
36 #include "ace_time/zonedb/zone_infos.h"
+
37 #include "ace_time/zonedb/zone_registry.h"
+
38 #include "ace_time/zonedbx/zone_policies.h"
+
39 #include "ace_time/zonedbx/zone_infos.h"
+
40 #include "ace_time/zonedbx/zone_registry.h"
+
41 #include "ace_time/ZoneRegistrar.h"
+
42 #include "ace_time/LocalDate.h"
+
43 #include "ace_time/local_date_mutation.h"
+
44 #include "ace_time/LocalTime.h"
+
45 #include "ace_time/LocalDateTime.h"
+
46 #include "ace_time/TimeOffset.h"
+ +
48 #include "ace_time/OffsetDateTime.h"
+
49 #include "ace_time/ZoneProcessor.h"
+
50 #include "ace_time/BasicZoneProcessor.h"
+
51 #include "ace_time/ExtendedZoneProcessor.h"
+
52 #include "ace_time/ZoneProcessorCache.h"
+
53 #include "ace_time/ZoneManager.h"
+
54 #include "ace_time/TimeZoneData.h"
+
55 #include "ace_time/TimeZone.h"
+
56 #include "ace_time/BasicZone.h"
+
57 #include "ace_time/ExtendedZone.h"
+
58 #include "ace_time/ZonedDateTime.h"
+ +
60 #include "ace_time/TimePeriod.h"
+ +
62 #include "ace_time/clock/Clock.h"
+
63 #include "ace_time/clock/NtpClock.h"
+
64 #include "ace_time/clock/DS3231Clock.h"
+
65 #include "ace_time/clock/UnixClock.h"
+
66 #include "ace_time/clock/SystemClock.h"
+
67 #include "ace_time/clock/SystemClockLoop.h"
+
68 #include "ace_time/clock/SystemClockCoroutine.h"
69 
-
70 #endif
+
70 #if defined(ARDUINO_ARCH_STM32)
+
71 #include "ace_time/clock/StmRtcClock.h"
+
72 #endif // #if defined(STM32_ARCH_STM32)
+
73 
+
74 
+
75 // Version format: xxyyzz == "xx.yy.zz"
+
76 #define ACE_TIME_VERSION 10500
+
77 #define ACE_TIME_VERSION_STRING "1.5"
+
78 
+
79 #endif
diff --git a/docs/html/BasicZoneProcessor_8cpp_source.html b/docs/html/BasicZoneProcessor_8cpp_source.html index 2b24c414f..f7dbb5eb2 100644 --- a/docs/html/BasicZoneProcessor_8cpp_source.html +++ b/docs/html/BasicZoneProcessor_8cpp_source.html @@ -22,7 +22,7 @@
AceTime -  1.4.1 +  1.5
Date and time classes for Arduino that support timezones from the TZ Database, and a system clock that can synchronize from an NTP server or an RTC chip.
@@ -83,17 +83,17 @@
10 namespace ace_time {
11 
12 void BasicZoneProcessor::printTo(Print& printer) const {
-
13  printer.print(BasicZone(mZoneInfo.zoneInfo()).name());
+
13  BasicZone(mZoneInfo.zoneInfo()).printNameTo(printer);
14 }
15 
16 void BasicZoneProcessor::printShortTo(Print& printer) const {
-
17  printer.print(BasicZone(mZoneInfo.zoneInfo()).shortName());
+
17  BasicZone(mZoneInfo.zoneInfo()).printShortNameTo(printer);
18 }
19 
20 }
21 
-
A thin wrapper around a basic::ZoneInfo data structure to provide a stable API access to some useful ...
Definition: BasicZone.h:22
+
A thin wrapper around a basic::ZoneInfo data structure to provide a stable API access to some useful ...
Definition: BasicZone.h:21
void printTo(Print &printer) const override
Print a human-readable identifier (e.g.
void printShortTo(Print &printer) const override
Print a short human-readable identifier (e.g.
diff --git a/docs/html/BasicZoneProcessor_8h_source.html b/docs/html/BasicZoneProcessor_8h_source.html index e3525c0de..7e7df1b0d 100644 --- a/docs/html/BasicZoneProcessor_8h_source.html +++ b/docs/html/BasicZoneProcessor_8h_source.html @@ -22,7 +22,7 @@
AceTime -  1.4.1 +  1.5
Date and time classes for Arduino that support timezones from the TZ Database, and a system clock that can synchronize from an NTP server or an RTC chip.
diff --git a/docs/html/BasicZone_8cpp_source.html b/docs/html/BasicZone_8cpp_source.html new file mode 100644 index 000000000..1f32ca982 --- /dev/null +++ b/docs/html/BasicZone_8cpp_source.html @@ -0,0 +1,160 @@ + + + + + + + +AceTime: /home/brian/src/AceTime/src/ace_time/BasicZone.cpp Source File + + + + + + + + + +
+
+ + + + + + +
+
AceTime +  1.5 +
+
Date and time classes for Arduino that support timezones from the TZ Database, and a system clock that can synchronize from an NTP server or an RTC chip.
+
+
+ + + + + + + + +
+
+ + +
+ +
+ + +
+
+
+
BasicZone.cpp
+
+
+
1 /*
+
2  * MIT License
+
3  * Copyright (c) 2019 Brian T. Park
+
4  */
+
5 
+
6 #include <Arduino.h>
+
7 #include <AceCommon.h> // KString
+
8 #include "BasicZone.h"
+
9 
+
10 using ace_common::KString;
+
11 
+
12 namespace ace_time {
+
13 
+
14 #if ACE_TIME_USE_PROGMEM
+
15 
+
16 void BasicZone::printNameTo(Print& printer) const {
+
17  const auto* name = (const __FlashStringHelper*) mZoneInfoBroker.name();
+
18  const basic::ZoneContext* zoneContext = mZoneInfoBroker.zoneContext();
+
19  KString kname(name, zoneContext->fragments, zoneContext->numFragments);
+
20  kname.printTo(printer);
+
21 }
+
22 
+
23 void BasicZone::printShortNameTo(Print& printer) const {
+
24  const char* name = mZoneInfoBroker.name();
+
25  const auto* shortName = (const __FlashStringHelper*) findShortName(name);
+
26  printer.print(shortName);
+
27 }
+
28 
+
29 const char* BasicZone::findShortName(const char* name) {
+
30  size_t len = strlen_P(name);
+
31  const char* begin = name + len;
+
32  bool separatorFound = false;
+
33  while (len--) {
+
34  begin--;
+
35  char c = pgm_read_byte(begin);
+
36  if (c == '/' || (0 < c && c < 32)) {
+
37  separatorFound = true;
+
38  break;
+
39  }
+
40  }
+
41  if (separatorFound) begin++;
+
42  return begin;
+
43 }
+
44 
+
45 #else
+
46 
+
47 void BasicZone::printNameTo(Print& printer) const {
+
48  const char* name = mZoneInfoBroker.name();
+
49  const basic::ZoneContext* zoneContext = mZoneInfoBroker.zoneContext();
+
50  KString kname(name, zoneContext->fragments, zoneContext->numFragments);
+
51  kname.printTo(printer);
+
52 }
+
53 
+
54 void BasicZone::printShortNameTo(Print& printer) const {
+
55  const char* name = mZoneInfoBroker.name();
+
56  const char* shortName = findShortName(name);
+
57  printer.print(shortName);
+
58 }
+
59 
+
60 const char* BasicZone::findShortName(const char* name) {
+
61  size_t len = strlen(name);
+
62  const char* begin = name + len;
+
63  bool separatorFound = false;
+
64  while (len--) {
+
65  begin--;
+
66  char c = *begin;
+
67  if (c == '/' || (0 < c && c < 32)) {
+
68  separatorFound = true;
+
69  break;
+
70  }
+
71  }
+
72  if (separatorFound) begin++;
+
73  return begin;
+
74 }
+
75 
+
76 #endif // ACE_TIME_USE_PROGMEM
+
77 
+
78 } // ace_time
+
+ + + + diff --git a/docs/html/BasicZone_8h_source.html b/docs/html/BasicZone_8h_source.html index 328ea05b6..ccb184efa 100644 --- a/docs/html/BasicZone_8h_source.html +++ b/docs/html/BasicZone_8h_source.html @@ -22,7 +22,7 @@
AceTime -  1.4.1 +  1.5
Date and time classes for Arduino that support timezones from the TZ Database, and a system clock that can synchronize from an NTP server or an RTC chip.
@@ -81,61 +81,39 @@
8 
9 #include "internal/ZoneInfo.h"
10 #include "internal/Brokers.h"
-
11 #include "common/compat.h"
-
12 
-
13 class __FlashStringHelper;
-
14 
-
15 namespace ace_time {
-
16 
-
22 class BasicZone {
-
23  public:
-
24  BasicZone(const basic::ZoneInfo* zoneInfo):
-
25  mZoneInfoBroker(zoneInfo) {}
-
26 
-
27 // TODO: Merge this with ExtendedZone.h now that they both use the same
-
28 // ACE_TIME_USE_PROGMEM macro.
-
29 #if ACE_TIME_USE_PROGMEM
-
30  const __FlashStringHelper* name() const {
-
31  return (const __FlashStringHelper*) mZoneInfoBroker.name();
-
32  }
-
33 
-
34  const __FlashStringHelper* shortName() const {
-
35  const char* name = mZoneInfoBroker.name();
-
36  const char* slash = strrchr_P(name, '/');
-
37  return (slash) ? (const __FlashStringHelper*) (slash + 1)
-
38  : (const __FlashStringHelper*) name;
-
39  }
-
40 #else
-
41  const char* name() const {
-
42  return (const char*) mZoneInfoBroker.name();
-
43  }
-
44 
-
45  const char* shortName() const {
-
46  const char* name = mZoneInfoBroker.name();
-
47  const char* slash = strrchr(name, '/');
-
48  return (slash) ? (slash + 1) : name;
-
49  }
-
50 #endif
+
11 
+
12 class Print;
+
13 
+
14 namespace ace_time {
+
15 
+
21 class BasicZone {
+
22  public:
+
23  BasicZone(const basic::ZoneInfo* zoneInfo):
+
24  mZoneInfoBroker(zoneInfo) {}
+
25 
+
26  void printNameTo(Print& printer) const;
+
27  void printShortNameTo(Print& printer) const;
+
28 
+
29  uint32_t zoneId() const {
+
30  return mZoneInfoBroker.zoneId();
+
31  }
+
32 
+
33  private:
+
34  // disable default copy constructor and assignment operator
+
35  BasicZone(const BasicZone&) = delete;
+
36  BasicZone& operator=(const BasicZone&) = delete;
+
37 
+
50  static const char* findShortName(const char* name);
51 
-
52  uint32_t zoneId() const {
-
53  return mZoneInfoBroker.zoneId();
-
54  }
-
55 
-
56  private:
-
57  // disable default copy constructor and assignment operator
-
58  BasicZone(const BasicZone&) = delete;
-
59  BasicZone& operator=(const BasicZone&) = delete;
-
60 
-
61  const basic::ZoneInfoBroker mZoneInfoBroker;
-
62 };
-
63 
-
64 }
-
65 
-
66 #endif
+
52  const basic::ZoneInfoBroker mZoneInfoBroker;
+
53 };
+
54 
+
55 }
+
56 
+
57 #endif
-
A thin wrapper around a basic::ZoneInfo data structure to provide a stable API access to some useful ...
Definition: BasicZone.h:22
- +
A thin wrapper around a basic::ZoneInfo data structure to provide a stable API access to some useful ...
Definition: BasicZone.h:21
Data broker for accessing ZoneInfo.
Definition: Brokers.h:306