diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-24 13:25:30 -0500 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-24 13:25:30 -0500 |
| commit | a70dfd183b52f50d132d8b17425c7089a77004e7 (patch) | |
| tree | 41d783cff1f6097bd76b77c561bbd77111317437 /src/expr/expr_template.h | |
| parent | 371fa29e5742a58581481f3d7d94a8116a814447 (diff) | |
| parent | e23a40c0d121209afecff21ce5c6ed6e644bfb0e (diff) | |
Merge branch '1.3.x'
Conflicts:
NEWS
Diffstat (limited to 'src/expr/expr_template.h')
| -rw-r--r-- | src/expr/expr_template.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/expr/expr_template.h b/src/expr/expr_template.h index 0c7acce9c..828b1923c 100644 --- a/src/expr/expr_template.h +++ b/src/expr/expr_template.h @@ -459,7 +459,7 @@ public: * @param language the language in which to output */ void toStream(std::ostream& out, int toDepth = -1, bool types = false, size_t dag = 1, - OutputLanguage language = language::output::LANG_AST) const; + OutputLanguage language = language::output::LANG_AUTO) const; /** * Check if this is a null expression. @@ -861,7 +861,7 @@ class CVC4_PUBLIC ExprSetLanguage { * setlanguage() applied to them and where the current Options * information isn't available. */ - static const int s_defaultOutputLanguage = language::output::LANG_AST; + static const int s_defaultOutputLanguage = language::output::LANG_AUTO; /** * When this manipulator is used, the setting is stored here. |