From 1f120284ed80ee1258b556fbedacab209098a0d1 Mon Sep 17 00:00:00 2001 From: Colin Patrick McCabe Date: Tue, 8 Mar 2011 15:08:10 -0800 Subject: [PATCH] Suppress gnu_cxx::hash warning a little bit better Signed-off-by: Colin McCabe --- src/Makefile.am | 2 +- src/include/types.h | 6 +++++- src/mds/Dumper.cc | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 8ddfcb17cdb75..5f29d4d5f659d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -420,7 +420,7 @@ CLEANFILES += \ ## -AM_CXXFLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic -Wno-deprecated +AM_CXXFLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic if USE_BOOST_SPIRIT_OLD_HDR AM_CXXFLAGS += -DUSE_BOOST_SPIRIT_OLD_HDR endif diff --git a/src/include/types.h b/src/include/types.h index 601a5191c1d0e..eb442aa7861ea 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -37,7 +37,11 @@ // -#define _BACKWARD_BACKWARD_WARNING_H /* make gcc 4.3 shut up about hash_*. */ +#ifdef __cplusplus +#ifndef _BACKWARD_BACKWARD_WARNING_H +#define _BACKWARD_BACKWARD_WARNING_H // make gcc 4.3 shut up about hash_* +#endif +#endif extern "C" { #include diff --git a/src/mds/Dumper.cc b/src/mds/Dumper.cc index f74091002fec2..2145dfe627543 100644 --- a/src/mds/Dumper.cc +++ b/src/mds/Dumper.cc @@ -12,6 +12,10 @@ * */ +#ifndef _BACKWARD_BACKWARD_WARNING_H +#define _BACKWARD_BACKWARD_WARNING_H // make gcc 4.3 shut up about hash_* +#endif + #include "common/entity_name.h" #include "common/errno.h" #include "common/safe_io.h" -- 2.39.5