MdeModulePkg: Fix VS2015 warning C4311 & C4312 in RegularExpressionDxe

[mirror_edk2.git] / MdeModulePkg / Universal / RegularExpressionDxe / Oniguruma / regparse.c

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
index 01ac2b3136d4364f0c067f48904847f344f981de..4be2f229bc16664f8997153e560c12270eb13755 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
@@ -369,7 +369,7 @@ onig_st_lookup_strend(hash_table_type* table, const UChar* str_key,
   key.s   = (UChar* )str_key;\r
   key.end = (UChar* )end_key;\r
 \r
-  return onig_st_lookup(table, (st_data_t )(&key), value);\r
+  return onig_st_lookup(table, (st_data_t )(UINTN)(&key), value);\r
 }\r
 \r
 extern int\r
@@ -382,7 +382,7 @@ onig_st_insert_strend(hash_table_type* table, const UChar* str_key,
   key = (st_str_end_key* )xmalloc(sizeof(st_str_end_key));\r
   key->s   = (UChar* )str_key;\r
   key->end = (UChar* )end_key;\r
-  result = onig_st_insert(table, (st_data_t )key, value);\r
+  result = onig_st_insert(table, (st_data_t )(UINTN)key, value);\r
   if (result) {\r
     xfree(key);\r
   }\r
@@ -534,7 +534,7 @@ onig_foreach_name(regex_t* reg,
     narg.reg  = reg;\r
     narg.arg  = arg;\r
     narg.enc  = reg->enc; /* should be pattern encoding. */\r
-    onig_st_foreach(t, i_names, (HashDataType )&narg);\r
+    onig_st_foreach(t, i_names, (HashDataType )(UINTN)&narg);\r
   }\r
   return narg.ret;\r
 }\r
@@ -562,7 +562,7 @@ onig_renumber_name_table(regex_t* reg, GroupNumRemap* map)
   NameTable* t = (NameTable* )reg->name_table;\r
 \r
   if (IS_NOT_NULL(t)) {\r
-    onig_st_foreach(t, i_renumber_name, (HashDataType )map);\r
+    onig_st_foreach(t, i_renumber_name, (HashDataType )(UINTN)map);\r
   }\r
   return 0;\r
 }\r
@@ -742,7 +742,7 @@ name_add(regex_t* reg, UChar* name, UChar* name_end, int backref, ScanEnv* env)
       xfree(e);  return ONIGERR_MEMORY;\r
     }\r
     onig_st_insert_strend(t, e->name, (e->name + (name_end - name)),\r
-                          (HashDataType )e);\r
+                          (HashDataType )(UINTN)e);\r
 \r
     e->name_len   = (int)(name_end - name);\r
     e->back_num   = 0;\r
@@ -5217,7 +5217,7 @@ parse_exp(Node** np, OnigToken* tok, int term,
               }\r
             }\r
             else {\r
-              if (onig_st_lookup(OnigTypeCClassTable, (st_data_t )&key,\r
+              if (onig_st_lookup(OnigTypeCClassTable, (st_data_t )(UINTN)&key,\r
                                  (st_data_t* )np)) {\r
                 THREAD_ATOMIC_END;\r
                 break;\r
@@ -5235,8 +5235,8 @@ parse_exp(Node** np, OnigToken* tok, int term,
             NCCLASS_SET_SHARE(cc);\r
             new_key = (type_cclass_key* )xmalloc(sizeof(type_cclass_key));\r
            xmemcpy(new_key, &key, sizeof(type_cclass_key));\r
-            onig_st_add_direct(OnigTypeCClassTable, (st_data_t )new_key,\r
-                               (st_data_t )*np);\r
+            onig_st_add_direct(OnigTypeCClassTable, (st_data_t )(UINTN)new_key,\r
+                               (st_data_t )(UINTN)*np);\r
             \r
             THREAD_ATOMIC_END;\r
           }\r