get rid of conjunction and disjunction taking initializer_lists

Author: Daniel Kroening

src/util/std_expr.cpp

@@ -64,32 +64,6 @@ exprt disjunction(const exprt::operandst &op)
 
 /*******************************************************************\
 
-Function: disjunction
-
-  Inputs:
-
- Outputs:
-
- Purpose:
-
-\*******************************************************************/
-
-exprt disjunction(const std::initializer_list<exprt> &op)
-{
-  if(op.size()==0)
-    return false_exprt();
-  else if(op.size()==1)
-    return *op.begin();
-  else
-  {
-    or_exprt result;
-    result.operands()=exprt::operandst(op);
-    return result;
-  }
-}
-
-/*******************************************************************\
-
 Function: conjunction
 
   Inputs:
@@ -116,32 +90,6 @@ exprt conjunction(const exprt::operandst &op)
 
 /*******************************************************************\
 
-Function: conjunction
-
-  Inputs:
-
- Outputs:
-
- Purpose:
-
-\*******************************************************************/
-
-exprt conjunction(const std::initializer_list<exprt> &op)
-{
-  if(op.size()==0)
-    return true_exprt();
-  else if(op.size()==1)
-    return *op.begin();
-  else
-  {
-    and_exprt result;
-    result.operands()=exprt::operandst(op);
-    return result;
-  }
-}
-
-/*******************************************************************\
-
 Function: build_object_descriptor_rec
 
   Inputs:

src/util/std_expr.h

@@ -18,8 +18,6 @@ Author: Daniel Kroening, [email protected]
 
 #include <cassert>
 
-#include <initializer_list>    
-
 #include "std_types.h"
 
 /*! \defgroup gr_std_expr Conversion to specific expressions
@@ -1724,13 +1722,6 @@ class and_exprt:public exprt
 
 exprt conjunction(const exprt::operandst &);
 
-/*! 1) generates a conjunction for two or more operands
- *  2) for one operand, returns the operand
- *  3) returns true otherwise 
-*/
-
-exprt conjunction(const std::initializer_list<exprt> &);
-
 /*! \brief Cast a generic exprt to a \ref and_exprt
  *
  * This is an unchecked conversion. \a expr must be known to be \ref
@@ -1833,13 +1824,6 @@ class or_exprt:public exprt
 
 exprt disjunction(const exprt::operandst &);
 
-/*! 1) generates a disjunction for two or more operands
- *  2) for one operand, returns the operand
- *  3) returns false otherwise 
-*/
-
-exprt disjunction(const std::initializer_list<exprt> &);
-
 /*! \brief Cast a generic exprt to a \ref or_exprt
  *
  * This is an unchecked conversion. \a expr must be known to be \ref