From 5b9435fbf4a5856ebd48b0b18219f31d49908b5a Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 31 Oct 2018 12:20:14 +0100 Subject: Use nested namespace. --- .../src/vespa/searchlib/bitcompression/countcompression.cpp | 8 ++------ searchlib/src/vespa/searchlib/bitcompression/countcompression.h | 8 ++------ searchlib/src/vespa/searchlib/index/postinglistcounts.h | 9 ++------- 3 files changed, 6 insertions(+), 19 deletions(-) (limited to 'searchlib') diff --git a/searchlib/src/vespa/searchlib/bitcompression/countcompression.cpp b/searchlib/src/vespa/searchlib/bitcompression/countcompression.cpp index 49d5ae92ec8..df699b792bc 100644 --- a/searchlib/src/vespa/searchlib/bitcompression/countcompression.cpp +++ b/searchlib/src/vespa/searchlib/bitcompression/countcompression.cpp @@ -4,9 +4,7 @@ #include "countcompression.h" #include -namespace search { - -namespace bitcompression { +namespace search::bitcompression { #define K_VALUE_COUNTFILE_LASTDOCID 22 #define K_VALUE_COUNTFILE_NUMCHUNKS 1 @@ -192,6 +190,4 @@ copyParams(const PostingListCountFileEncodeContext &rhs) } -} // namespace bitcompression - -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/bitcompression/countcompression.h b/searchlib/src/vespa/searchlib/bitcompression/countcompression.h index fc448ba1c30..df007d3c3fd 100644 --- a/searchlib/src/vespa/searchlib/bitcompression/countcompression.h +++ b/searchlib/src/vespa/searchlib/bitcompression/countcompression.h @@ -8,9 +8,7 @@ #define K_VALUE_COUNTFILE_POSOCCBITS 6 -namespace search { - -namespace bitcompression { +namespace search::bitcompression { class PostingListCountFileDecodeContext : public FeatureDecodeContext { @@ -75,6 +73,4 @@ public: void copyParams(const PostingListCountFileEncodeContext &rhs); }; -} // namespace bitcompression - -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/index/postinglistcounts.h b/searchlib/src/vespa/searchlib/index/postinglistcounts.h index d11f7286fa1..c6e51dc7d87 100644 --- a/searchlib/src/vespa/searchlib/index/postinglistcounts.h +++ b/searchlib/src/vespa/searchlib/index/postinglistcounts.h @@ -4,9 +4,7 @@ #include #include -namespace search { - -namespace index { +namespace search::index { /** * Basic class for holding the result of a dictionary lookup result @@ -103,7 +101,4 @@ public: { } }; -} // namespace index - -} // namespace search - +} -- cgit v1.2.3