← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/compiler/expression/expr.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:
src/compiler/expression/expr.cpp
41
41
#include "compiler/expression/var_expr.h"
42
42
#include "compiler/expression/expr_utils.h"
43
43
#include "compiler/expression/expr_visitor.h"
44
 
#include "compiler/semantic_annotations/annotation_keys.h"
45
44
#include "compiler/parser/parse_constants.h"
46
45
 
47
46
#include "store/api/store.h"
50
49
namespace zorba 
51
50
{
52
51
 
53
 
SERIALIZABLE_CLASS_VERSIONS(AnnotationHolder)
54
 
END_SERIALIZABLE_CLASS_VERSIONS(AnnotationHolder)
55
 
 
56
52
SERIALIZABLE_CLASS_VERSIONS(expr)
57
53
END_SERIALIZABLE_CLASS_VERSIONS(expr)
58
54