Merge lp:~zorba-coders/zorba/bug1068240 into lp:zorba

[Juan Zacarias]

 Changed DynamicContext function addExternalFunctionParameter to const

 Changed DynamicContext function addExternalFunctionParameter to const

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1068240-2012-10-22T17-21-43.277Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug1068240 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug1068240-2012-10-22T17-21-43.277Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1068240-2012-10-22T19-12-38.498Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug1068240-2012-10-22T19-12-38.498Z is finished. The final status was:

All tests succeeded!

=== modified file 'include/zorba/dynamic_context.h'
--- include/zorba/dynamic_context.h	2012-10-08 12:09:36 +0000
+++ include/zorba/dynamic_context.h	2012-10-22 17:16:25 +0000
@@ -284,7 +284,7 @@
    *  false otherwise.
    */
   virtual bool
-  addExternalFunctionParameter ( const String& aName, ExternalFunctionParameter* aParam ) = 0;
+  addExternalFunctionParameter ( const String& aName, ExternalFunctionParameter* aParam ) const = 0;
 
   /** \brief Get the value of a pair that was registered using
    *         the addExternalFunctionParam method. This can

=== modified file 'src/api/dynamiccontextimpl.cpp'
--- src/api/dynamiccontextimpl.cpp	2012-10-08 12:09:36 +0000
+++ src/api/dynamiccontextimpl.cpp	2012-10-22 17:16:25 +0000
@@ -715,7 +715,7 @@
 bool
 DynamicContextImpl::addExternalFunctionParameter (
     const String& aName,
-    ExternalFunctionParameter* aValue )
+    ExternalFunctionParameter* aValue ) const
 {
   ZORBA_DCTX_TRY
   {

=== modified file 'src/api/dynamiccontextimpl.h'
--- src/api/dynamiccontextimpl.h	2012-10-08 12:09:36 +0000
+++ src/api/dynamiccontextimpl.h	2012-10-22 17:16:25 +0000
@@ -151,7 +151,7 @@
   getExternalFunctionParam(const String& aName, void*&) const;
 
   virtual bool
-  addExternalFunctionParameter(const String& aName, ExternalFunctionParameter* aParam);
+  addExternalFunctionParameter(const String& aName, ExternalFunctionParameter* aParam) const;
 
   virtual ExternalFunctionParameter*
   getExternalFunctionParameter(const String& aName) const;

=== modified file 'src/context/dynamic_context.cpp'
--- src/context/dynamic_context.cpp	2012-09-19 21:16:15 +0000
+++ src/context/dynamic_context.cpp	2012-10-22 17:16:25 +0000
@@ -891,7 +891,7 @@
 ********************************************************************************/
 bool dynamic_context::addExternalFunctionParameter(
    const std::string& aName,
-   ExternalFunctionParameter* aValue)
+   ExternalFunctionParameter* aValue) const
 {
   if (!keymap)
   {

=== modified file 'src/context/dynamic_context.h'
--- src/context/dynamic_context.h	2012-10-19 20:42:38 +0000
+++ src/context/dynamic_context.h	2012-10-22 17:16:25 +0000
@@ -129,7 +129,7 @@
 
   std::vector<VarValue>        theVarValues;
 
-  ValueMap                   * keymap;
+  mutable ValueMap                   * keymap;
 
   IndexMap                   * theAvailableIndices;
 
@@ -241,7 +241,7 @@
 
   bool addExternalFunctionParameter(
      const std::string& aName,
-     ExternalFunctionParameter* aValue);
+     ExternalFunctionParameter* aValue) const;
 
   ExternalFunctionParameter* getExternalFunctionParameter(
       const std::string& aName) const;