From ad5e31e2031349c9b9d0bf5d9fcaa1ea7950db58 Mon Sep 17 00:00:00 2001
From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Tue, 26 Mar 2013 17:58:39 -0400
Subject: Fixes for warnings from clang++, from -std=gnu++0x, from swig, and
 from javac

---
 src/util/output.i | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'src/util/output.i')

diff --git a/src/util/output.i b/src/util/output.i
index dc524e185..74953ba53 100644
--- a/src/util/output.i
+++ b/src/util/output.i
@@ -3,6 +3,7 @@
 %}
 
 %ignore CVC4::null_streambuf;
+%ignore std::streambuf;
 %feature("valuewrapper") std::ostream;
 
 // There are issues with SWIG's attempted wrapping of these variables when
@@ -10,13 +11,17 @@
 %ignore CVC4::null_sb;
 %ignore CVC4::null_os;
 %ignore CVC4::DumpOutC::dump_cout;
+%ignore CVC4::CVC4ostream;
 
 %ignore operator<<;
 %ignore on(std::string);
 %ignore isOn(std::string);
 %ignore off(std::string);
 %ignore printf(std::string, const char*, ...);
-%ignore operator()(std::string);
+
+%ignore CVC4::IndentedScope;
+%ignore CVC4::push(CVC4ostream&);
+%ignore CVC4::pop(CVC4ostream&);
 
 %ignore CVC4::ScopedDebug::ScopedDebug(std::string);
 %ignore CVC4::ScopedDebug::ScopedDebug(std::string, bool);
@@ -24,6 +29,22 @@
 %ignore CVC4::ScopedTrace::ScopedTrace(std::string);
 %ignore CVC4::ScopedTrace::ScopedTrace(std::string, bool);
 
+%ignore CVC4::WarningC::WarningC(std::ostream*);
+%ignore CVC4::MessageC::MessageC(std::ostream*);
+%ignore CVC4::NoticeC::NoticeC(std::ostream*);
+%ignore CVC4::ChatC::ChatC(std::ostream*);
+%ignore CVC4::TraceC::TraceC(std::ostream*);
+%ignore CVC4::DebugC::DebugC(std::ostream*);
+%ignore CVC4::DumpOutC::DumpOutC(std::ostream*);
+
+%ignore CVC4::WarningC::operator();
+%ignore CVC4::MessageC::operator();
+%ignore CVC4::NoticeC::operator();
+%ignore CVC4::ChatC::operator();
+%ignore CVC4::TraceC::operator();
+%ignore CVC4::DebugC::operator();
+%ignore CVC4::DumpOutC::operator();
+
 %ignore CVC4::WarningC::getStream();
 %ignore CVC4::MessageC::getStream();
 %ignore CVC4::NoticeC::getStream();
@@ -43,7 +64,7 @@
 %ignore operator std::ostream&;
 %ignore operator CVC4ostream;
 
-%rename(get) operator();
+%rename(get) operator ();
 %rename(ok) operator bool;
 
 %include "util/output.h"
-- 
cgit v1.2.3