From: cxwshawn <cxwshawn@gmail.com>
Date: Wed, 25 May 2016 04:41:44 +0000 (+0800)
Subject: crush: optimize header file dependency
X-Git-Tag: v12.1.0~10^2~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9307%2Fhead;p=ceph.git

crush: optimize header file dependency

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
---

diff --git a/src/crush/CrushCompiler.cc b/src/crush/CrushCompiler.cc
index 22e591348992..04c836016c1f 100644
--- a/src/crush/CrushCompiler.cc
+++ b/src/crush/CrushCompiler.cc
@@ -8,16 +8,7 @@
 #ifndef EBADE
 #define EBADE EFTYPE
 #endif
-
-#include <iostream>
-#include <stack>
-#include <functional>
 #include <string>
-#include <stdexcept>
-#include <map>
-#include <cctype>
-
-#include <typeinfo>
 #include "common/errno.h"
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/crush/CrushCompiler.h b/src/crush/CrushCompiler.h
index d488735bb9e2..57e2b8271003 100644
--- a/src/crush/CrushCompiler.h
+++ b/src/crush/CrushCompiler.h
@@ -8,8 +8,7 @@
 #include "crush/grammar.h"
 
 #include <map>
-#include <ostream>
-#include <functional>
+#include <iostream>
 
 class CrushCompiler {
   CrushWrapper& crush;
diff --git a/src/crush/CrushLocation.cc b/src/crush/CrushLocation.cc
index 5a32c4369359..0ff481e2d20b 100644
--- a/src/crush/CrushLocation.cc
+++ b/src/crush/CrushLocation.cc
@@ -7,7 +7,7 @@
 #include "include/str_list.h"
 #include "common/debug.h"
 
-#include <common/SubProcess.h>
+#include "common/SubProcess.h"
 
 #include <vector>
 
diff --git a/src/crush/CrushTester.cc b/src/crush/CrushTester.cc
index 532c55ec7b9b..f8c423efe4b2 100644
--- a/src/crush/CrushTester.cc
+++ b/src/crush/CrushTester.cc
@@ -17,7 +17,7 @@
 #endif
 #include <boost/icl/interval_map.hpp>
 #include <boost/algorithm/string/join.hpp>
-#include <common/SubProcess.h>
+#include "common/SubProcess.h"
 
 void CrushTester::set_device_weight(int dev, float f)
 {
diff --git a/src/crush/CrushTester.h b/src/crush/CrushTester.h
index b05d1c3d4e0b..b3c3b70c35f0 100644
--- a/src/crush/CrushTester.h
+++ b/src/crush/CrushTester.h
@@ -7,7 +7,6 @@
 #include "crush/CrushWrapper.h"
 
 #include <fstream>
-#include <sstream>
 
 class CrushTester {
   CrushWrapper& crush;