[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Fix more ISO conformance problems
|
From: |
Richard Guenther |
|
Subject: |
[PATCH] Fix more ISO conformance problems |
|
Date: |
Thu, 23 Jan 2003 22:42:44 +0100 (CET) |
Ok?
2003Jan23 Richard Guenther <address@hidden>
* src/Array/tests/ScalarAdvection.cpp: forward declare badOption()
and badValue().
src/Domain/NewDomain.h: use enum rather than not compile-time
constant const int.
src/Layout/GridLayout.cpp: use GCFillInfo_t typename for
constructing LayoutBaseData<Dim>::GCFillInfo.
src/Layout/SparseTileLayout.cpp: likewise.
src/Layout/UniformGridLayout.cpp: likewise.
Index: src/Array/tests/ScalarAdvection.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Array/tests/ScalarAdvection.cpp,v
retrieving revision 1.5
diff -u -u -r1.5 ScalarAdvection.cpp
--- src/Array/tests/ScalarAdvection.cpp 10 Oct 2001 17:55:01 -0000 1.5
+++ src/Array/tests/ScalarAdvection.cpp 23 Jan 2003 21:39:40 -0000
@@ -72,6 +72,12 @@
template <int D, class OStr>
void print(const SAOptions<D> &opts, OStr &out);
+template <class OStr>
+void badOption(OStr &out, const char *str, const std::string &option);
+
+template <class OStr>
+void badValue(OStr &out, const std::string &option);
+
template <int D>
class SAOptions
{
Index: src/Domain/NewDomain.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Domain/NewDomain.h,v
retrieving revision 1.31
diff -u -u -r1.31 NewDomain.h
--- src/Domain/NewDomain.h 14 Jan 2002 16:48:21 -0000 1.31
+++ src/Domain/NewDomain.h 23 Jan 2003 21:39:49 -0000
@@ -417,8 +417,8 @@
inline static RT &fillSlice(RT &retval, const UT &u,
const T1 &a, const T2 &b)
{
- const bool RDX =
- DomainTraits<RT>::dimensions > DomainTraits<RT>::sliceDimensions;
+ enum { RDX =
+ DomainTraits<RT>::dimensions > DomainTraits<RT>::sliceDimensions };
CombineSliceDomain<RT,UT,T1,0,0,(DX1>0 && RDX)>::
combine(retval,u,a);
CombineSliceDomain<RT,UT,T2,S2,DX1,(DX2>0 && RDX)>::
@@ -828,8 +828,8 @@
inline static RT &fillSlice(RT &retval, const UT &u,
const T1 &a)
{
- const bool RDX =
- DomainTraits<RT>::dimensions > DomainTraits<RT>::sliceDimensions;
+ enum { RDX =
+ DomainTraits<RT>::dimensions > DomainTraits<RT>::sliceDimensions };
CombineSliceDomain<RT,UT,T1,0,0,(DX1>0 && RDX)>::combine(retval,u,a);
return retval;
}
@@ -878,8 +878,8 @@
inline static RT &fillSlice(RT &retval, const UT &u,
const T1 &a, const T2 &b, const T3 &c)
{
- const bool RDX =
- DomainTraits<RT>::dimensions > DomainTraits<RT>::sliceDimensions;
+ enum { RDX =
+ DomainTraits<RT>::dimensions > DomainTraits<RT>::sliceDimensions };
CombineSliceDomain<RT,UT,T1,0,0,(DX1>0 && RDX)>::combine(retval,u,a);
CombineSliceDomain<RT,UT,T2,S2,DX1,(DX2>0 && RDX)>::combine(retval,u,b);
CombineSliceDomain<RT,UT,T3,S3,DX1+DX2,(DX3>0 && RDX)>::
@@ -939,8 +939,8 @@
const T1 &a, const T2 &b, const T3 &c,
const T4 &d)
{
- const bool RDX =
- DomainTraits<RT>::dimensions > DomainTraits<RT>::sliceDimensions;
+ enum { RDX =
+ DomainTraits<RT>::dimensions > DomainTraits<RT>::sliceDimensions };
CombineSliceDomain<RT,UT,T1,0,0,(DX1>0 && RDX)>::combine(retval,u,a);
CombineSliceDomain<RT,UT,T2,S2,DX1,(DX2>0 && RDX)>::combine(retval,u,b);
CombineSliceDomain<RT,UT,T3,S3,DX1+DX2,(DX3>0 && RDX)>::
@@ -1005,8 +1005,8 @@
const T1 &a, const T2 &b, const T3 &c,
const T4 &d, const T5 &e)
{
- const bool RDX =
- DomainTraits<RT>::dimensions > DomainTraits<RT>::sliceDimensions;
+ enum { RDX =
+ DomainTraits<RT>::dimensions > DomainTraits<RT>::sliceDimensions };
CombineSliceDomain<RT,UT,T1,0,0,(DX1>0 && RDX)>::combine(retval,u,a);
CombineSliceDomain<RT,UT,T2,S2,DX1,(DX2>0 && RDX)>::combine(retval,u,b);
CombineSliceDomain<RT,UT,T3,S3,DX1+DX2,(DX3>0 && RDX)>::
@@ -1080,8 +1080,8 @@
const T1 &a, const T2 &b, const T3 &c,
const T4 &d, const T5 &e, const T6 &f)
{
- const bool RDX =
- DomainTraits<RT>::dimensions > DomainTraits<RT>::sliceDimensions;
+ enum { RDX =
+ DomainTraits<RT>::dimensions > DomainTraits<RT>::sliceDimensions };
CombineSliceDomain<RT,UT,T1,0,0,(DX1>0 && RDX)>::combine(retval,u,a);
CombineSliceDomain<RT,UT,T2,S2,DX1,(DX2>0 && RDX)>::combine(retval,u,b);
CombineSliceDomain<RT,UT,T3,S3,DX1+DX2,(DX3>0 && RDX)>::
@@ -1166,8 +1166,8 @@
const T5 &e, const T6 &f,
const T7 &g)
{
- const bool RDX =
- DomainTraits<RT>::dimensions > DomainTraits<RT>::sliceDimensions;
+ enum { RDX =
+ DomainTraits<RT>::dimensions > DomainTraits<RT>::sliceDimensions };
CombineSliceDomain<RT,UT,T1,0,0,(DX1>0 && RDX)>::combine(retval,u,a);
CombineSliceDomain<RT,UT,T2,S2,DX1,(DX2>0 && RDX)>::combine(retval,u,b);
CombineSliceDomain<RT,UT,T3,S3,DX1+DX2,(DX3>0 && RDX)>::
Index: src/Layout/GridLayout.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Layout/GridLayout.cpp,v
retrieving revision 1.87
diff -u -u -r1.87 GridLayout.cpp
--- src/Layout/GridLayout.cpp 23 Jan 2003 21:29:49 -0000 1.87
+++ src/Layout/GridLayout.cpp 23 Jan 2003 21:39:56 -0000
@@ -429,8 +429,7 @@
// Now, push IDs and source into cache...
-
this->gcFillList_m.push_back(LayoutBaseData<Dim>::GCFillInfo(gcdom,
- sourceID, destID));
+ this->gcFillList_m.push_back(GCFillInfo_t(gcdom,
sourceID, destID));
}
}
}
@@ -482,8 +481,7 @@
// Now, push IDs and source into cache...
-
this->gcFillList_m.push_back(LayoutBaseData<Dim>::GCFillInfo(gcdom,
- sourceID, destID));
+ this->gcFillList_m.push_back(GCFillInfo_t(gcdom,
sourceID, destID));
}
}
}
Index: src/Layout/SparseTileLayout.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Layout/SparseTileLayout.cpp,v
retrieving revision 1.29
diff -u -u -r1.29 SparseTileLayout.cpp
--- src/Layout/SparseTileLayout.cpp 23 Jan 2003 21:29:49 -0000 1.29
+++ src/Layout/SparseTileLayout.cpp 23 Jan 2003 21:40:00 -0000
@@ -449,9 +449,9 @@
for ( ; GCLstart!=GCLend ; ++GCLstart )
{
// removed the external guard layer area.
-
this->gcFillList_m.push_back(LayoutBaseData<Dim>::GCFillInfo((*GCLstart).domain(),
- (*GCLstart).globalID(),
- (*start)->globalID()));
+ this->gcFillList_m.push_back(GCFillInfo_t((*GCLstart).domain(),
+ (*GCLstart).globalID(),
+ (*start)->globalID()));
}
tlist.clear();
}
Index: src/Layout/UniformGridLayout.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Layout/UniformGridLayout.cpp,v
retrieving revision 1.38
diff -u -u -r1.38 UniformGridLayout.cpp
--- src/Layout/UniformGridLayout.cpp 23 Jan 2003 21:29:49 -0000 1.38
+++ src/Layout/UniformGridLayout.cpp 23 Jan 2003 21:40:01 -0000
@@ -370,7 +370,7 @@
this->all_m[sourceID]->context() == Pooma::context() ||
this->all_m[destID]->context() == Pooma::context()
)
-
this->gcFillList_m.push_back(LayoutBaseData<Dim>::GCFillInfo(gcdom,sourceID,destID));
+
this->gcFillList_m.push_back(GCFillInfo_t(gcdom,sourceID,destID));
}
}
@@ -417,7 +417,7 @@
this->all_m[sourceID]->context() == Pooma::context() ||
this->all_m[destID]->context() == Pooma::context()
)
-
this->gcFillList_m.push_back(LayoutBaseData<Dim>::GCFillInfo(gcdom,sourceID,destID));
+
this->gcFillList_m.push_back(GCFillInfo_t(gcdom,sourceID,destID));
}
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] Fix more ISO conformance problems,
Richard Guenther <=