diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-04-08 08:42:34 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-04-08 08:42:34 +0000 |
| commit | df8bf3a88ab4c778730187586f8f068a7ba00a8e (patch) | |
| tree | e5ea779a565c6a3d07ea5dc9af6bd182f9409f81 /databases/mysql57-server/files/patch-sql_json__dom.h | |
| parent | editors/emacs: (diff) | |
Fix patches that were accidentally concatenated twice in r412695.
Reported by: Vladimir Omelchuk <admin@vladiom.com.ua>
Pointy hat to: dim
PR: 208525
MFH: 2016Q2
Diffstat (limited to 'databases/mysql57-server/files/patch-sql_json__dom.h')
| -rw-r--r-- | databases/mysql57-server/files/patch-sql_json__dom.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/databases/mysql57-server/files/patch-sql_json__dom.h b/databases/mysql57-server/files/patch-sql_json__dom.h index 14fc069505cb..00734d46143d 100644 --- a/databases/mysql57-server/files/patch-sql_json__dom.h +++ b/databases/mysql57-server/files/patch-sql_json__dom.h @@ -9,14 +9,3 @@ /** 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 |