removing unused functionality from util; related to bug #222

diff --git a/src/smt/smt_engine.h b/src/smt/smt_engine.h
index 35bfb0bcc1827df55a7e5a230041c9f025ca1d6c..a73dbdad9171b5e2beca075aff64ab3bb039f734 100644 (file)
--- a/src/smt/smt_engine.h
+++ b/src/smt/smt_engine.h
@@ -32,7 +32,6 @@
 #include "smt/modal_exception.h"
 #include "smt/no_such_function_exception.h"
 #include "util/hash.h"
-#include "util/model.h"
 #include "util/options.h"
 #include "util/result.h"
 #include "util/sexpr.h"

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index e75735f826878da3078e386fc88b1294df025718..af34575505980d282ca3a4914e85b47ef2ba69b8 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -17,14 +17,12 @@ libutil_la_SOURCES = \
        exception.h \
        hash.h \
        bool.h \
-       model.h \
        options.h \
        options.cpp \
        output.cpp \
        output.h \
        result.h \
        result.cpp \
-       unique_id.h \
        configuration.h \
        configuration_private.h \
        configuration.cpp \
@@ -36,7 +34,6 @@ libutil_la_SOURCES = \
        sexpr.h \
        stats.h \
        stats.cpp \
-       triple.h \
        dynamic_array.h \
        language.h
 

diff --git a/src/util/model.h b/src/util/model.h
deleted file mode 100644 (file)
index 31fed1f..0000000
--- a/src/util/model.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*********************                                                        */
-/*! \file model.h
- ** \verbatim
- ** Original author: mdeters
- ** Major contributors: none
- ** Minor contributors (to current version): none
- ** This file is part of the CVC4 prototype.
- ** Copyright (c) 2009, 2010  The Analysis of Computer Systems Group (ACSys)
- ** Courant Institute of Mathematical Sciences
- ** New York University
- ** See the file COPYING in the top-level source directory for licensing
- ** information.\endverbatim
- **
- ** \brief A model.
- **
- ** A model.
- **/
-
-#include "cvc4_public.h"
-
-#ifndef __CVC4__MODEL_H
-#define __CVC4__MODEL_H
-
-namespace CVC4 {
-
-class CVC4_PUBLIC Model {
-};/* class Model */
-
-}/* CVC4 namespace */
-
-#endif /* __CVC4__MODEL_H */

diff --git a/src/util/triple.h b/src/util/triple.h
deleted file mode 100644 (file)
index 3a6f841..0000000
--- a/src/util/triple.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*********************                                                        */
-/*! \file triple.h
- ** \verbatim
- ** Original author: mdeters
- ** Major contributors: none
- ** Minor contributors (to current version): none
- ** This file is part of the CVC4 prototype.
- ** Copyright (c) 2009, 2010  The Analysis of Computer Systems Group (ACSys)
- ** Courant Institute of Mathematical Sciences
- ** New York University
- ** See the file COPYING in the top-level source directory for licensing
- ** information.\endverbatim
- **
- ** \brief Similar to std::pair<>, for triples
- **
- ** Similar to std::pair<>, for triples.  Once we move to c++0x, this
- ** can be removed in favor of (standard-provided) N-ary tuples.
- **/
-
-#include "cvc4_private.h"
-
-#ifndef __CVC4__TRIPLE_H
-#define __CVC4__TRIPLE_H
-
-namespace CVC4 {
-
-template <class T1, class T2, class T3>
-class triple {
-public:
-  T1 first;
-  T2 second;
-  T3 third;
-};
-
-template <class T1, class T2, class T3>
-inline triple<T1, T2, T3>
-make_triple(const T1& t1, const T2& t2, const T3& t3) {
-  return triple<T1, T2, T3>(t1, t2, t3);
-}
-
-}/* CVC4 namespace */
-
-#endif /* __CVC4__TRIPLE_H */

diff --git a/src/util/unique_id.h b/src/util/unique_id.h
deleted file mode 100644 (file)
index 67a6c5c..0000000
--- a/src/util/unique_id.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*********************                                                        */
-/*! \file unique_id.h
- ** \verbatim
- ** Original author: mdeters
- ** Major contributors: none
- ** Minor contributors (to current version): none
- ** This file is part of the CVC4 prototype.
- ** Copyright (c) 2009, 2010  The Analysis of Computer Systems Group (ACSys)
- ** Courant Institute of Mathematical Sciences
- ** New York University
- ** See the file COPYING in the top-level source directory for licensing
- ** information.\endverbatim
- **
- ** \brief A mechanism for getting a compile-time unique ID.
- **
- ** A mechanism for getting a compile-time unique ID.
- **/
-
-#include "cvc4_private.h"
-
-#ifndef __CVC4__UNIQUE_ID_H
-#define __CVC4__UNIQUE_ID_H
-
-namespace CVC4 {
-
-// NOTE that UniqueID is intended for startup registration; it
-// shouldn't be used in multi-threaded contexts.
-
-template <class T>
-class UniqueID {
-  static unsigned s_topID;
-  const unsigned d_thisID;
-
-public:
-  UniqueID() : d_thisID( s_topID++ ) { }
-  operator unsigned() const { return d_thisID; }
-};
-
-template <class T>
-unsigned UniqueID<T>::s_topID = 0;
-
-}/* CVC4 namespace */
-
-#endif /* __CVC4__UNIQUE_ID_H */