tjh.dev
1diff -urN dbxml-6.1.4.orig/dbxml/src/dbxml/nodeStore/NsUpdate.cpp dbxml-6.1.4/dbxml/src/dbxml/nodeStore/NsUpdate.cpp
2--- dbxml-6.1.4.orig/dbxml/src/dbxml/nodeStore/NsUpdate.cpp 2017-05-01 16:05:29.000000000 +0100
3+++ dbxml-6.1.4/dbxml/src/dbxml/nodeStore/NsUpdate.cpp 2017-09-04 11:50:20.000000000 +0100
4@@ -1359,21 +1359,13 @@
5 void NsUpdate::attributeRemoved(const DbXmlNodeImpl &node)
6 {
7 string key = makeKey(node);
8-#if defined(_MSC_VER) && (_MSC_VER>1600)
9 attrMap_.insert(make_pair(key,node.getIndex()));
10-#else
11- attrMap_.insert(make_pair<const std::string, int>(key,node.getIndex()));
12-#endif
13 }
14
15 void NsUpdate::textRemoved(const DbXmlNodeImpl &node)
16 {
17 string key = makeKey(node);
18-#if defined(_MSC_VER) && (_MSC_VER>1600)
19 textDeleteMap_.insert(make_pair(key,node.getIndex()));
20-#else
21- textDeleteMap_.insert(make_pair<const std::string, int>(key,node.getIndex()));
22-#endif
23 }
24
25 void NsUpdate::textRemoved(int index, const NsNid &nid,
26@@ -1381,21 +1373,13 @@
27 const std::string &cname)
28 {
29 string key = makeKey(nid, did, cname);
30-#if defined(_MSC_VER) && (_MSC_VER>1600)
31 textDeleteMap_.insert(make_pair(key,index));
32-#else
33- textDeleteMap_.insert(make_pair<const std::string, int>(key,index));
34-#endif
35 }
36
37 void NsUpdate::textInserted(int index, const DbXmlNodeImpl &node)
38 {
39 string key = makeKey(node);
40-#if defined(_MSC_VER) && (_MSC_VER>1600)
41 textInsertMap_.insert(make_pair(key,index));
42-#else
43- textInsertMap_.insert(make_pair<const std::string, int>(key,index));
44-#endif
45 }
46
47 void NsUpdate::textInserted(int index, const NsNid &nid,
48@@ -1403,11 +1387,7 @@
49 const std::string &cname)
50 {
51 string key = makeKey(nid, did, cname);
52-#if defined(_MSC_VER) && (_MSC_VER>1600)
53 textInsertMap_.insert(make_pair(key,index));
54-#else
55- textInsertMap_.insert(make_pair<const std::string, int>(key,index));
56-#endif
57 }
58
59 //