From e27e4057e1564af8e2073ed2b38e89795e9d1c74 Mon Sep 17 00:00:00 2001
From: Thorsten Liebig <Thorsten.Liebig@gmx.de>
Date: Fri, 16 Aug 2013 13:19:12 +0200
Subject: [PATCH] operator: make Grid_Path a typedef struct

Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>
---
 Common/operator_base.h                      | 6 ++++++
 FDTD/extensions/operator_ext_excitation.cpp | 2 +-
 FDTD/operator.cpp                           | 6 +++---
 FDTD/operator.h                             | 7 +------
 FDTD/operator_cylinder.cpp                  | 8 ++++----
 FDTD/operator_cylinder.h                    | 2 +-
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Common/operator_base.h b/Common/operator_base.h
index 063c863..9da358e 100644
--- a/Common/operator_base.h
+++ b/Common/operator_base.h
@@ -23,6 +23,12 @@
 #include "Common/processing.h"
 #include "string"
 
+typedef struct
+{
+	vector<unsigned int> posPath[3];
+	vector<unsigned short> dir;
+} Grid_Path;
+
 //! Abstract base-class for a common operator
 class Operator_Base
 {
diff --git a/FDTD/extensions/operator_ext_excitation.cpp b/FDTD/extensions/operator_ext_excitation.cpp
index 44a3182..d2085ff 100644
--- a/FDTD/extensions/operator_ext_excitation.cpp
+++ b/FDTD/extensions/operator_ext_excitation.cpp
@@ -230,7 +230,7 @@ bool Operator_Ext_Excitation::BuildExtension()
 	//special treatment for primitives of type curve (treated as wires) see also Calc_PEC
 	double p1[3];
 	double p2[3];
-	struct Operator::Grid_Path path;
+	Grid_Path path;
 	for (size_t p=0; p<vec_prop.size(); ++p)
 	{
 		prop = vec_prop.at(p);
diff --git a/FDTD/operator.cpp b/FDTD/operator.cpp
index 76fe7f1..49fe667 100644
--- a/FDTD/operator.cpp
+++ b/FDTD/operator.cpp
@@ -379,9 +379,9 @@ int Operator::SnapLine2Mesh(const double* start, const double* stop, unsigned in
 }
 
 
-struct Operator::Grid_Path Operator::FindPath(double start[], double stop[])
+Grid_Path Operator::FindPath(double start[], double stop[])
 {
-	struct Grid_Path path;
+	Grid_Path path;
 	unsigned int uiStart[3],uiStop[3],currPos[3];
 
 	int ret = SnapLine2Mesh(start, stop, uiStart, uiStop, false, true);
@@ -1775,7 +1775,7 @@ void Operator::CalcPEC_Curves()
 	//special treatment for primitives of type curve (treated as wires)
 	double p1[3];
 	double p2[3];
-	struct Grid_Path path;
+	Grid_Path path;
 	vector<CSProperties*> vec_prop = CSX->GetPropertyByType(CSProperties::METAL);
 	for (size_t p=0; p<vec_prop.size(); ++p)
 	{
diff --git a/FDTD/operator.h b/FDTD/operator.h
index ef7be56..1d92fec 100644
--- a/FDTD/operator.h
+++ b/FDTD/operator.h
@@ -179,12 +179,7 @@ protected:
 
 	virtual bool SetupCSXGrid(CSRectGrid* grid);
 
-	struct Grid_Path
-	{
-		vector<unsigned int> posPath[3];
-		vector<unsigned short> dir;
-	};
-	virtual struct Grid_Path FindPath(double start[], double stop[]);
+	virtual Grid_Path FindPath(double start[], double stop[]);
 
 	// debug
 	virtual void DumpOperator2File(string filename);
diff --git a/FDTD/operator_cylinder.cpp b/FDTD/operator_cylinder.cpp
index c18297f..e5f3bd3 100644
--- a/FDTD/operator_cylinder.cpp
+++ b/FDTD/operator_cylinder.cpp
@@ -274,7 +274,7 @@ int Operator_Cylinder::SnapLine2Mesh(const double* start, const double* stop, un
 }
 
 
-struct Operator::Grid_Path Operator_Cylinder::FindPath(double start[], double stop[])
+Grid_Path Operator_Cylinder::FindPath(double start[], double stop[])
 {
 	double l_start[3];
 	double l_stop[3];
@@ -316,7 +316,7 @@ struct Operator::Grid_Path Operator_Cylinder::FindPath(double start[], double st
 
 	// if a-stop fitted to disc range is now smaller than a-start, it must step over the a-bounds...
 
-	struct Grid_Path path;
+	Grid_Path path;
 	for (int n=0;n<3;++n)
 	{
 		if ((l_start[n]<GetDiscLine(n,0)) && (l_stop[n]<GetDiscLine(n,0)))
@@ -331,8 +331,8 @@ struct Operator::Grid_Path Operator_Cylinder::FindPath(double start[], double st
 	// this section comes into play, if the line moves over the angulare mesh-end/start
 	// we try to have one part of the path on both "ends" of the mesh and stitch them together
 
-	struct Grid_Path path1;
-	struct Grid_Path path2;
+	Grid_Path path1;
+	Grid_Path path2;
 
 	// calculate the intersection of the line with the a-max boundary
 	double p0[3],p1[3],p2[3];
diff --git a/FDTD/operator_cylinder.h b/FDTD/operator_cylinder.h
index 9e62c04..b8ffb4d 100644
--- a/FDTD/operator_cylinder.h
+++ b/FDTD/operator_cylinder.h
@@ -93,7 +93,7 @@ protected:
 
 	virtual bool SetupCSXGrid(CSRectGrid* grid);
 
-	virtual struct Grid_Path FindPath(double start[], double stop[]);
+	virtual Grid_Path FindPath(double start[], double stop[]);
 
 	virtual double GetRawDiscDelta(int ny, const int pos) const;