diff --git a/include/internal/cef_string_list.h b/include/internal/cef_string_list.h index 0b6226bc7..e8339bdbc 100644 --- a/include/internal/cef_string_list.h +++ b/include/internal/cef_string_list.h @@ -41,7 +41,7 @@ extern "C" { /// /// CEF string maps are a set of key/value string pairs. /// -typedef void* cef_string_list_t; +typedef struct _cef_string_list_t* cef_string_list_t; /// /// Allocate a new string map. diff --git a/include/internal/cef_string_map.h b/include/internal/cef_string_map.h index f3a808356..40777c118 100644 --- a/include/internal/cef_string_map.h +++ b/include/internal/cef_string_map.h @@ -41,7 +41,7 @@ extern "C" { /// /// CEF string maps are a set of key/value string pairs. /// -typedef void* cef_string_map_t; +typedef struct _cef_string_map_t* cef_string_map_t; /// /// Allocate a new string map. diff --git a/include/internal/cef_string_multimap.h b/include/internal/cef_string_multimap.h index 313bd9dc7..9dde8053c 100644 --- a/include/internal/cef_string_multimap.h +++ b/include/internal/cef_string_multimap.h @@ -42,7 +42,7 @@ extern "C" { /// CEF string multimaps are a set of key/value string pairs. /// More than one value can be assigned to a single key. /// -typedef void* cef_string_multimap_t; +typedef struct _cef_string_multimap_t* cef_string_multimap_t; /// /// Allocate a new string multimap. diff --git a/libcef/common/string_list_impl.cc b/libcef/common/string_list_impl.cc index 02c956538..0b32ecf93 100644 --- a/libcef/common/string_list_impl.cc +++ b/libcef/common/string_list_impl.cc @@ -13,7 +13,7 @@ using StringList = std::vector; } // namespace CEF_EXPORT cef_string_list_t cef_string_list_alloc() { - return new StringList; + return reinterpret_cast(new StringList); } CEF_EXPORT size_t cef_string_list_size(cef_string_list_t list) { @@ -58,5 +58,5 @@ CEF_EXPORT void cef_string_list_free(cef_string_list_t list) { CEF_EXPORT cef_string_list_t cef_string_list_copy(cef_string_list_t list) { DCHECK(list); StringList* impl = reinterpret_cast(list); - return new StringList(*impl); + return reinterpret_cast(new StringList(*impl)); } diff --git a/libcef/common/string_map_impl.cc b/libcef/common/string_map_impl.cc index e95dbd09f..695e92745 100644 --- a/libcef/common/string_map_impl.cc +++ b/libcef/common/string_map_impl.cc @@ -13,7 +13,7 @@ using StringMap = std::map; } // namespace CEF_EXPORT cef_string_map_t cef_string_map_alloc() { - return new StringMap; + return reinterpret_cast(new StringMap); } CEF_EXPORT size_t cef_string_map_size(cef_string_map_t map) { diff --git a/libcef/common/string_multimap_impl.cc b/libcef/common/string_multimap_impl.cc index 24ff2307e..f35cdd8cf 100644 --- a/libcef/common/string_multimap_impl.cc +++ b/libcef/common/string_multimap_impl.cc @@ -13,7 +13,7 @@ using StringMultimap = std::multimap; } // namespace CEF_EXPORT cef_string_multimap_t cef_string_multimap_alloc() { - return new StringMultimap; + return reinterpret_cast(new StringMultimap); } CEF_EXPORT size_t cef_string_multimap_size(cef_string_multimap_t map) {