zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/feature-jdbc-tables into lp:zorba/jdbc-module.

Commit message:
fix build

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Paul J. Lucas (paul-lucas)

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

=== modified file 'include/tables.h'
--- include/tables.h	2013-06-11 20:39:07 +0000
+++ include/tables.h	2013-06-12 14:36:31 +0000
@@ -35,21 +35,14 @@
     XmlDataManager* theDataManager;
 
   public:
-    TablesFunction(const ExternalModule* aModule) :
-      theModule(aModule),
-      theFactory(Zorba::getInstance(0)->getItemFactory()),
-      theDataManager(Zorba::getInstance(0)->getXmlDataManager())
-    {}
+    TablesFunction(const ExternalModule* aModule);
 
-    ~TablesFunction()
-    {}
+    virtual ~TablesFunction();
 
   public:
-    virtual String getURI() const
-    { return theModule->getURI(); }
+    virtual String getURI() const;
 
-    virtual String getLocalName() const
-    { return "tables"; }
+    virtual String getLocalName() const;
 
     virtual ItemSequence_t 
       evaluate(const ExternalFunction::Arguments_t& args,
@@ -57,7 +50,4 @@
                const zorba::DynamicContext*) const;
 };
 
-
-
-}}; // namespace zorba, jdbc
-
+}} // namespace zorba, jdbc

=== modified file 'src/jdbc.xq.src/connection/tables.cpp'
--- src/jdbc.xq.src/connection/tables.cpp	2013-06-11 20:39:07 +0000
+++ src/jdbc.xq.src/connection/tables.cpp	2013-06-12 14:36:31 +0000
@@ -23,6 +23,27 @@
 namespace jdbc
 {
 
+TablesFunction::TablesFunction(const ExternalModule* aModule)
+  : theModule(aModule),
+    theFactory(Zorba::getInstance(0)->getItemFactory()),
+    theDataManager(Zorba::getInstance(0)->getXmlDataManager())
+{}
+
+TablesFunction::~TablesFunction()
+{}
+
+String
+TablesFunction::getURI() const
+{
+  return theModule->getURI();
+}
+
+String
+TablesFunction::getLocalName() const
+{
+  return "tables";
+}
+
 ItemSequence_t
 TablesFunction::evaluate(const ExternalFunction::Arguments_t& args,
                            const zorba::StaticContext* aStaticContext,