Patch: src Changes to Permit Compilation using gcc

[Jeffrey Oldham]

These changes to the Pooma src directory were committed.

Domain/DomainTraits.Interval.h:
  
        * Add a static_cast to avoid a conversion problem.
  
Evaluator/OpMask.h:
  
        * Modify a comment to avoid "multiline comment" warnings.
  
Layout/Node.h:
  
        * Remove an extraneous '\' to avoid a "multiline comment" warning.
  
Pooma/PETE/AssertEquals.h:
  
        * Modify to conform with previous changes to
        Pooma/PETE/Combiners.h.

Tested on	gcc and Linux.
Reviewed by	Jim Crodinger.

Thanks,
Jeffrey D. Oldham
oldham at codesourcery.com
-------------- next part --------------
Index: Domain/DomainTraits.Interval.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Domain/DomainTraits.Interval.h,v
retrieving revision 1.23
diff -c -p -r1.23 DomainTraits.Interval.h
*** Domain/DomainTraits.Interval.h	2000/06/27 01:58:27	1.23
--- Domain/DomainTraits.Interval.h	2001/03/15 07:00:04
*************** struct DomainTraits< Interval<1> >
*** 262,268 ****
      CTAssert(DomainTraits<T1>::singleValued == 1);
      CTAssert(DomainTraits<T2>::singleValued == 1);
      dom[0] = begval;
!     dom[1] = (endval - begval + 1);
      PAssert(begval <= endval || dom[1] == 0);
    }
  
--- 262,268 ----
      CTAssert(DomainTraits<T1>::singleValued == 1);
      CTAssert(DomainTraits<T2>::singleValued == 1);
      dom[0] = begval;
!     dom[1] = static_cast<Element_t>(endval - begval + 1);
      PAssert(begval <= endval || dom[1] == 0);
    }
  
Index: Evaluator/OpMask.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Evaluator/OpMask.h,v
retrieving revision 1.18
diff -c -p -r1.18 OpMask.h
*** Evaluator/OpMask.h	2000/03/07 13:17:03	1.18
--- Evaluator/OpMask.h	2001/03/15 07:00:04
***************
*** 75,84 ****
  // To implement this behaviour, the expression is translated to the tree:
  //
  //        OpMask<OpAddAssign>
! //           /        \
  //          A        WhereMask
! //                     /    \
! //                    F      B
  //
  // ForEach is specialized for WhereMask to evaluate B only if F is true.
  // The result is returned in a MaskAssign<B::Element_t>, which contains
--- 75,84 ----
  // To implement this behaviour, the expression is translated to the tree:
  //
  //        OpMask<OpAddAssign>
! //           /        |
  //          A        WhereMask
! //                     /    |
! //                    F     B
  //
  // ForEach is specialized for WhereMask to evaluate B only if F is true.
  // The result is returned in a MaskAssign<B::Element_t>, which contains
Index: Layout/Node.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Layout/Node.h,v
retrieving revision 1.32
diff -c -p -r1.32 Node.h
*** Layout/Node.h	2000/05/05 13:41:11	1.32
--- Layout/Node.h	2001/03/15 07:00:04
***************
*** 69,75 ****
  // is locating.  It stores domains describing the owned and allocated
  // domains of the patch, the latter being in reference to the actual 
  // underlying layout domain, the context where the patch should be stored,
! // and two ID values:\
  //
  //   1) a global ID, which, for a set of N subdomains partitioned across ALL
  //      the contexts, should be a unique value from 0 ... N-1
--- 69,75 ----
  // is locating.  It stores domains describing the owned and allocated
  // domains of the patch, the latter being in reference to the actual 
  // underlying layout domain, the context where the patch should be stored,
! // and two ID values:
  //
  //   1) a global ID, which, for a set of N subdomains partitioned across ALL
  //      the contexts, should be a unique value from 0 ... N-1
Index: Pooma/PETE/AssertEquals.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Pooma/PETE/AssertEquals.h,v
retrieving revision 1.2
diff -c -p -r1.2 AssertEquals.h
*** Pooma/PETE/AssertEquals.h	2000/03/07 13:18:06	1.2
--- Pooma/PETE/AssertEquals.h	2001/03/15 07:00:05
*************** struct Combine2<int, int, Op, AssertEqua
*** 79,86 ****
  {
    typedef int Type_t;
    inline static
!   Type_t combine(const int &a, const int &b,
! 		 const Op &, const AssertEquals &ae)
    {
      int ret = a;
      if ((a != ae.ignore_m) && (b != ae.ignore_m))
--- 79,85 ----
  {
    typedef int Type_t;
    inline static
!   Type_t combine(const int &a, const int &b, const AssertEquals &ae)
    {
      int ret = a;
      if ((a != ae.ignore_m) && (b != ae.ignore_m))