Changeset 2870 in Sophya

Timestamp:

Jan 3, 2006, 3:23:37 PM (20 years ago)

Author:

ansari

Message:

Portage/compilation sur AIX-XlC (regatta): Ajout qualification de nom ou namespace SOPHYA pour instanciation explicite de template + correction ambiguite syntaxe new X* [] - Reza 3 Jan 2006

Location:

trunk/SophyaLib/NTools

Files:

• cimage.cc (modified) (2 diffs)
• dynccd.cc (modified) (2 diffs)
• fftservintf.cc (modified) (1 diff)
• generaldata.cc (modified) (1 diff)
• objfitter.cc (modified) (2 diffs)
• perandom.cc (modified) (2 diffs)
• poly.cc (modified) (1 diff)

trunk/SophyaLib/NTools/cimage.cc

@@ -192 +192 @@
 
 #if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
+namespace SOPHYA {
 template class Image<uint_2>;
 template class Image<int_4>;
@@ -205 +206 @@
 template class FIO_Image<r_4>;
 template class FIO_Image<r_8>;
-
+}
 #endif

trunk/SophyaLib/NTools/dynccd.cc

@@ -176 +176 @@
 
 #if defined(ANSI_TEMPLATES) || defined(__GNU_TEMPLATES__)
+namespace SOPHYA {
 template Image<uint_2> NoiseImage<uint_2>(Image<uint_2> const& , DynCCD const&);
 template Image< int_4> NoiseImage< int_4>(Image< int_4> const& , DynCCD const&);
@@ -183 +184 @@
 template void ImgAddNoise< int_4>(Image< int_4>&, DynCCD const&);
 template void ImgAddNoise<   r_4>(Image<   r_4>&, DynCCD const&);
+}
 #endif

trunk/SophyaLib/NTools/fftservintf.cc

@@ -338 +338 @@
 
 #if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
+namespace SOPHYA {
 template class FFTArrayChecker<r_4>;
 template class FFTArrayChecker<r_8>;
+}
 #endif
 

trunk/SophyaLib/NTools/generaldata.cc

@@ -1151 +1151 @@
 
 #if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
-template class ObjFileIO<GeneralFitData>;
+template class SOPHYA::ObjFileIO<GeneralFitData>;
 #endif

trunk/SophyaLib/NTools/objfitter.cc

@@ -407 +407 @@
 
 #if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
+namespace SOPHYA {
 template class ArrayFitter<int_4>;
 template class ArrayFitter<r_4>;
@@ -417 +418 @@
 template class ImageFitter<r_4>;
 template class ImageFitter<r_8>;
+}
 #endif

trunk/SophyaLib/NTools/perandom.cc

@@ -163 +163 @@
    delete[] tabX;
    
-   ranY = new(FunRan*[nBinX]);
+   ranY = new FunRan* [nBinX];
    
    for (int_4 k=0; k<nBinX; k++)
@@ -187 +187 @@
    ranX = new FunRan(tabX, nBinX);
    
-   ranY = new(FunRan*[nBinX]);
+   ranY = new FunRan* [nBinX];
    
    for (int_4 k=0; k<nBinX; k++)

trunk/SophyaLib/NTools/poly.cc

@@ -793 +793 @@
 
 #if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
+namespace SOPHYA {
 template class ObjFileIO<Poly>;
 template class ObjFileIO<Poly2>;
+}
 #endif