andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compilation fixes for powerpc build, -Wparentheses-equality error and missing header guards

Browse Source 
Summary:
This pull request contains miscellaneous compilation fixes.

Thanks,
Chinmay
Closes https://github.com/facebook/rocksdb/pull/3462

Differential Revision: D6941424

Pulled By: sagar0

fbshipit-source-id: fe9c26507bf131221f2466740204bff40a15614a
This commit is contained in:
Chinmay Kamat 2018-02-09 14:01:10 -08:00 committed by Facebook Github Bot
parent d62af7fa4f
commit 9fc72d6f16
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monitoring/perf_context_imp.h
View File

@ -43,7 +43,7 @@ extern __thread PerfContext perf_context;
#define PERF_CONDITIONAL_TIMER_FOR_MUTEX_GUARD(metric, condition) \ #define PERF_CONDITIONAL_TIMER_FOR_MUTEX_GUARD(metric, condition) \
PerfStepTimer perf_step_timer_##metric(&(perf_context.metric), true); \ PerfStepTimer perf_step_timer_##metric(&(perf_context.metric), true); \
if ((condition)) { \ if (condition) { \
perf_step_timer_##metric.Start(); \ perf_step_timer_##metric.Start(); \
} }

3
tools/db_stress.cc
View File

@ -28,7 +28,10 @@ int main() {
} }
#else #else
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
#endif // __STDC_FORMAT_MACROS
#include <fcntl.h> #include <fcntl.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>

3
tools/write_stress.cc
View File

@ -56,7 +56,10 @@ int main() {
} }
#else #else
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
#endif // __STDC_FORMAT_MACROS
#include <inttypes.h> #include <inttypes.h>
#include <atomic> #include <atomic>
#include <random> #include <random>

2
util/crc32c.cc
View File

@ -39,8 +39,10 @@
namespace rocksdb { namespace rocksdb {
namespace crc32c { namespace crc32c {
#if defined(HAVE_POWER8) && defined(HAS_ALTIVEC)
#ifdef __powerpc64__ #ifdef __powerpc64__
static int arch_ppc_crc32 = 0; static int arch_ppc_crc32 = 0;
#endif /* __powerpc64__ */
#endif #endif
static const uint32_t table0_[256] = { static const uint32_t table0_[256] = {