summaryrefslogtreecommitdiffstats
path: root/juniper
diff options
context:
space:
mode:
authorArne Juul <arnej@yahoo-inc.com>2018-06-20 11:49:38 +0200
committerArne Juul <arnej@yahoo-inc.com>2018-06-20 11:49:38 +0200
commit016612733da6f4e16428ec3f95dc5e19b932a0c5 (patch)
tree4f626b6113e79ad41c1289b5b6cb4c1f6f0f68f8 /juniper
parentd161b6bcb87566a31cb5e0700b84f968539f502f (diff)
some more cleanup
Diffstat (limited to 'juniper')
-rw-r--r--juniper/src/vespa/juniper/SummaryConfig.h3
-rw-r--r--juniper/src/vespa/juniper/appender.h3
-rw-r--r--juniper/src/vespa/juniper/queryparser.cpp2
3 files changed, 2 insertions, 6 deletions
diff --git a/juniper/src/vespa/juniper/SummaryConfig.h b/juniper/src/vespa/juniper/SummaryConfig.h
index 4a6a56fad9c..96023b9523b 100644
--- a/juniper/src/vespa/juniper/SummaryConfig.h
+++ b/juniper/src/vespa/juniper/SummaryConfig.h
@@ -6,8 +6,7 @@
enum ConfigFlag {
CF_OFF,
CF_ON,
- CF_AUTO,
- CF_MAXVAL
+ CF_AUTO
};
diff --git a/juniper/src/vespa/juniper/appender.h b/juniper/src/vespa/juniper/appender.h
index 3afb8b1494d..a74b038c5f1 100644
--- a/juniper/src/vespa/juniper/appender.h
+++ b/juniper/src/vespa/juniper/appender.h
@@ -118,9 +118,6 @@ public:
_sumconf->highlight_off()[0] == '<' ||
_sumconf->dots()[0] == '<');
break;
- default:
- HDR_ABORT("should not be reached");
- break;
}
if (_sumconf->preserve_white_space() == CF_ON) {
diff --git a/juniper/src/vespa/juniper/queryparser.cpp b/juniper/src/vespa/juniper/queryparser.cpp
index 6214c7d09e5..cf300970fda 100644
--- a/juniper/src/vespa/juniper/queryparser.cpp
+++ b/juniper/src/vespa/juniper/queryparser.cpp
@@ -181,7 +181,7 @@ QueryItem* QueryParser::ParseExpr()
LOG(debug, "constraint operator %s - value %d", op.c_str(), p1);
break;
default:
- assert(false);
+ LOG_ABORT("should not reach here");
}
next();
if (!match("(", true)) return NULL;