FreeBSD Bugzilla – Attachment 169098 Details for
Bug 208525
databases/mysql57-server: Fix build with libc++ 3.8.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
patches_error
patches_error (text/plain), 3.80 KB, created by
Vladimir Omelchuk
on 2016-04-08 08:08:05 UTC
(
hide
)
Description:
patches_error
Filename:
MIME Type:
Creator:
Vladimir Omelchuk
Created:
2016-04-08 08:08:05 UTC
Size:
3.80 KB
patch
obsolete
><patch-sql_json__dom.h> >========================================================================================== >--- sql/json_dom.h.orig 2015-11-29 19:16:24 UTC >+++ sql/json_dom.h >@@ -368,7 +368,7 @@ struct Json_key_comparator > Json_object class. > */ > typedef std::map<std::string, Json_dom *, Json_key_comparator, >- Malloc_allocator<std::pair<std::string, Json_dom *> > > Json_object_map; >+ Malloc_allocator<std::pair<const std::string, Json_dom *> > > Json_object_map; > > /** > Represents a JSON container value of type "object" (ECMA), type >--- sql/json_dom.h.orig 2015-11-29 19:16:24 UTC >+++ sql/json_dom.h >@@ -368,7 +368,7 @@ struct Json_key_comparator > Json_object class. > */ > typedef std::map<std::string, Json_dom *, Json_key_comparator, >- Malloc_allocator<std::pair<std::string, Json_dom *> > > Json_object_map; >+ Malloc_allocator<std::pair<const std::string, Json_dom *> > > Json_object_map; > > /** > Represents a JSON container value of type "object" (ECMA), type > > ><patch-storage_innobase_buf_buf0buf.cc> >========================================================================================== >--- storage/innobase/buf/buf0buf.cc.orig 2015-11-29 19:16:24 UTC >+++ storage/innobase/buf/buf0buf.cc >@@ -300,7 +300,7 @@ typedef std::map< > const byte*, > buf_chunk_t*, > std::less<const byte*>, >- ut_allocator<std::pair<const byte*, buf_chunk_t*> > > >+ ut_allocator<std::pair<const byte* const, buf_chunk_t*> > > > buf_pool_chunk_map_t; > > static buf_pool_chunk_map_t* buf_chunk_map_reg; >--- storage/innobase/buf/buf0buf.cc.orig 2015-11-29 19:16:24 UTC >+++ storage/innobase/buf/buf0buf.cc >@@ -300,7 +300,7 @@ typedef std::map< > const byte*, > buf_chunk_t*, > std::less<const byte*>, >- ut_allocator<std::pair<const byte*, buf_chunk_t*> > > >+ ut_allocator<std::pair<const byte* const, buf_chunk_t*> > > > buf_pool_chunk_map_t; > > static buf_pool_chunk_map_t* buf_chunk_map_reg; > > ><patch-storage_innobase_dict_dict0stats.cc> >========================================================================================== >--- storage/innobase/dict/dict0stats.cc.orig 2015-11-29 19:16:24 UTC >+++ storage/innobase/dict/dict0stats.cc >@@ -139,7 +139,7 @@ then we would store 5,7,10,11,12 in the > typedef std::vector<ib_uint64_t, ut_allocator<ib_uint64_t> > boundaries_t; > > /** Allocator type used for index_map_t. */ >-typedef ut_allocator<std::pair<const char*, dict_index_t*> > >+typedef ut_allocator<std::pair<const char* const, dict_index_t*> > > index_map_t_allocator; > > /** Auxiliary map used for sorting indexes by name in dict_stats_save(). */ >--- storage/innobase/dict/dict0stats.cc.orig 2015-11-29 19:16:24 UTC >+++ storage/innobase/dict/dict0stats.cc >@@ -139,7 +139,7 @@ then we would store 5,7,10,11,12 in the > typedef std::vector<ib_uint64_t, ut_allocator<ib_uint64_t> > boundaries_t; > > /** Allocator type used for index_map_t. */ >-typedef ut_allocator<std::pair<const char*, dict_index_t*> > >+typedef ut_allocator<std::pair<const char* const, dict_index_t*> > > index_map_t_allocator; > > /** Auxiliary map used for sorting indexes by name in dict_stats_save(). */ > > ><patch-storage_innobase_sync_sync0debug.cc> >========================================================================================== >--- storage/innobase/sync/sync0debug.cc.orig 2015-11-29 19:16:24 UTC >+++ storage/innobase/sync/sync0debug.cc >@@ -1704,7 +1704,7 @@ private: > const void*, > File, > std::less<const void*>, >- ut_allocator<std::pair<const void*, File> > > >+ ut_allocator<std::pair<const void* const, File> > > > Files; > > typedef OSMutex Mutex; >--- storage/innobase/sync/sync0debug.cc.orig 2015-11-29 19:16:24 UTC >+++ storage/innobase/sync/sync0debug.cc >@@ -1704,7 +1704,7 @@ private: > const void*, > File, > std::less<const void*>, >- ut_allocator<std::pair<const void*, File> > > >+ ut_allocator<std::pair<const void* const, File> > > > Files; > > typedef OSMutex Mutex;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 208525
:
168978
|
169038
| 169098