Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/97172
Fixed bug #948259
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/97172
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/api/store.h'
--- src/store/api/store.h 2011-12-21 14:40:33 +0000
+++ src/store/api/store.h 2012-03-13 10:07:23 +0000
@@ -97,7 +97,7 @@
* @param node XDM node
* @return the identifier as an item of type xs:anyURI
*/
- virtual bool getNodeReference(Item_t& result, Item* node) = 0;
+ virtual bool getNodeReference(Item_t& result, const Item* node) = 0;
/**
* Returns whether a reference has already been generated for the given node.
=== modified file 'src/store/naive/simple_store.cpp'
--- src/store/naive/simple_store.cpp 2012-02-28 20:45:43 +0000
+++ src/store/naive/simple_store.cpp 2012-03-13 10:07:23 +0000
@@ -1359,9 +1359,9 @@
@param node XDM node
@return the identifier as an item of type xs:anyURI
********************************************************************************/
-bool SimpleStore::getNodeReference(store::Item_t& result, store::Item* node)
+bool SimpleStore::getNodeReference(store::Item_t& result, const store::Item* node)
{
- XmlNode* xmlNode = static_cast<XmlNode*>(node);
+ const XmlNode* xmlNode = static_cast<const XmlNode*>(node);
if (xmlNode->haveReference())
{
@@ -1377,7 +1377,7 @@
uuid_create(&uuid);
zstring uuidStr = uuidToURI(uuid);
- xmlNode->setHaveReference();
+ const_cast<XmlNode*>(xmlNode)->setHaveReference();
theNodeToReferencesMap.insert(xmlNode, uuidStr);
theReferencesToNodeMap[uuidStr] = node;
=== modified file 'src/store/naive/simple_store.h'
--- src/store/naive/simple_store.h 2012-02-28 20:45:43 +0000
+++ src/store/naive/simple_store.h 2012-03-13 10:07:23 +0000
@@ -369,7 +369,7 @@
/* ------------------------ Node Reference Management ---------------------------*/
- bool getNodeReference(store::Item_t& result, store::Item* node);
+ bool getNodeReference(store::Item_t& result, const store::Item* node);
bool hasReference(const store::Item* node);
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
