Declare language tag lists as const.

diff --git a/scripts/update-language-subtags b/scripts/update-language-subtags
index e533466d0006254e9a3794e41737ad48eabdac47..5990085e81a765df33ab599e3b9be4ca0f2da3a4 100755 (executable)
--- a/scripts/update-language-subtags
+++ b/scripts/update-language-subtags
@@ -30,7 +30,7 @@ def escape(s):
 
 with open('src/language_tag_lists.cc', 'w') as f:
     for k, v in lists.items():
-        print("static LanguageTag::SubtagData %s_list[] = {" % k, file=f)
+        print("static LanguageTag::SubtagData const %s_list[] = {" % k, file=f)
         for e in v:
             print('\t{ "%s", "%s" },' % (escape(e[0]), escape(e[1])), file=f)
         print("};", file=f)

diff --git a/src/language_tag.cc b/src/language_tag.cc
index 4ac90507101b3c20ae0caa356c6e83a4261b040d..cb5f84c92b3039b825b6caa88dec991310e4d00a 100644 (file)
--- a/src/language_tag.cc
+++ b/src/language_tag.cc
@@ -55,7 +55,7 @@ using namespace dcp;
 
 static
 optional<LanguageTag::SubtagData>
-find_in_list (LanguageTag::SubtagData* list, int length, string subtag)
+find_in_list (LanguageTag::SubtagData const * list, int length, string subtag)
 {
        for (int i = 0; i < length; ++i) {
                if (list[i].subtag == subtag) {

diff --git a/src/language_tag_lists.cc b/src/language_tag_lists.cc
index 8121182864082f1a45a0cb232e2380499fab5d45..a85fb0c72f17d69c73a501604f5b3d96afc28b53 100644 (file)
--- a/src/language_tag_lists.cc
+++ b/src/language_tag_lists.cc
@@ -1,4 +1,4 @@
-static LanguageTag::SubtagData language_list[] = {
+static LanguageTag::SubtagData const language_list[] = {
        { "aa", "Afar" },
        { "ab", "Abkhazian" },
        { "ae", "Avestan" },
@@ -8179,7 +8179,7 @@ static LanguageTag::SubtagData language_list[] = {
        { "zzj", "Zuojiang Zhuang" },
 };
 
-static LanguageTag::SubtagData extlang_list[] = {
+static LanguageTag::SubtagData const extlang_list[] = {
        { "aao", "Algerian Saharan Arabic" },
        { "abh", "Tajiki Arabic" },
        { "abv", "Baharna Arabic" },
@@ -8421,7 +8421,7 @@ static LanguageTag::SubtagData extlang_list[] = {
        { "zsm", "Standard Malay" },
 };
 
-static LanguageTag::SubtagData script_list[] = {
+static LanguageTag::SubtagData const script_list[] = {
        { "Adlm", "Adlam" },
        { "Afak", "Afaka" },
        { "Aghb", "Caucasian Albanian" },
@@ -8626,7 +8626,7 @@ static LanguageTag::SubtagData script_list[] = {
        { "Zzzz", "Code for uncoded script" },
 };
 
-static LanguageTag::SubtagData region_list[] = {
+static LanguageTag::SubtagData const region_list[] = {
        { "AA", "Private use" },
        { "AC", "Ascension Island" },
        { "AD", "Andorra" },
@@ -8933,7 +8933,7 @@ static LanguageTag::SubtagData region_list[] = {
        { "419", "Latin America and the Caribbean" },
 };
 
-static LanguageTag::SubtagData variant_list[] = {
+static LanguageTag::SubtagData const variant_list[] = {
        { "1606nict", "Late Middle French (to 1606)" },
        { "1694acad", "Early Modern French" },
        { "1901", "Traditional German orthography" },