testing framework, configure fixes, incorporations from meeting, continued work

11 files changed, 57 insertions, 57 deletions

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index de5f0da9d..415893680 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = -I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall
+AM_CXXFLAGS = -Wall -fvisibility=hidden
 
 noinst_LIBRARIES = libutil.a
 
diff --git a/src/util/assert.h b/src/util/assert.h
index a66503641..24e3a4cdf 100644
--- a/src/util/assert.h
+++ b/src/util/assert.h
@@ -9,8 +9,8 @@
  **
  **/
 
-#ifndef __CVC4_ASSERT_H
-#define __CVC4_ASSERT_H
+#ifndef __CVC4__ASSERT_H
+#define __CVC4__ASSERT_H
 
 #include <cassert>
 
@@ -23,4 +23,4 @@
 # define cvc4assert(x)
 #endif /* DEBUG */
 
-#endif /* __CVC4_ASSERT_H */
+#endif /* __CVC4__ASSERT_H */
diff --git a/src/util/command.h b/src/util/command.h
index 944b9c621..d1257f323 100644
--- a/src/util/command.h
+++ b/src/util/command.h
@@ -9,14 +9,14 @@
  **
  **/
 
-#ifndef __CVC4_COMMAND_H
-#define __CVC4_COMMAND_H
+#ifndef __CVC4__COMMAND_H
+#define __CVC4__COMMAND_H
 
 namespace CVC4 {
 
 class Command { // distinct from Exprs
 };
 
-} /* CVC4 namespace */
+}/* CVC4 namespace */
 
-#endif /* __CVC4_COMMAND_H */
+#endif /* __CVC4__COMMAND_H */
diff --git a/src/util/debug.h b/src/util/debug.h
index 36942d1ae..14dc0fbd1 100644
--- a/src/util/debug.h
+++ b/src/util/debug.h
@@ -9,8 +9,8 @@
  **
  **/
 
-#ifndef __CVC4_DEBUG_H
-#define __CVC4_DEBUG_H
+#ifndef __CVC4__DEBUG_H
+#define __CVC4__DEBUG_H
 
 #include <cassert>
 
@@ -23,4 +23,4 @@
 # define cvc4assert(x)
 #endif /* DEBUG */
 
-#endif /* __CVC4_DEBUG_H */
+#endif /* __CVC4__DEBUG_H */
diff --git a/src/util/decision_engine.h b/src/util/decision_engine.h
index 81d820eaa..2064e3687 100644
--- a/src/util/decision_engine.h
+++ b/src/util/decision_engine.h
@@ -9,8 +9,8 @@
  **
  **/
 
-#ifndef __CVC4_DECISION_ENGINE_H
-#define __CVC4_DECISION_ENGINE_H
+#ifndef __CVC4__DECISION_ENGINE_H
+#define __CVC4__DECISION_ENGINE_H
 
 #include "core/literal.h"
 
@@ -39,4 +39,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4_DECISION_ENGINE_H */
+#endif /* __CVC4__DECISION_ENGINE_H */
diff --git a/src/util/exception.h b/src/util/exception.h
index 792a98701..e3b8f2293 100644
--- a/src/util/exception.h
+++ b/src/util/exception.h
@@ -10,39 +10,39 @@
  ** Exception class.
  **/
 
