diff options
| author | Kshitij Bansal <kshitij@cs.nyu.edu> | 2015-10-13 19:59:22 -0400 |
|---|---|---|
| committer | Kshitij Bansal <kshitij@cs.nyu.edu> | 2015-10-13 19:59:22 -0400 |
| commit | 21ecec6988c6f4b145985ea0ac506380fca6c3d2 (patch) | |
| tree | 647c86a1935c41680485dbb1f6c1de693a7e6239 /src/expr/expr_template.h | |
| parent | 8d219fd7bacea834b70340a44e420c2639ac6285 (diff) | |
remove options infrastructure code which depended on undefined behavior
appears to be source of crashes on mac
Diffstat (limited to 'src/expr/expr_template.h')
| -rw-r--r-- | src/expr/expr_template.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/expr/expr_template.h b/src/expr/expr_template.h index d769ed109..ae0fad897 100644 --- a/src/expr/expr_template.h +++ b/src/expr/expr_template.h @@ -649,7 +649,7 @@ public: long& l = out.iword(s_iosIndex); if(l == 0) { // set the default print depth on this ostream - if(&Options::current() != NULL) { + if(not Options::isCurrentNull()) { l = options::defaultExprDepth(); } if(l == 0) { @@ -801,7 +801,7 @@ public: if(l == 0) { // set the default dag setting on this ostream // (offset by one to detect whether default has been set yet) - if(&Options::current() != NULL) { + if(not Options::isCurrentNull()) { l = options::defaultDagThresh() + 1; } if(l == 0) { @@ -884,7 +884,7 @@ public: if(l == 0) { // set the default language on this ostream // (offset by one to detect whether default has been set yet) - if(&Options::current() != NULL) { + if(not Options::isCurrentNull()) { l = options::outputLanguage() + 1; } if(l <= 0 || l > language::output::LANG_MAX) { |