Merge pull request ceph#60993 from MaxKellermann/types__backward_backward

include/types.h, tools/cephfs: remove _BACKWARD_BACKWARD_WARNING_H

Reviewed-by: Venky Shankar <[email protected]>
Reviewed-by: Ilya Dryomov <[email protected]>

Author: idryomov

src/include/types.h

@@ -28,12 +28,6 @@
 #include "ceph_frag.h"
 #include "rbd_types.h"
 
-#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 <stdint.h>
 #include <sys/types.h>

src/journal/Entry.cc

@@ -5,7 +5,8 @@
 #include "include/encoding.h"
 #include "include/stringify.h"
 #include "common/Formatter.h"
-#include <strstream>
+
+#include <sstream>
 
 #define dout_subsys ceph_subsys_journaler
 #undef dout_prefix

src/tools/cephfs/Dumper.cc

@@ -12,10 +12,6 @@
  * 
  */
 
-#ifndef _BACKWARD_BACKWARD_WARNING_H
-#define _BACKWARD_BACKWARD_WARNING_H   // make gcc 4.3 shut up about hash_*
-#endif
-
 #include "include/compat.h"
 #include "include/fs_types.h"
 #include "common/entity_name.h"