MdeModulePkg: Fix VS2015 warning C4311 & C4312 in RegularExpressionDxe

[mirror_edk2.git] / MdeModulePkg / Universal / RegularExpressionDxe / Oniguruma / enc / unicode.c

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/unicode.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/unicode.c
index 70a1a5207a00becfb22d5396e55457145c17f965..a9066703b849a80590969dd48426b4cc6558e120 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/unicode.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/unicode.c
@@ -10920,12 +10920,12 @@ static int init_case_fold_table(void)
   if (ONIG_IS_NULL(FoldTable)) return ONIGERR_MEMORY;\r
   for (i = 0; i < (int )(sizeof(CaseFold)/sizeof(CaseFold_11_Type)); i++) {\r
     p = &CaseFold[i];\r
-    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));\r
+    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )(UINTN)&(p->to));\r
   }\r
   for (i = 0; i < (int )(sizeof(CaseFold_Locale)/sizeof(CaseFold_11_Type));\r
        i++) {\r
     p = &CaseFold_Locale[i];\r
-    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));\r
+    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )(UINTN)&(p->to));\r
   }\r
 \r
   Unfold1Table = st_init_numtable_with_size(1000);\r
@@ -10934,13 +10934,13 @@ static int init_case_fold_table(void)
   for (i = 0; i < (int )(sizeof(CaseUnfold_11)/sizeof(CaseUnfold_11_Type));\r
        i++) {\r
     p1 = &CaseUnfold_11[i];\r
-    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));\r
+    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )(UINTN)&(p1->to));\r
   }\r
   for (i = 0;\r
        i < (int )(sizeof(CaseUnfold_11_Locale)/sizeof(CaseUnfold_11_Type));\r
        i++) {\r
     p1 = &CaseUnfold_11_Locale[i];\r
-    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));\r
+    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )(UINTN)&(p1->to));\r
   }\r
 \r
   Unfold2Table = st_init_table_with_size(&type_code2_hash, 200);\r
@@ -10949,13 +10949,13 @@ static int init_case_fold_table(void)
   for (i = 0; i < (int )(sizeof(CaseUnfold_12)/sizeof(CaseUnfold_12_Type));\r
        i++) {\r
     p2 = &CaseUnfold_12[i];\r
-    st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));\r
+    st_add_direct(Unfold2Table, (st_data_t )(UINTN)p2->from, (st_data_t )(UINTN)(&p2->to));\r
   }\r
   for (i = 0;\r
        i < (int )(sizeof(CaseUnfold_12_Locale)/sizeof(CaseUnfold_12_Type));\r
        i++) {\r
     p2 = &CaseUnfold_12_Locale[i];\r
-    st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));\r
+    st_add_direct(Unfold2Table, (st_data_t )(UINTN)p2->from, (st_data_t )(UINTN)(&p2->to));\r
   }\r
 \r
   Unfold3Table = st_init_table_with_size(&type_code3_hash, 30);\r
@@ -10964,7 +10964,7 @@ static int init_case_fold_table(void)
   for (i = 0; i < (int )(sizeof(CaseUnfold_13)/sizeof(CaseUnfold_13_Type));\r
        i++) {\r
     p3 = &CaseUnfold_13[i];\r
-    st_add_direct(Unfold3Table, (st_data_t )p3->from, (st_data_t )(&p3->to));\r
+    st_add_direct(Unfold3Table, (st_data_t )(UINTN)p3->from, (st_data_t )(UINTN)(&p3->to));\r
   }\r
 \r
 \r
@@ -11265,7 +11265,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
          }\r
        }\r
 \r
-       if (onig_st_lookup(Unfold2Table, (st_data_t )to->code,\r
+       if (onig_st_lookup(Unfold2Table, (st_data_t )(UINTN)to->code,\r
                           (void* )&z2) != 0) {\r
          for (i = 0; i < z2->n; i++) {\r
            if (z2->code[i] == code) continue;\r
@@ -11291,7 +11291,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
          }\r
        }\r
 \r
-       if (onig_st_lookup(Unfold3Table, (st_data_t )to->code,\r
+       if (onig_st_lookup(Unfold3Table, (st_data_t )(UINTN)to->code,\r
                           (void* )&z2) != 0) {\r
          for (i = 0; i < z2->n; i++) {\r
            if (z2->code[i] == code) continue;\r
@@ -11336,7 +11336,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 \r
       clen = enclen(enc, p);\r
       len += clen;\r
-      if (onig_st_lookup(Unfold2Table, (st_data_t )codes, (void* )&z2) != 0) {\r
+      if (onig_st_lookup(Unfold2Table, (st_data_t )(UINTN)codes, (void* )&z2) != 0) {\r
        for (i = 0; i < z2->n; i++) {\r
          items[n].byte_len = len;\r
          items[n].code_len = 1;\r
@@ -11357,7 +11357,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 \r
        clen = enclen(enc, p);\r
        len += clen;\r
-       if (onig_st_lookup(Unfold3Table, (st_data_t )codes,\r
+       if (onig_st_lookup(Unfold3Table, (st_data_t )(UINTN)codes,\r
                           (void* )&z2) != 0) {\r
          for (i = 0; i < z2->n; i++) {\r
            items[n].byte_len = len;\r