40,41c40,41
< #ifndef __MEM_RUBY_NETWORK_SIMPLE_TOPOLOGY_HH__
< #define __MEM_RUBY_NETWORK_SIMPLE_TOPOLOGY_HH__
---
> #ifndef __MEM_RUBY_NETWORK_TOPOLOGY_HH__
> #define __MEM_RUBY_NETWORK_TOPOLOGY_HH__
49,51c49
< #include "mem/ruby/network/BasicRouter.hh"
< #include "params/Topology.hh"
< #include "sim/sim_object.hh"
---
> #include "mem/ruby/network/BasicLink.hh"
66c64
< class Topology : public SimObject
---
> class Topology
69,72c67,68
< typedef TopologyParams Params;
< Topology(const Params *p);
< virtual ~Topology() {}
< const Params *params() const { return (const Params *)_params; }
---
> Topology(uint32_t num_routers, std::vector<BasicExtLink *> ext_links,
> std::vector<BasicIntLink *> int_links);
74,75c70
< void init();
< int numSwitches() const { return m_number_of_switches; }
---
> uint32_t numSwitches() const { return m_number_of_switches; }
77,80d71
<
< void initNetworkPtr(Network* net_ptr);
<
< const std::string getName() { return m_name; }
90,95d80
< std::string getDesignStr();
< // Private copy constructor and assignment operator
< Topology(const Topology& obj);
< Topology& operator=(const Topology& obj);
<
< std::string m_name;
97c82
< int m_number_of_switches;
---
> uint32_t m_number_of_switches;
106d90
< std::vector<BasicRouter*> m_router_vector;
117c101
< #endif // __MEM_RUBY_NETWORK_SIMPLE_TOPOLOGY_HH__
---
> #endif // __MEM_RUBY_NETWORK_TOPOLOGY_HH__