diff options
author | Morgan Deters <mdeters@gmail.com> | 2009-12-07 23:14:15 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2009-12-07 23:14:15 +0000 |
commit | c72745ec66a6328ab02350cd556a1ad82fb7d85c (patch) | |
tree | df7b00155bb7dc7ab7351b640425bf2306dac521 /src/util | |
parent | b3bcafc179201e33c4f41ccf028c12eacc110d69 (diff) |
big check-in of various fixes and adjustments
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/command.cpp | 10 | ||||
-rw-r--r-- | src/util/command.h | 6 | ||||
-rw-r--r-- | src/util/exception.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/util/command.cpp b/src/util/command.cpp index 961104585..190f794da 100644 --- a/src/util/command.cpp +++ b/src/util/command.cpp @@ -10,16 +10,16 @@ #include "expr/expr.h" #include "util/result.h" -namespace std { +using namespace std; + +namespace CVC4 { + ostream& operator<<(ostream& out, const CVC4::Command& c) { c.toString(out); return out; } -} - -namespace CVC4 { -EmptyCommand::EmptyCommand(std::string name) : +EmptyCommand::EmptyCommand(string name) : d_name(name) { } diff --git a/src/util/command.h b/src/util/command.h index 3d738ba45..501aa31e0 100644 --- a/src/util/command.h +++ b/src/util/command.h @@ -23,12 +23,10 @@ namespace CVC4 { class Expr; }/* CVC4 namespace */ -namespace std { - std::ostream& operator<<(std::ostream&, const CVC4::Command&) CVC4_PUBLIC; -} - namespace CVC4 { +std::ostream& operator<<(std::ostream&, const CVC4::Command&) CVC4_PUBLIC; + class CVC4_PUBLIC Command { public: virtual void invoke(CVC4::SmtEngine* smt_engine) = 0; diff --git a/src/util/exception.h b/src/util/exception.h index 76eabe67e..164cda8b5 100644 --- a/src/util/exception.h +++ b/src/util/exception.h @@ -8,6 +8,8 @@ ** information. ** ** Exception class. + ** + ** As many paragraphs as you like. **/ #ifndef __CVC4__EXCEPTION_H |