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

« back to all changes in this revision

Viewing changes to src/functions/pregenerated/func_parsing_and_serializing.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:
36
36
  static_context* sctx,
37
37
  const QueryLoc& loc,
38
38
  std::vector<PlanIter_t>& argv,
39
 
  AnnotationHolder& ann) const
 
39
  expr& ann) const
40
40
{
41
41
  return new FnParseXmlIterator(sctx, loc, argv);
42
42
}
46
46
  static_context* sctx,
47
47
  const QueryLoc& loc,
48
48
  std::vector<PlanIter_t>& argv,
49
 
  AnnotationHolder& ann) const
 
49
  expr& ann) const
50
50
{
51
51
  return new FnSerializeIterator(sctx, loc, argv);
52
52
}