Fixes for doubled-statistics (bug 171), a fix to muzzled builds and some minor code

cleanup found while searching for additional cases.  Closes bug 171.

6 files changed, 13 insertions, 14 deletions

diff --git a/src/parser/bounded_token_buffer.cpp b/src/parser/bounded_token_buffer.cpp
index adc0505db..6a94d877a 100644
--- a/src/parser/bounded_token_buffer.cpp
+++ b/src/parser/bounded_token_buffer.cpp
@@ -519,5 +519,5 @@ getSourceName				(pANTLR3_INT_STREAM is)
 }
 
 
-}
-}
+}/* CVC4::parser namespace */
+}/* CVC4 namespace */
diff --git a/src/parser/bounded_token_buffer.h b/src/parser/bounded_token_buffer.h
index fede14bd1..289480e2d 100644
--- a/src/parser/bounded_token_buffer.h
+++ b/src/parser/bounded_token_buffer.h
@@ -23,7 +23,7 @@
 #ifndef	__CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H
 #define	__CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H
 
-#include    <antlr3defs.h>
+#include <antlr3defs.h>
 
 namespace CVC4 {
 namespace parser {
@@ -50,12 +50,10 @@ void
 BoundedTokenBufferFree(pBOUNDED_TOKEN_BUFFER buffer);
 
 #ifdef __cplusplus
-}
+}/* extern "C" */
 #endif
 
-}
-}
-
+}/* CVC4::parser namespace */
+}/* CVC4 namespace */
 
 #endif /* __CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H */
-
diff --git a/src/parser/cvc/Cvc.g b/src/parser/cvc/Cvc.g
index 0f44e692a..4fd22a079 100644
--- a/src/parser/cvc/Cvc.g
+++ b/src/parser/cvc/Cvc.g
@@ -55,7 +55,7 @@ options {
 
 namespace CVC4 {
   class Expr;
-}
+}/* CVC4 namespace */
 }
 
 @parser::postinclude {
diff --git a/src/parser/memory_mapped_input_buffer.cpp b/src/parser/memory_mapped_input_buffer.cpp
index 7748a1cca..aad5aaec0 100644
--- a/src/parser/memory_mapped_input_buffer.cpp
+++ b/src/parser/memory_mapped_input_buffer.cpp
@@ -112,6 +112,7 @@ void UnmapFile(pANTLR3_INPUT_STREAM input) {
   input->close(input);
 }
 
-}
-}
-}
+}/* extern "C" */
+
+}/* CVC4::parser namespace */
+}/* CVC4 namespace */
diff --git a/src/parser/smt/Smt.g b/src/parser/smt/Smt.g
index e0b144513..ecb3d39b6 100644
--- a/src/parser/smt/Smt.g
+++ b/src/parser/smt/Smt.g
@@ -57,7 +57,7 @@ options {
 
 namespace CVC4 {
   class Expr;
-}
+}/* CVC4 namespace */
 }
 
 @parser::postinclude {
diff --git a/src/parser/smt2/Smt2.g b/src/parser/smt2/Smt2.g
index 56457d006..91f2f205b 100644
--- a/src/parser/smt2/Smt2.g
+++ b/src/parser/smt2/Smt2.g
@@ -71,7 +71,7 @@ using namespace CVC4::parser;
 
 namespace CVC4 {
   class Expr;
-}
+}/* CVC4 namespace */
 }
 
 @parser::postinclude {