Skip to content

Commit ed64c44

Browse files
committed
fix: make constructors explicit
1 parent 4caa476 commit ed64c44

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/common.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ constexpr size_t kMaxThreads = 16;
2020
// Safe string class that logs error when index is accessed outside the string.
2121
class SafeString : public std::string {
2222
public:
23-
SafeString() = default;
24-
SafeString(const std::string &s) : std::string(s) {}
23+
explicit SafeString() = default;
24+
explicit SafeString(const std::string &s) : std::string(s) {}
2525
const char &operator[](size_t i) const {
2626
if (i >= size()) {
2727
printf("ERROR string index access index=%zu str=%s\n", i, c_str());
@@ -53,7 +53,7 @@ struct PreparedQuery {
5353
Element ext;
5454
std::set<char> charCodes{};
5555

56-
PreparedQuery(const Element &q, const char pathSeparator);
56+
explicit PreparedQuery(const Element &q, const char pathSeparator);
5757
};
5858

5959
struct Options {
@@ -68,16 +68,16 @@ struct Options {
6868
#endif
6969
const PreparedQuery preparedQuery;
7070

71-
Options(const Element &_query, size_t _maxResults, bool _usePathScoring, bool _useExtensionBonus) : max_results(_maxResults), usePathScoring(_usePathScoring), useExtensionBonus(_useExtensionBonus), preparedQuery(_query, pathSeparator) {}
72-
Options(const Element &_query, char _pathSeparator) : pathSeparator(_pathSeparator), preparedQuery(_query, _pathSeparator) {}
71+
explicit Options(const Element &_query, size_t _maxResults, bool _usePathScoring, bool _useExtensionBonus) : max_results(_maxResults), usePathScoring(_usePathScoring), useExtensionBonus(_useExtensionBonus), preparedQuery(_query, pathSeparator) {}
72+
explicit Options(const Element &_query, char _pathSeparator) : pathSeparator(_pathSeparator), preparedQuery(_query, _pathSeparator) {}
7373
};
7474

7575
struct AcronymResult {
7676
Score score;
7777
float pos;
7878
int count;
7979

80-
AcronymResult(Score s, float p, int c) noexcept : score(s), pos(p), count(c) {}
80+
explicit AcronymResult(Score s, float p, int c) noexcept : score(s), pos(p), count(c) {}
8181
};
8282

8383
extern Element ToLower(const Element &s);

src/tree.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct CandidateObject {
3131
const size_t level = 0;
3232
const size_t index = 0;
3333

34-
CandidateObject(CandidateString &&data_, const size_t level_, const size_t index_) noexcept
34+
explicit CandidateObject(CandidateString &&data_, const size_t level_, const size_t index_) noexcept
3535
: data{ move(data_) }, level{ level_ }, index{ index_ } {}
3636
};
3737

@@ -73,11 +73,11 @@ struct Tree {
7373
}
7474

7575
// default constructor is needed for generation of all the move/copy methods
76-
Tree() = default;
76+
explicit Tree() = default;
7777

7878
/** create a Tree object and make an entries array */
7979
// NOTE: this is made to only accept Napi::Array because we cannot export templates to JavaScript
80-
Tree(const Napi::Array &jsTreeArrayOrObject_, const string &dataKey_, const string &childrenKey_)
80+
explicit Tree(const Napi::Array &jsTreeArrayOrObject_, const string &dataKey_, const string &childrenKey_)
8181
: dataKey{ dataKey_ },
8282
childrenKey{ childrenKey_ } {
8383
makeEntriesArray(jsTreeArrayOrObject_, 0);

0 commit comments

Comments
 (0)