diff options
| author | Igor Canadi <icanadi@fb.com> | 2014-03-17 12:21:05 -0700 |
|---|---|---|
| committer | Igor Canadi <icanadi@fb.com> | 2014-03-17 12:21:05 -0700 |
| commit | e0c1211555b8b5ce7307532be229fe3895a23272 (patch) | |
| tree | 9e80c3098578fe445349bb109a6a1751cba541fb /Makefile | |
| parent | a782bb989ef89743127e0e93d822266076fa997e (diff) | |
| parent | 9b8a2b52d451dd1a162ef34c59df907f4b476b59 (diff) | |
Merge branch 'master' into columnfamilies
Conflicts:
db/version_set.cc
tools/db_stress.cc
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -36,7 +36,7 @@ else PLATFORM_CCFLAGS += $(JEMALLOC_INCLUDE) -DHAVE_JEMALLOC endif -WARNING_FLAGS = -Wall -Werror +WARNING_FLAGS = -Wall -Werror -Wno-sign-compare CFLAGS += -g $(WARNING_FLAGS) -I. -I./include $(PLATFORM_CCFLAGS) $(OPT) CXXFLAGS += -g $(WARNING_FLAGS) -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT) -Woverloaded-virtual |