~zorba-coders/zorba/bugs-912586-912593-912722

« back to all changes in this revision

Viewing changes to src/functions/func_var_decl.cpp

  • Committer: Cezar Andrei
  • Date: 2012-03-28 15:42:12 UTC
  • mfrom: (10606.1.129 zorba)
  • Revision ID: cezar.lp@cezarandrei.com-20120328154212-jh2heq49xcqjppce
Merge from trunck and resolve ChangeLog conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
67
67
    static_context* sctx, 
68
68
    const QueryLoc& loc,
69
69
    std::vector<PlanIter_t>& argv,
70
 
    AnnotationHolder& ann) const
 
70
    expr& ann) const
71
71
{
72
72
  const fo_expr& foExpr = static_cast<const fo_expr&>(ann);
73
73
 
88
88
********************************************************************************/
89
89
void populateContext_VarDecl(static_context* sctx)
90
90
{
91
 
  const char* zorba_op_ns = static_context::ZORBA_OP_NS.c_str();
 
91
  const char* zorba_op_ns = static_context::ZORBA_OP_NS;
92
92
 
93
93
  DECL(sctx, ctx_var_get,
94
94
       (createQName(zorba_op_ns, "", "ctxvar-get"),