diff options
Diffstat (limited to 'src/mem/ruby/network/fault_model')
| -rw-r--r-- | src/mem/ruby/network/fault_model/FaultModel.cc | 7 | ||||
| -rw-r--r-- | src/mem/ruby/network/fault_model/FaultModel.hh | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/mem/ruby/network/fault_model/FaultModel.cc b/src/mem/ruby/network/fault_model/FaultModel.cc index 195f7c66c..83679984d 100644 --- a/src/mem/ruby/network/fault_model/FaultModel.cc +++ b/src/mem/ruby/network/fault_model/FaultModel.cc @@ -37,11 +37,8 @@ * Proceedings of the 48th Design Automation Conference (DAC'11) */ -// C includes -#include <assert.h> -#include <stdio.h> - // C++ includes +#include <cassert> #include <fstream> #include <iostream> #include <vector> @@ -50,6 +47,8 @@ #include "FaultModel.hh" #include "base/misc.hh" +using namespace std; + #define MAX(a,b) ((a > b) ? (a) : (b)) diff --git a/src/mem/ruby/network/fault_model/FaultModel.hh b/src/mem/ruby/network/fault_model/FaultModel.hh index 12a3f3844..c099220ca 100644 --- a/src/mem/ruby/network/fault_model/FaultModel.hh +++ b/src/mem/ruby/network/fault_model/FaultModel.hh @@ -47,7 +47,6 @@ // C++ includes #include <string> -using namespace std; // GEM5 includes #include "params/FaultModel.hh" @@ -112,7 +111,7 @@ class FaultModel : public SimObject int number_of_buff_per_data_vc, int number_of_buff_per_ctrl_vc); - string fault_type_to_string(int fault_type_index); + std::string fault_type_to_string(int fault_type_index); // the following 2 functions are called at runtime, to get the probability // of each fault type (fault_vector) or the aggregate fault probability @@ -134,9 +133,9 @@ class FaultModel : public SimObject void print(void); private: - vector <system_conf> configurations; - vector <system_conf> routers; - vector <int> temperature_weights; + std::vector <system_conf> configurations; + std::vector <system_conf> routers; + std::vector <int> temperature_weights; }; #endif // __MEM_RUBY_NETWORK_FAULT_MODEL_HH__ |