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 22e591348992c12c55ae7207240cba0cff0ace11..04c836016c1f426cdbca8ad579aafde1a74c1b30 100644 (file)
--- 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 d488735bb9e23c63207f3b235bc00f06d0d357a3..57e2b827100354c9f84c0b9d3a66786fb0ac483c 100644 (file)
--- 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 5a32c4369359ae1f0992612d4c1c9983ab1b0dff..0ff481e2d20b6f497129c574e6de66c94b93aab6 100644 (file)
--- 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 532c55ec7b9b20ec804be946a11551f797157476..f8c423efe4b2bd1c6e6b749c1a1f86b2213ac8a8 100644 (file)
--- 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 b05d1c3d4e0b6188fc91389d2e8400ca2b99ec11..b3c3b70c35f0c6991dd7ab0a2b65326f1174c267 100644 (file)
--- 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;