From c1bc12bb74b05df5f38f3feacd42cacac4e42038 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Thu, 4 Feb 2010 22:14:28 +0000 Subject: [PATCH] remove warnings from use of __gnu_cxx::hash_map<>; also spacing fixes in symbol table --- configure | 2 +- configure.ac | 2 +- src/parser/symbol_table.h | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure b/configure index bd7b74dce..bc1297ee5 100755 --- 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 159f32a4e..6ed38f860 100644 --- 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 7dc3783a5..e4aec930e 100644 --- a/src/parser/symbol_table.h +++ b/src/parser/symbol_table.h @@ -18,16 +18,17 @@ #include #include + #include namespace __gnu_cxx { template<> struct hash { size_t operator()(const std::string& str) const { - return hash ()(str.c_str()); + return hash()(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 > + typedef __gnu_cxx::hash_map > LookupTable; /** The table iterator */ typedef typename LookupTable::iterator table_iterator; -- 2.30.2