remove warnings from use of __gnu_cxx::hash_map<>; also spacing fixes in symbol table

diff --git a/configure b/configure
index bd7b74dce0e6853b19fe1e5f05b440e9fa55a5ad..bc1297ee5468772bfcb255a91a4c781301aafff3 100755 (executable)
--- a/configure
+++ b/configure
@@ -16443,7 +16443,7 @@ if test "$enable_static" = yes; then BUILDING_STATIC=1; fi
 
 
 CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }$CVC4CPPFLAGS"
-CXXFLAGS="${CXXFLAGS:+$CXXFLAGS }$CVC4CXXFLAGS"
+CXXFLAGS="${CXXFLAGS:+$CXXFLAGS }$CVC4CXXFLAGS -Wno-deprecated"
 LDFLAGS="${LDFLAGS:+$LDFLAGS }$CVC4LDFLAGS"
 
 # mk_include

diff --git a/configure.ac b/configure.ac
index 159f32a4e8c9e55fe83c8f991e2297510a4b2988..6ed38f860bfb71b3a60f40e59f5dfeb3f1a8c1b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -402,7 +402,7 @@ AC_SUBST(CVC4_LIBRARY_VERSION)
 AC_SUBST(CVC4_PARSER_LIBRARY_VERSION)
 
 CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }$CVC4CPPFLAGS"
-CXXFLAGS="${CXXFLAGS:+$CXXFLAGS }$CVC4CXXFLAGS"
+CXXFLAGS="${CXXFLAGS:+$CXXFLAGS }$CVC4CXXFLAGS -Wno-deprecated"
 LDFLAGS="${LDFLAGS:+$LDFLAGS }$CVC4LDFLAGS"
 
 # mk_include

diff --git a/src/parser/symbol_table.h b/src/parser/symbol_table.h
index 7dc3783a5e7d95dad7054027263a30dde2516728..e4aec930eda60c677de2786796a41caa3a8cc0d0 100644 (file)
--- a/src/parser/symbol_table.h
+++ b/src/parser/symbol_table.h
@@ -18,16 +18,17 @@
 
 #include <string>
 #include <stack>
+
 #include <ext/hash_map>
 
 namespace __gnu_cxx {
 template<>
   struct hash<std::string> {
     size_t operator()(const std::string& str) const {
-      return hash<const char*> ()(str.c_str());
+      return hash<const char*>()(str.c_str());
     }
   };
-}
+}/* __gnu_cxx namespace */
 
 namespace CVC4 {
 namespace parser {
@@ -41,7 +42,7 @@ class SymbolTable {
 private:
 
   /** The name to expression bindings */
-  typedef __gnu_cxx ::hash_map<std::string, std::stack<ObjectType> >
+  typedef __gnu_cxx::hash_map<std::string, std::stack<ObjectType> >
   LookupTable;
   /** The table iterator */
   typedef typename LookupTable::iterator table_iterator;