From 2278d96ad1906027133caf58f1f24926074daaa9 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Tue, 26 Jun 2001 17:59:14 +0000 Subject: [PATCH] ICU-1018 Move iostream usage from unistr.[h,cpp] to ustream.[h,cpp] X-SVN-Rev: 5089 --- icu4c/source/common/Makefile.in | 3 +- icu4c/source/common/unistrm.h | 38 ------------------------- icu4c/source/test/intltest/ustrtest.cpp | 1 + 3 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 icu4c/source/common/unistrm.h diff --git a/icu4c/source/common/Makefile.in b/icu4c/source/common/Makefile.in index 9ec01b37a72..49dbfa25d9c 100644 --- a/icu4c/source/common/Makefile.in +++ b/icu4c/source/common/Makefile.in @@ -74,7 +74,8 @@ mutex.o umutex.o putil.o udata.o uresbund.o uresdata.o rbdata.o resbund.o \ uchar.o ucmp8.o ucmp16.o ucmp32.o uvector.o uhash.o uhash_us.o \ unames.o unicode.o unistr.o ustring.o cstring.o utf_impl.o \ scsu.o ucnv.o ucnv_bld.o ucnv_cb.o ucnv_cnv.o ucnv_err.o ucnv_io.o convert.o \ -ucnvlat1.o ucnvmbcs.o ucnv_utf.o ucnv2022.o ucnvhz.o ucnv_lmb.o ucnvscsu.o +ucnvlat1.o ucnvmbcs.o ucnv_utf.o ucnv2022.o ucnvhz.o ucnv_lmb.o ucnvscsu.o \ +ustream.o STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O)) diff --git a/icu4c/source/common/unistrm.h b/icu4c/source/common/unistrm.h deleted file mode 100644 index 6d6a6992328..00000000000 --- a/icu4c/source/common/unistrm.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -********************************************************************** -* Copyright (C) 1997-2001, International Business Machines -* Corporation and others. All Rights Reserved. -********************************************************************** -* FILE NAME : unistrm.h -* -* Modification History: -* -* Date Name Description -* 02/05/97 aliu Added UnicodeString streamIn and streamOut methods. -* 03/26/97 aliu Added indexOf(UChar,). -* 04/24/97 aliu Numerous changes per code review. -* 05/06/97 helena Added isBogus(). -****************************************************************************** -*/ -#ifndef UNISTRM_H -#define UNISTRM_H - -#include "filestrm.h" -#include "umemstrm.h" -#include "unicode/unistr.h" - - -class U_COMMON_API UnicodeStringStreamer -{ -public: - static void streamIn(UnicodeString* string, FileStream* is); - static void streamOut(const UnicodeString* string, FileStream* os); - static void streamIn(UnicodeString* string, UMemoryStream* is); - static void streamOut(const UnicodeString* string, UMemoryStream* os); -}; - - -#endif - - - diff --git a/icu4c/source/test/intltest/ustrtest.cpp b/icu4c/source/test/intltest/ustrtest.cpp index 7cebd21037f..b31527552e9 100644 --- a/icu4c/source/test/intltest/ustrtest.cpp +++ b/icu4c/source/test/intltest/ustrtest.cpp @@ -8,6 +8,7 @@ #include "unicode/unistr.h" #include "unicode/unicode.h" #include "unicode/locid.h" +#include "unicode/ustream.h" #if U_IOSTREAM_SOURCE >= 199711 #include