From c75c6cc6ea1e6a41feb98efa5fd9c9c23ed42fdd Mon Sep 17 00:00:00 2001
From: Richard Whitehouse <github@richardwhiuk.com>
Date: Mon, 14 Mar 2011 15:43:46 +0000
Subject: [PATCH] Added mesh to build file, corrected class names for topology
 helpers

---
 code/src/topology/helper/cube.cc  | 4 ++--
 code/src/topology/helper/cube.h   | 4 ++--
 code/src/topology/helper/mesh.cc  | 4 ++--
 code/src/topology/helper/mesh.h   | 4 ++--
 code/src/topology/helper/torus.cc | 4 ++--
 code/src/topology/helper/torus.h  | 4 ++--
 code/src/topology/wscript         | 6 ++++--
 7 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/code/src/topology/helper/cube.cc b/code/src/topology/helper/cube.cc
index 58e5b4c..44644fc 100644
--- a/code/src/topology/helper/cube.cc
+++ b/code/src/topology/helper/cube.cc
@@ -21,11 +21,11 @@
 #include "cube.h"
 #include "ns3/log.h"
 
-NS_LOG_COMPONENT_DEFINE ("Cube_Topology_Helper");
+NS_LOG_COMPONENT_DEFINE ("CubeTopologyHelper");
 
 namespace ns3 {
 
-Topology Cube_Topology_Helper::Create(long hosts, long size){
+Topology CubeTopologyHelper::Create(long hosts, long size){
 
 	Topology t;
 
diff --git a/code/src/topology/helper/cube.h b/code/src/topology/helper/cube.h
index aad371f..e7cfcc0 100644
--- a/code/src/topology/helper/cube.h
+++ b/code/src/topology/helper/cube.h
@@ -25,11 +25,11 @@
 
 namespace ns3 {
 
-class Cube_Topology_Helper {
+class CubeTopologyHelper {
 	
 public:
 
-	Topology Create(long hosts, long size);	
+	static Topology Create(long hosts, long size);	
 
 };
 
diff --git a/code/src/topology/helper/mesh.cc b/code/src/topology/helper/mesh.cc
index 0162947..c37151b 100644
--- a/code/src/topology/helper/mesh.cc
+++ b/code/src/topology/helper/mesh.cc
@@ -21,11 +21,11 @@
 #include "mesh.h"
 #include "ns3/log.h"
 
-NS_LOG_COMPONENT_DEFINE ("Mesh_Topology_Helper");
+NS_LOG_COMPONENT_DEFINE ("MeshTopologyHelper");
 
 namespace ns3 {
 
-Topology Mesh_Topology_Helper::Create(long hosts, long size){
+Topology MeshTopologyHelper::Create(long hosts, long size){
 
 	Topology t;
 
diff --git a/code/src/topology/helper/mesh.h b/code/src/topology/helper/mesh.h
index c318929..6408248 100644
--- a/code/src/topology/helper/mesh.h
+++ b/code/src/topology/helper/mesh.h
@@ -25,11 +25,11 @@
 
 namespace ns3 {
 
-class Mesh_Topology_Helper {
+class MeshTopologyHelper {
 	
 public:
 
-	Topology Create(long hosts, long size);	
+	Topology static Create(long hosts, long size);	
 
 };
 
diff --git a/code/src/topology/helper/torus.cc b/code/src/topology/helper/torus.cc
index fc82140..1f4f4f4 100644
--- a/code/src/topology/helper/torus.cc
+++ b/code/src/topology/helper/torus.cc
@@ -21,11 +21,11 @@
 #include "torus.h"
 #include "ns3/log.h"
 
-NS_LOG_COMPONENT_DEFINE ("Torus_Topology_Helper");
+NS_LOG_COMPONENT_DEFINE ("TorusTopologyHelper");
 
 namespace ns3 {
 
-Topology Torus_Topology_Helper::Create(long hosts, long size){
+Topology TorusTopologyHelper::Create(long hosts, long size){
 
 	Topology t;
 
diff --git a/code/src/topology/helper/torus.h b/code/src/topology/helper/torus.h
index 2f00d9f..29db816 100644
--- a/code/src/topology/helper/torus.h
+++ b/code/src/topology/helper/torus.h
@@ -25,11 +25,11 @@
 
 namespace ns3 {
 
-class Torus_Topology_Helper {
+class TorusTopologyHelper {
 	
 public:
 
-	Topology Create(long hosts, long size);	
+	Topology static Create(long hosts, long size);	
 
 };
 
diff --git a/code/src/topology/wscript b/code/src/topology/wscript
index 2306f2d..63c65de 100644
--- a/code/src/topology/wscript
+++ b/code/src/topology/wscript
@@ -5,13 +5,15 @@ def build(bld):
     obj.source = [
 	'model/topology.cc',
 	'helper/cube.cc',
-	'helper/torus.cc'
+	'helper/torus.cc',
+	'helper/mesh.cc'
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = 'topology'
     headers.source = [
 	'model/topology.h',
 	'helper/cube.h',
-	'helper/torus.h'
+	'helper/torus.h',
+	'helper/mesh.h'
         ]
 
-- 
2.34.1