diff options
| author | Daniël de Kok <me@danieldk.eu> | 2018-07-24 08:21:57 +0200 |
|---|---|---|
| committer | Ryan Mulligan <ryan@ryantm.com> | 2018-07-24 20:27:51 -0700 |
| commit | 52e7494186d336c4d413c6a7081a387740a02b3d (patch) | |
| tree | cd68fca2a2c4190b0e2ea5a98daac8eb0d74bff5 /pkgs/development/libraries/dbxml/cxx11.patch | |
| parent | fec22d4ff41628b2cb2e7480dfcb1c390abaf2d0 (diff) | |
| download | nixpkgs-52e7494186d336c4d413c6a7081a387740a02b3d.tar nixpkgs-52e7494186d336c4d413c6a7081a387740a02b3d.tar.gz nixpkgs-52e7494186d336c4d413c6a7081a387740a02b3d.tar.bz2 nixpkgs-52e7494186d336c4d413c6a7081a387740a02b3d.tar.lz nixpkgs-52e7494186d336c4d413c6a7081a387740a02b3d.tar.xz nixpkgs-52e7494186d336c4d413c6a7081a387740a02b3d.tar.zst nixpkgs-52e7494186d336c4d413c6a7081a387740a02b3d.zip | |
dbxml: init at 6.1.4
Website: https://www.oracle.com/database/berkeley-db/xml.html Changelog: http://download.oracle.com/otndocs/products/berkeleydb/html/dbxml614.html
Diffstat (limited to 'pkgs/development/libraries/dbxml/cxx11.patch')
| -rw-r--r-- | pkgs/development/libraries/dbxml/cxx11.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/pkgs/development/libraries/dbxml/cxx11.patch b/pkgs/development/libraries/dbxml/cxx11.patch new file mode 100644 index 00000000000..f264515c7d6 --- /dev/null +++ b/pkgs/development/libraries/dbxml/cxx11.patch @@ -0,0 +1,59 @@ +diff -urN dbxml-6.1.4.orig/dbxml/src/dbxml/nodeStore/NsUpdate.cpp dbxml-6.1.4/dbxml/src/dbxml/nodeStore/NsUpdate.cpp +--- dbxml-6.1.4.orig/dbxml/src/dbxml/nodeStore/NsUpdate.cpp 2017-05-01 16:05:29.000000000 +0100 ++++ dbxml-6.1.4/dbxml/src/dbxml/nodeStore/NsUpdate.cpp 2017-09-04 11:50:20.000000000 +0100 +@@ -1359,21 +1359,13 @@ + void NsUpdate::attributeRemoved(const DbXmlNodeImpl &node) + { + string key = makeKey(node); +-#if defined(_MSC_VER) && (_MSC_VER>1600) + attrMap_.insert(make_pair(key,node.getIndex())); +-#else +- attrMap_.insert(make_pair<const std::string, int>(key,node.getIndex())); +-#endif + } + + void NsUpdate::textRemoved(const DbXmlNodeImpl &node) + { + string key = makeKey(node); +-#if defined(_MSC_VER) && (_MSC_VER>1600) + textDeleteMap_.insert(make_pair(key,node.getIndex())); +-#else +- textDeleteMap_.insert(make_pair<const std::string, int>(key,node.getIndex())); +-#endif + } + + void NsUpdate::textRemoved(int index, const NsNid &nid, +@@ -1381,21 +1373,13 @@ + const std::string &cname) + { + string key = makeKey(nid, did, cname); +-#if defined(_MSC_VER) && (_MSC_VER>1600) + textDeleteMap_.insert(make_pair(key,index)); +-#else +- textDeleteMap_.insert(make_pair<const std::string, int>(key,index)); +-#endif + } + + void NsUpdate::textInserted(int index, const DbXmlNodeImpl &node) + { + string key = makeKey(node); +-#if defined(_MSC_VER) && (_MSC_VER>1600) + textInsertMap_.insert(make_pair(key,index)); +-#else +- textInsertMap_.insert(make_pair<const std::string, int>(key,index)); +-#endif + } + + void NsUpdate::textInserted(int index, const NsNid &nid, +@@ -1403,11 +1387,7 @@ + const std::string &cname) + { + string key = makeKey(nid, did, cname); +-#if defined(_MSC_VER) && (_MSC_VER>1600) + textInsertMap_.insert(make_pair(key,index)); +-#else +- textInsertMap_.insert(make_pair<const std::string, int>(key,index)); +-#endif + } + + // |