Skip to content

Commit 514e42c

Browse files
committed
Fix some lint warnings
1 parent fa99d53 commit 514e42c

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

db/version_edit.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ enum Tag {
3131
// these are new formats divergent from open source leveldb
3232
kNewFile2 = 100, // store smallest & largest seqno
3333

34-
kColumnFamily = 200, // specify column family for version edit
34+
kColumnFamily = 200, // specify column family for version edit
3535
kColumnFamilyAdd = 201,
3636
kColumnFamilyDrop = 202,
3737
};

db/version_edit.h

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <set>
1212
#include <utility>
1313
#include <vector>
14+
#include <string>
1415
#include "db/dbformat.h"
1516

1617
namespace rocksdb {

db/version_set.cc

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#include <algorithm>
1313
#include <map>
14+
#include <set>
1415
#include <climits>
1516
#include <stdio.h>
1617
#include "db/filename.h"

db/write_batch.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Status WriteBatch::Iterate(Handler* handler) const {
9292
while (!input.empty() && handler->Continue()) {
9393
char tag = input[0];
9494
input.remove_prefix(1);
95-
uint32_t column_family = 0; // default
95+
uint32_t column_family = 0; // default
9696
switch (tag) {
9797
case kTypeColumnFamilyValue:
9898
if (!GetVarint32(&input, &column_family)) {

include/rocksdb/column_family.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#pragma once
1010
#include "rocksdb/slice.h"
11+
#include <string>
1112

1213
namespace rocksdb {
1314

@@ -21,11 +22,10 @@ struct ColumnFamilyHandle {
2122
uint32_t id;
2223
// default
2324
ColumnFamilyHandle() : id() {}
24-
/* implicit */
25-
ColumnFamilyHandle(uint32_t _id) : id(_id) {}
25+
explicit ColumnFamilyHandle(uint32_t _id) : id(_id) {}
2626
};
2727

2828
const ColumnFamilyHandle default_column_family = ColumnFamilyHandle();
2929
extern const std::string default_column_family_name;
3030

31-
}
31+
} // namespace rocksdb

0 commit comments

Comments
 (0)