-#ifndef __CVC4_EXCEPTION_H
-#define __CVC4_EXCEPTION_H
+#ifndef __CVC4__EXCEPTION_H
+#define __CVC4__EXCEPTION_H
 
 #include <string>
 #include <iostream>
 
 namespace CVC4 {
 
-  class Exception {
-  protected:
-    std::string d_msg;
-  public:
-    // Constructors
-    Exception(): d_msg("Unknown exception") { }
-    Exception(const std::string& msg): d_msg(msg) { }
-    Exception(const char* msg): d_msg(msg) { }
-    // Destructor
-    virtual ~Exception() { }
-    // NON-VIRTUAL METHODs for setting and printing the error message
-    void setMessage(const std::string& msg) { d_msg = msg; }
-    // Printing: feel free to redefine toString().  When inherited,
-    // it's recommended that this method print the type of exception
-    // before the actual message.
-    virtual std::string toString() const { return d_msg; }
-    // No need to overload operator<< for the inherited classes
-    friend std::ostream& operator<<(std::ostream& os, const Exception& e);
-
-  }; // end of class Exception
-
-  inline std::ostream& operator<<(std::ostream& os, const Exception& e) {
-    return os << e.toString();
-  }
+class Exception {
+protected:
+  std::string d_msg;
+public:
+  // Constructors
+  Exception(): d_msg("Unknown exception") { }
+  Exception(const std::string& msg): d_msg(msg) { }
+  Exception(const char* msg): d_msg(msg) { }
+  // Destructor
+  virtual ~Exception() { }
+  // NON-VIRTUAL METHODs for setting and printing the error message
+  void setMessage(const std::string& msg) { d_msg = msg; }
+  // Printing: feel free to redefine toString().  When inherited,
+  // it's recommended that this method print the type of exception
+  // before the actual message.
+  virtual std::string toString() const { return d_msg; }
+  // No need to overload operator<< for the inherited classes
+  friend std::ostream& operator<<(std::ostream& os, const Exception& e);
+
+}; // end of class Exception
+
+inline std::ostream& operator<<(std::ostream& os, const Exception& e) {
+  return os << e.toString();
+}
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4_EXCEPTION_H */
+#endif /* __CVC4__EXCEPTION_H */
diff --git a/src/util/literal.h b/src/util/literal.h
index 8b147c640..7af9826bb 100644
--- a/src/util/literal.h
+++ b/src/util/literal.h
@@ -9,8 +9,8 @@
  **
  **/
 
-#ifndef __CVC4_LITERAL_H
-#define __CVC4_LITERAL_H
+#ifndef __CVC4__LITERAL_H
+#define __CVC4__LITERAL_H
 
 namespace CVC4 {
 
@@ -18,4 +18,4 @@ class Literal;
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4_LITERAL_H */
+#endif /* __CVC4__LITERAL_H */
diff --git a/src/util/model.h b/src/util/model.h
index c07b75dfa..cf006b3e1 100644
--- a/src/util/model.h
+++ b/src/util/model.h
@@ -9,8 +9,8 @@
  **
  **/
 
-#ifndef __CVC4_MODEL_H
-#define __CVC4_MODEL_H
+#ifndef __CVC4__MODEL_H
+#define __CVC4__MODEL_H
 
 namespace CVC4 {
 
@@ -19,4 +19,4 @@ class Model {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4_MODEL_H */
+#endif /* __CVC4__MODEL_H */
diff --git a/src/util/options.h b/src/util/options.h
index f04b06f10..6104470d2 100644
--- a/src/util/options.h
+++ b/src/util/options.h
@@ -1,5 +1,5 @@
-#ifndef __CVC4_OPTIONS_H
-#define __CVC4_OPTIONS_H
+#ifndef __CVC4__OPTIONS_H
+#define __CVC4__OPTIONS_H
 
 namespace CVC4 {
 
@@ -28,4 +28,4 @@ struct Options {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4_OPTIONS_H */
+#endif /* __CVC4__OPTIONS_H */
diff --git a/src/util/result.h b/src/util/result.h
index 50f488682..1e2b61738 100644
--- a/src/util/result.h
+++ b/src/util/result.h
@@ -9,8 +9,8 @@
  **
  **/
 
-#ifndef __CVC4_RESULT_H
-#define __CVC4_RESULT_H
+#ifndef __CVC4__RESULT_H
+#define __CVC4__RESULT_H
 
 namespace CVC4 {
 
@@ -62,4 +62,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4_RESULT_H */
+#endif /* __CVC4__RESULT_H */
diff --git a/src/util/unique_id.h b/src/util/unique_id.h
index 1a6f3427a..4ac80f772 100644
--- a/src/util/unique_id.h
+++ b/src/util/unique_id.h
@@ -9,8 +9,8 @@
  **
  **/
 
-#ifndef __CVC4_UNIQUE_ID_H
-#define __CVC4_UNIQUE_ID_H
+#ifndef __CVC4__UNIQUE_ID_H
+#define __CVC4__UNIQUE_ID_H
 
 namespace CVC4 {
 
@@ -30,6 +30,6 @@ public:
 template <class T>
 unsigned UniqueID<T>::s_topID = 0;
 
-} /* CVC4 namespace */
+}/* CVC4 namespace */
 
-#endif /* __CVC4_UNIQUE_ID_H */
+#endif /* __CVC4__UNIQUE_ID_H */