zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/geo-module-nsbindings into lp:zorba/geo-module.

Requested reviews:
  Chris Hillery (ceejatec)
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/geo-module-nsbindings/+merge/88251
-- 
https://code.launchpad.net/~zorba-coders/zorba/geo-module-nsbindings/+merge/88251
Your team Zorba Coders is subscribed to branch lp:zorba/geo-module.

=== modified file 'src/org/expath/ns/geo.xq.src/geo_functions.cpp'
--- src/org/expath/ns/geo.xq.src/geo_functions.cpp	2011-07-07 14:54:21 +0000
+++ src/org/expath/ns/geo.xq.src/geo_functions.cpp	2012-01-11 18:30:37 +0000
@@ -677,7 +677,7 @@
         Item  item_type;
         zorba::Item   null_parent;
         item_name = theModule->getItemFactory()->createQName("http://www.opengis.net/gml";, "gml", "Point");
-        std::vector<std::pair<String, String> >   ns_binding;
+        NsBindings ns_binding;
         ns_binding.push_back(std::pair<String, String>("gml", "http://www.opengis.net/gml";));
         item_type = theModule->getItemFactory()->createQName("http://www.w3.org/2001/XMLSchema";, "untyped");
         *result_item = theModule->getItemFactory()->createElementNode(null_parent, item_name, item_type, false, false, ns_binding);
@@ -878,7 +878,7 @@
         Item  item_type;
         zorba::Item   null_parent;
         item_name = theModule->getItemFactory()->createQName("http://www.opengis.net/gml";, "gml", "Point");
-        std::vector<std::pair<String, String> >   ns_binding;
+        NsBindings ns_binding;
         ns_binding.push_back(std::pair<String, String>("gml", "http://www.opengis.net/gml";));
         item_type = theModule->getItemFactory()->createQName("http://www.w3.org/2001/XMLSchema";, "untyped");
         *result_item = theModule->getItemFactory()->createElementNode(null_parent, item_name, item_type, false, false, ns_binding);
@@ -1532,7 +1532,7 @@
   zorba::Item   result_item;
   zorba::Item   item_name;
   zorba::Item   item_type;
-  std::vector<std::pair<String, String> >   ns_binding;
+  NsBindings ns_binding;
   ns_binding.push_back(std::pair<String, String>("gml", "http://www.opengis.net/gml";));
   item_type = theModule->getItemFactory()->createQName("http://www.w3.org/2001/XMLSchema";, "untyped");
 
@@ -2747,7 +2747,7 @@
   zorba::Item   item_name;
   zorba::Item   item_type;
   zorba::Item   null_parent;
-  std::vector<std::pair<String, String> >   ns_binding;
+  zorba::NsBindings ns_binding;
   char strtemp[100];
   ns_binding.push_back(std::pair<String, String>("gml", "http://www.opengis.net/gml";));
   item_type = theModule->getItemFactory()->createQName("http://www.w3.org/2001/XMLSchema";, "untyped");