some api changes

1 files changed, 5 insertions, 11 deletions

diff --git a/src/expr/expr_template.h b/src/expr/expr_template.h
index e26e99ded..96c7cfadf 100644
--- a/src/expr/expr_template.h
+++ b/src/expr/expr_template.h
@@ -148,12 +148,15 @@ struct ExprHashFunction {
   size_t operator()(CVC4::Expr e) const;
 };/* struct ExprHashFunction */
 
+class BoolExpr;
+
 /**
  * Class encapsulating CVC4 expressions and methods for constructing new
  * expressions.
  */
 class CVC4_PUBLIC Expr {
-protected:
+
+  friend class BoolExpr;
 
   /** The internal expression representation */
   NodeTemplate<true>* d_node;
@@ -417,13 +420,6 @@ public:
   bool isNull() const;
 
   /**
-   * Check if this is a null expression.
-   *
-   * @return true if NOT a null expression
-   */
-  operator bool() const;
-
-  /**
    * Check if this is an expression representing a variable.
    *
    * @return true if a variable expression
@@ -526,8 +522,6 @@ private:
    */
   void debugPrint();
 
-protected:
-
   /**
    * Returns the actual internal node.
    * @return the internal node
@@ -961,7 +955,7 @@ public:
 
 ${getConst_instantiations}
 
-#line 965 "${template}"
+#line 959 "${template}"
 
 namespace expr {