[PATCH] Correct typos (obvious)

[Richard Guenther]

The following patch corrects typos found by famous new g++ parser.

Ok?

Ok to apply similar fixes once I find errors as obvious?

Thanks, Richard.


2003Jan21  Richard Guenther <address@hidden>

        * src/DynamicArray/DynamicArray.h: s/Dim/1/
        src/Field/DiffOps/FieldOffsetReduction.h:
        s/outputputCentering_m/outputCentering_m/
        src/Field/Field.h: s/field/f/
        src/Field/Relations/Relations.h: s/r1/r/
        src/Engine/IsValidLocation.h: protect against multiple inclusion.


diff -Nru a/r2/src/DynamicArray/DynamicArray.h 
b/r2/src/DynamicArray/DynamicArray.h
--- a/r2/src/DynamicArray/DynamicArray.h        Tue Jan 21 15:31:05 2003
+++ b/r2/src/DynamicArray/DynamicArray.h        Tue Jan 21 15:31:05 2003
@@ -370,7 +370,7 @@

   template<class Sub1>
   DynamicArray(const Sub1 &s1, const ModelElement<Element_t> &model)
-    : Array<Dim, T, EngineTag>(s1, model)
+    : Array<1, T, EngineTag>(s1, model)
   {
     CTAssert(dynamic == true);
   }
diff -Nru a/r2/src/Engine/IsValidLocation.h b/r2/src/Engine/IsValidLocation.h
--- a/r2/src/Engine/IsValidLocation.h   Tue Jan 21 15:31:05 2003
+++ b/r2/src/Engine/IsValidLocation.h   Tue Jan 21 15:31:05 2003
@@ -26,6 +26,9 @@
 // ----------------------------------------------------------------------
 // ACL:license

+#ifndef POOMA_ENGINE_ISVALIDLOCATION_H
+#define POOMA_ENGINE_ISVALIDLOCATION_H
+
 //-----------------------------------------------------------------------------
 // These helper functions are used to determine if a particular location
 // or region of a object is defined. For all objects _not_ based
@@ -113,3 +116,5 @@
 {
  return true;
 }
+
+#endif
diff -Nru a/r2/src/Field/DiffOps/FieldOffsetReduction.h 
b/r2/src/Field/DiffOps/FieldOffsetReduction.h
--- a/r2/src/Field/DiffOps/FieldOffsetReduction.h       Tue Jan 21 15:31:05 2003
+++ b/r2/src/Field/DiffOps/FieldOffsetReduction.h       Tue Jan 21 15:31:05 2003
@@ -93,7 +93,7 @@

   const Centering<Dim> &outputCentering() const
   {
-    return outputputCentering_m;
+    return outputCentering_m;
   }

   const Centering<Dim> &inputCentering() const
diff -Nru a/r2/src/Field/Field.h b/r2/src/Field/Field.h
--- a/r2/src/Field/Field.h      Tue Jan 21 15:31:05 2003
+++ b/r2/src/Field/Field.h      Tue Jan 21 15:31:05 2003
@@ -1743,7 +1743,7 @@
   Type_t apply(const Subject_t &f,
                   const DataObjectRequest<RequestType> &functor)
     {
-      return LeafFunctor_t::apply(field.fieldEngine(), functor);
+      return LeafFunctor_t::apply(f.fieldEngine(), functor);
     }
 };

diff -Nru a/r2/src/Field/Relations/Relations.h 
b/r2/src/Field/Relations/Relations.h
--- a/r2/src/Field/Relations/Relations.h        Tue Jan 21 15:31:05 2003
+++ b/r2/src/Field/Relations/Relations.h        Tue Jan 21 15:31:05 2003
@@ -185,7 +185,7 @@

   Relation1(const Target &t, const R1 &r,
     const RelationFunctor &f)
-  : RelationBase<Target, RelationFunctor>(t, f), r1_m(r1)
+  : RelationBase<Target, RelationFunctor>(t, f), r1_m(r)
   { }

   //---------------------------------------------------------------------------