ICU-368 conditionally use <iostream> (and the std namespace),

<iostream.h>, or no streams at all depending on the value of U_IOSTREAM_SOURCE.

X-SVN-Rev: 1252

icu4c/source/common/resbund.cpp

@@ -59,7 +59,6 @@
 #include "rbdata.h"
 #include "rbread.h"
 
-#include <iostream.h>
 #include <string.h>
 
 #include "cmemory.h"

icu4c/source/common/unistr.cpp

@@ -27,10 +27,15 @@
 #include "unicode/unistr.h"
 #include "uhash.h"
 
+#if U_IOSTREAM_SOURCE >= 199711
+#include <iostream>
+using namespace std;
+#elif U_IOSTREAM_SOURCE >= 198506
+#include <iostream.h>
+#endif
+
 #if 0
 //DEBUGGING
-#include <iostream.h>
-
 void
 print(const UnicodeString& s,
       const char *name)
@@ -1490,7 +1495,6 @@ UnicodeString::releaseDefaultConverter(UConverter *converter)
 // Streaming (to be removed)
 //========================================
 
-#include <iostream.h>
 #include "unistrm.h"
 #include "filestrm.h"
 
@@ -1620,6 +1624,8 @@ UnicodeStringStreamer::streamIn(UnicodeString *s,
 
 // console IO
 
+#if U_IOSTREAM_SOURCE
+
 ostream&
 operator<<(ostream& stream,
            const UnicodeString& s)
@@ -1651,3 +1657,5 @@ operator<<(ostream& stream,
   stream.flush();
   return stream;
 }
+
+#endif

icu4c/source/i18n/fmtable.cpp

@@ -296,7 +296,12 @@ Formattable::adoptArray(Formattable* array, int32_t count)
 //----------------------------------------------------
 #ifdef _DEBUG
 
+#if U_IOSTREAM_SOURCE >= 199711
+#include <iostream>
+using namespace std;
+#elif U_IOSTREAM_SOURCE >= 198506
 #include <iostream.h>
+#endif
 
 #include "unicode/datefmt.h"
 #include "unistrm.h"

icu4c/source/i18n/smpdtfmt.cpp

@@ -35,9 +35,6 @@
 #include "unicode/dcfmtsym.h"
 #include "mutex.h"
 #include <float.h>
-#ifdef _DEBUG
-#include <iostream.h>
-#endif
 
 // *****************************************************************************
 // class SimpleDateFormat

icu4c/source/tools/chardir/chardir.cpp

@@ -10,11 +10,18 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <iostream.h>
 #include <string.h>
 #include <assert.h>
 #include "cmemory.h"
 #include "ucmp8.h"
+
+#if U_IOSTREAM_SOURCE >= 199711
+#include <iostream>
+using namespace std;
+#elif U_IOSTREAM_SOURCE >= 198506
+#include <iostream.h>
+#endif
+
 CompactByteArray* charDirArray = 0;
 
 static const UChar LAST_CHAR_CODE_IN_FILE = 0xFFFD;

icu4c/source/tools/chartype/chartbld.cpp

@@ -10,7 +10,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <iostream.h>
 #include <string.h>
 #include <assert.h>
 
@@ -18,6 +17,13 @@
 #include "chartbld.h"
 #endif
 
+#if U_IOSTREAM_SOURCE >= 199711
+#include <iostream>
+using namespace std;
+#elif U_IOSTREAM_SOURCE >= 198506
+#include <iostream.h>
+#endif
+
 const char CharTypeBuilder::tagStrings[] = "MnMcMeNdNlNoZsZlZpCcCfCsCoCnLuLlLtLmLoPcPdPsPePoSmScSkSoPiPf";
 const int16_t CharTypeBuilder::tagValues[] =
 	{

icu4c/source/tools/genccode/genccode.c

@@ -50,7 +50,7 @@ static UOption options[]={
 };
 
 extern int
-main(int argc, char *argv[]) {
+main(int argc, const char *argv[]) {
     /* read command line options */
     argc=u_parseArgs(argc, argv, sizeof(options)/sizeof(options[0]), options);
 

icu4c/source/tools/toolutil/unewdata.c

@@ -218,3 +218,4 @@ udata_writeUString(UNewDataMemory *pData, const UChar *s, UTextOffset length) {
  * End:
  *
  */
+

icu4c/source/tools/ulxfrm/ulxfrm.cpp

@@ -10,11 +10,18 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <iostream.h>
 #include <string.h>
 #include <assert.h>
 
 #include "ucmp16.h"
+
+#if U_IOSTREAM_SOURCE >= 199711
+#include <iostream>
+using namespace std;
+#elif U_IOSTREAM_SOURCE >= 198506
+#include <iostream.h>
+#endif
+
 CompactShortArray* ulxfrmArray = 0;
 
 	enum	ECharTypeMapping {