diff options
author | PaulMeng <pmtruth@hotmail.com> | 2016-07-05 14:21:11 -0400 |
---|---|---|
committer | PaulMeng <pmtruth@hotmail.com> | 2016-07-05 14:21:11 -0400 |
commit | 0294ec0d13c631bf471c07ba26809cda0f0b9b51 (patch) | |
tree | 9e7e93259ac0ee91424bd515e4d7b2df76569231 /src/expr | |
parent | 36a0d1d948f201471596e092136c5a00103f78af (diff) |
resolved merge conflicts
Diffstat (limited to 'src/expr')
-rw-r--r-- | src/expr/datatype.h | 3 | ||||
-rw-r--r-- | src/expr/expr_manager_template.h | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/expr/datatype.h b/src/expr/datatype.h index a0c9cbe6b..dfd893fe8 100644 --- a/src/expr/datatype.h +++ b/src/expr/datatype.h @@ -613,9 +613,6 @@ public: /** get the record representation for this datatype */ inline Record * getRecord() const; - /** get the record representation for this datatype */ - inline Record * getRecord() const; - /** * Return the cardinality of this datatype (the sum of the * cardinalities of its constructors). The Datatype must be diff --git a/src/expr/expr_manager_template.h b/src/expr/expr_manager_template.h index 9c4e554e1..31c911736 100644 --- a/src/expr/expr_manager_template.h +++ b/src/expr/expr_manager_template.h @@ -124,9 +124,6 @@ public: /** Get the type for regular expressions. */ RegExpType regExpType() const; - /** Get the type for regular expressions. */ - RegExpType regExpType() const; - /** Get the type for reals. */ RealType realType() const; |