[newfield_revision Patch] Fix nearestNeighbors()

Jeffrey Oldham oldham at codesourcery.com
Thu Aug 16 20:21:52 UTC 2001


This patch fixes a typographical error and inlines some trivial
functions.

2001-08-16  Jeffrey D. Oldham  <oldham at codesourcery.com>

        * NearestNeighbors.h:
        (NearestNeighborClass::operator()(Center,FieldOffsetList_t,Center):
        Correct the return type.
        (nearestNeighbors): Inline.

Applied to      newfield_revision branch
Approved by     Stephen Smith
Tested on       sequential Linux using gcc 3.0.1 by compiling Pooma library and NewField tests

Thanks,
Jeffrey D. Oldham
oldham at codesourcery.com
-------------- next part --------------
Index: NearestNeighbors.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/NewField/Attic/NearestNeighbors.h,v
retrieving revision 1.1.2.6
diff -c -p -r1.1.2.6 NearestNeighbors.h
*** NearestNeighbors.h	2001/08/16 00:39:36	1.1.2.6
--- NearestNeighbors.h	2001/08/16 17:59:54
*************** public:
*** 158,164 ****
    // Return the nearest neighbors for multiple output positions, specified
    // by a FieldOffsetList.
  
!   inline FieldOffsetList_t
    operator()(const Center &inputCentering,
  	     const FieldOffsetList_t &fieldOffsetList,
  	     const Center &outputCentering)
--- 158,164 ----
    // Return the nearest neighbors for multiple output positions, specified
    // by a FieldOffsetList.
  
!   inline std::vector<FieldOffsetList_t>
    operator()(const Center &inputCentering,
  	     const FieldOffsetList_t &fieldOffsetList,
  	     const Center &outputCentering)
*************** NearestNeighborClass<Dim, IntraCellOnly>
*** 431,436 ****
--- 431,437 ----
  //-----------------------------------------------------------------------------
  
  template <int Dim>
+ inline
  std::vector<FieldOffsetList<Dim> >
  nearestNeighbors(const Centering<Dim> &inputCentering,
  		 const Centering<Dim> &outputCentering)
*************** nearestNeighbors(const Centering<Dim> &i
*** 439,444 ****
--- 440,446 ----
  }
  
  template <int Dim>
+ inline
  std::vector<FieldOffsetList<Dim> >
  nearestNeighbors(const Centering<Dim> &inputCentering,
  		 const Centering<Dim> &outputCentering,
*************** nearestNeighbors(const Centering<Dim> &i
*** 448,453 ****
--- 450,456 ----
  }
  
  template <int Dim>
+ inline
  std::vector<FieldOffsetList<Dim> >
  nearestNeighbors(const Centering<Dim> &inputCentering,
  		 const FieldOffsetList<Dim> &fOL,
*************** nearestNeighbors(const Centering<Dim> &i
*** 457,462 ****
--- 460,466 ----
  }
  
  template <int Dim>
+ inline
  std::vector<FieldOffsetList<Dim> >
  nearestNeighbors(const Centering<Dim> &inputCentering,
  		 const FieldOffsetList<Dim> &fOL,
*************** nearestNeighbors(const Centering<Dim> &i
*** 468,473 ****
--- 472,478 ----
  }
  
  template <int Dim>
+ inline
  FieldOffsetList<Dim>
  nearestNeighbors(const Centering<Dim> &inputCentering,
  		 const FieldOffset<Dim> &fieldOffset,
*************** nearestNeighbors(const Centering<Dim> &i
*** 478,483 ****
--- 483,489 ----
  }
  
  template <int Dim>
+ inline
  FieldOffsetList<Dim>
  nearestNeighbors(const Centering<Dim> &inputCentering,
  		 const FieldOffset<Dim> &fieldOffset,


More information about the pooma-dev mailing list