Fix clang compile

This commit is contained in:
NATTSiM
2013-12-18 12:52:08 -08:00
committed by Vinnie Falco
parent 6527cdfa97
commit 27b771e2ba
17 changed files with 104 additions and 48 deletions

View File

@@ -1488,11 +1488,11 @@ struct DBImpl::Writer {
Writer* next;
uint64_t start_sequence;
uint64_t end_sequence;
std::tr1::shared_ptr<WritableFile> logfile;
std::tr1::shared_ptr<log::Writer> log;
std::shared_ptr<WritableFile> logfile;
std::shared_ptr<log::Writer> log;
MemTable* mem;
std::tr1::shared_ptr<WritableFile> old_logfile;
std::tr1::shared_ptr<log::Writer> old_log;
std::shared_ptr<WritableFile> old_logfile;
std::shared_ptr<log::Writer> old_log;
explicit Writer()
: mtx(),

View File

@@ -8,7 +8,7 @@
#include <deque>
#include <list>
#include <set>
#include <tr1/memory>
#include <memory>
#include "dbformat.h"
#include "log_writer.h"
@@ -161,9 +161,9 @@ class DBImpl : public DB {
MemTable* mem_;
MemTable* imm_; // Memtable being compacted
port::AtomicPointer has_imm_; // So bg thread can detect non-NULL imm_
std::tr1::shared_ptr<WritableFile> logfile_;
std::shared_ptr<WritableFile> logfile_;
uint64_t logfile_number_;
std::tr1::shared_ptr<log::Writer> log_;
std::shared_ptr<log::Writer> log_;
uint32_t seed_; // For sampling.
// Synchronize writers