Merge pull request #150 from Chilledheart/master

Fix errors while building with clang (against libc++) under linux
main
Igor Canadi 11 years ago
commit 2ca7a9886d
  1. 1
      tools/db_sanity_test.cc
  2. 1
      util/arena.h
  3. 1
      util/log_buffer.h

@ -4,6 +4,7 @@
// of patent rights can be found in the PATENTS file in the same directory. // of patent rights can be found in the PATENTS file in the same directory.
#include <cstdio> #include <cstdio>
#include <cstdlib>
#include <vector> #include <vector>
#include <memory> #include <memory>

@ -13,6 +13,7 @@
#pragma once #pragma once
#include <cstddef> #include <cstddef>
#include <cerrno>
#include <vector> #include <vector>
#include <assert.h> #include <assert.h>
#include <stdint.h> #include <stdint.h>

@ -8,6 +8,7 @@
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "util/arena.h" #include "util/arena.h"
#include "util/autovector.h" #include "util/autovector.h"
#include <ctime>
namespace rocksdb { namespace rocksdb {

Loading…
Cancel
Save