From f97517fa5d3facd37a2a8e1b35a10ef2286f7770 Mon Sep 17 00:00:00 2001 From: malaterre Date: Thu, 11 Sep 2003 11:01:45 +0000 Subject: [PATCH] * cygwin complains about missing std:: in subdir Test/ --- ChangeLog | 2 ++ Testing/TestChangeHeader.cxx | 8 ++++---- Testing/TestHash.cxx | 16 ++++++++-------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9f0b95e..4993c111 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +2003-09-11 Mathieu Malaterre + * cygwin complains about missing std:: in subdir Test/ 2003-09-10 Mathieu Malaterre * remove some methods that are now in gdcmHeaderHelper 2003-09-10 Mathieu Malaterre diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx index 7f1d360b..35d58950 100644 --- 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 b02905f9..af7ced23 100644 --- a/Testing/TestHash.cxx +++ b/Testing/TestHash.cxx @@ -5,7 +5,7 @@ int main() { - typedef map dict; + typedef std::map 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 -- 2.45.1