* cygwin complains about missing std:: in subdir Test/

diff --git a/ChangeLog b/ChangeLog
index c9f0b95e8420810191cd66854a91d0755fccf3d5..4993c111f7dc3e51114a05821c4965201ca6d87e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+2003-09-11  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
+      * cygwin complains about missing std:: in subdir Test/
 2003-09-10  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
       * remove some methods that are now in gdcmHeaderHelper
 2003-09-10  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>

diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx
index 7f1d360b028a8777475c6816284630c34a56db38..35d58950bf1186100ea83beae5612808b33266d8 100644 (file)
--- a/Testing/TestChangeHeader.cxx
+++ b/Testing/TestChangeHeader.cxx
@@ -10,7 +10,7 @@
        
        
 int main(int argc, char* argv[]) {  
-       string premier, deuxieme;
+       std::string premier, deuxieme;
        char resultat[200];
        
        gdcmFile  *f1, *f2;
@@ -33,7 +33,7 @@ int main(int argc, char* argv[]) {
        
        // On suppose que les champs DICOM du 2ieme fichier existent *effectivement*
        
-       string nbFrames = f2->GetPubElValByNumber(0x0028, 0x0008);
+       std::string nbFrames = f2->GetPubElValByNumber(0x0028, 0x0008);
        if(nbFrames != "gdcm::Unfound") {
            f1->ReplaceOrCreateByNumber( nbFrames, 0x0028, 0x0008);
         }
@@ -63,8 +63,8 @@ int main(int argc, char* argv[]) {
        // ou, plus joli:
        //f1->SetImageData(f2->GetImageData(),f2->GetImageDataSize());
        
-       string s0 =f2->GetPubElValByNumber(0x7fe0, 0x0000);
-       string s10=f2->GetPubElValByNumber(0x7fe0, 0x0010);
+       std::string s0 =f2->GetPubElValByNumber(0x7fe0, 0x0000);
+       std::string s10=f2->GetPubElValByNumber(0x7fe0, 0x0010);
        printf("lgr 7fe0, 0000 %s\n",s0.c_str());
        printf("lgr 7fe0, 0010 %s\n",s10.c_str());      
 

diff --git a/Testing/TestHash.cxx b/Testing/TestHash.cxx
index b02905f970bfe89b0c1bc38c73d533335fc407cc..af7ced2357c7191dde2cdcf6053dac0332139cad 100644 (file)
--- a/Testing/TestHash.cxx
+++ b/Testing/TestHash.cxx
@@ -5,7 +5,7 @@
 
 int main() {
 
-  typedef map<string, char*> dict;
+  typedef std::map<std::string, char*> dict;
   
   dict tb1;
   dict::iterator im = tb1.find("00380010");
@@ -14,20 +14,20 @@ int main() {
   tb1["50000010"] = "Number of points";
   tb1["00380010"] = "Admission ID";
 
-       cout << "Traversal of dictionary (note the proper ordering on key)." << endl;
+       std::cout << "Traversal of dictionary (note the proper ordering on key)." << std::endl;
        for ( dict::iterator im = tb1.begin(); im != tb1.end(); ++im )
-               cout << "   \"" << im->first << "\" = " << im->second << endl;
-       cout << "End of dictionary." << endl;
+               std::cout << "   \"" << im->first << "\" = " << im->second << std::endl;
+       std::cout << "End of dictionary." << std::endl;
 
-       cout << "Find request on key 00380010" << endl;
+       std::cout << "Find request on key 00380010" << std::endl;
        im = tb1.find("00380010");
-       cout << "   \"" << im->first << "\" = " << im->second << endl;
+       std::cout << "   \"" << im->first << "\" = " << im->second << std::endl;
        
        int i = 0x0010;
        std::cout.setf(std::ios::hex);
-       std::cout << i << endl;
+       std::cout << i << std::endl;
        std::cout.setf(std::ios::dec);
-       std::cout << i << endl; 
+       std::cout << i << std::endl;    
        
        // Voir :
        //http://www.developer.com/net/cplus/article.php/10919_2119781_3