diff --git a/icu4c/source/i18n/casetrn.cpp b/icu4c/source/i18n/casetrn.cpp
index b8d7f7074f7..96778af6522 100644
--- a/icu4c/source/i18n/casetrn.cpp
+++ b/icu4c/source/i18n/casetrn.cpp
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2001-2006, International Business Machines
+* Copyright (C) 2001-2007, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -116,12 +116,12 @@ CaseMapTransliterator::CaseMapTransliterator(const CaseMapTransliterator& o) :
/**
* Assignment operator.
*/
-CaseMapTransliterator& CaseMapTransliterator::operator=(const CaseMapTransliterator& o) {
+/*CaseMapTransliterator& CaseMapTransliterator::operator=(const CaseMapTransliterator& o) {
Transliterator::operator=(o);
fCsp = o.fCsp;
fMap = o.fMap;
return *this;
-}
+}*/
/**
* Transliterator API.
diff --git a/icu4c/source/i18n/casetrn.h b/icu4c/source/i18n/casetrn.h
index 747fa1b554e..a5e123f3637 100644
--- a/icu4c/source/i18n/casetrn.h
+++ b/icu4c/source/i18n/casetrn.h
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2001-2005, International Business Machines
+* Copyright (C) 2001-2007, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -62,11 +62,6 @@ public:
*/
CaseMapTransliterator(const CaseMapTransliterator&);
- /**
- * Assignment operator.
- */
- CaseMapTransliterator& operator=(const CaseMapTransliterator&);
-
/**
* Transliterator API.
* @return a copy of the object.
@@ -99,6 +94,13 @@ protected:
const UCaseProps *fCsp;
UCaseMapFull *fMap;
+
+private:
+ /**
+ * Assignment operator.
+ */
+ CaseMapTransliterator& operator=(const CaseMapTransliterator&);
+
};
U_NAMESPACE_END
diff --git a/icu4c/source/i18n/cpdtrans.h b/icu4c/source/i18n/cpdtrans.h
index e4688fead5a..f28e4637f40 100644
--- a/icu4c/source/i18n/cpdtrans.h
+++ b/icu4c/source/i18n/cpdtrans.h
@@ -99,12 +99,6 @@ public:
*/
CompoundTransliterator(const CompoundTransliterator&);
- /**
- * Assignment operator.
- * @internal Use transliterator factory methods instead since this class will be removed in that release.
- */
- CompoundTransliterator& operator=(const CompoundTransliterator&);
-
/**
* Transliterator API.
* @internal Use transliterator factory methods instead since this class will be removed in that release.
@@ -199,6 +193,12 @@ private:
friend class Transliterator;
friend class TransliteratorAlias; // to access private ct
+ /**
+ * Assignment operator.
+ * @internal Use transliterator factory methods instead since this class will be removed in that release.
+ */
+ CompoundTransliterator& operator=(const CompoundTransliterator&);
+
/**
* Private constructor for Transliterator.
*/
diff --git a/icu4c/source/i18n/i18n.vcproj b/icu4c/source/i18n/i18n.vcproj
index d5d7b45c2c3..551c7aebc04 100644
--- a/icu4c/source/i18n/i18n.vcproj
+++ b/icu4c/source/i18n/i18n.vcproj
@@ -45,6 +45,7 @@
/>
-
-
-
-
@@ -1061,6 +1055,14 @@
RelativePath=".\olsontz.h"
>
+
+
+
+
diff --git a/icu4c/source/i18n/name2uni.cpp b/icu4c/source/i18n/name2uni.cpp
index ba067c792ec..c59abc54d88 100644
--- a/icu4c/source/i18n/name2uni.cpp
+++ b/icu4c/source/i18n/name2uni.cpp
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 2001-2006, International Business Machines
+* Copyright (C) 2001-2007, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@@ -85,12 +85,12 @@ NameUnicodeTransliterator::NameUnicodeTransliterator(const NameUnicodeTransliter
/**
* Assignment operator.
*/
-NameUnicodeTransliterator& NameUnicodeTransliterator::operator=(
+/*NameUnicodeTransliterator& NameUnicodeTransliterator::operator=(
const NameUnicodeTransliterator& o) {
Transliterator::operator=(o);
// not necessary: the legal sets should all be the same -- legal=o.legal;
return *this;
-}
+}*/
/**
* Transliterator API.
diff --git a/icu4c/source/i18n/name2uni.h b/icu4c/source/i18n/name2uni.h
index d53ba24b8cc..1324ec3e8d2 100644
--- a/icu4c/source/i18n/name2uni.h
+++ b/icu4c/source/i18n/name2uni.h
@@ -43,11 +43,6 @@ public:
*/
NameUnicodeTransliterator(const NameUnicodeTransliterator&);
- /**
- * Assignment operator.
- */
- NameUnicodeTransliterator& operator=(const NameUnicodeTransliterator&);
-
/**
* Transliterator API.
* @return A copy of the object.
@@ -82,6 +77,11 @@ public:
* Set of characters which occur in Unicode character names.
*/
UnicodeSet legal;
+private:
+ /**
+ * Assignment operator.
+ */
+ NameUnicodeTransliterator& operator=(const NameUnicodeTransliterator&);
};
U_NAMESPACE_END
diff --git a/icu4c/source/i18n/nortrans.cpp b/icu4c/source/i18n/nortrans.cpp
index aec4ddf88a2..f967f7dae5d 100644
--- a/icu4c/source/i18n/nortrans.cpp
+++ b/icu4c/source/i18n/nortrans.cpp
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 2001-2006, International Business Machines
+* Copyright (C) 2001-2007, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@@ -82,12 +82,12 @@ Transliterator(o) {
/**
* Assignment operator.
*/
-NormalizationTransliterator& NormalizationTransliterator::operator=(const NormalizationTransliterator& o) {
+/*NormalizationTransliterator& NormalizationTransliterator::operator=(const NormalizationTransliterator& o) {
Transliterator::operator=(o);
fMode = o.fMode;
options = o.options;
return *this;
-}
+}*/
/**
* Transliterator API.
diff --git a/icu4c/source/i18n/nortrans.h b/icu4c/source/i18n/nortrans.h
index 3dccc5eecea..96bc7f00429 100644
--- a/icu4c/source/i18n/nortrans.h
+++ b/icu4c/source/i18n/nortrans.h
@@ -47,11 +47,6 @@ class NormalizationTransliterator : public Transliterator {
*/
NormalizationTransliterator(const NormalizationTransliterator&);
- /**
- * Assignment operator.
- */
- NormalizationTransliterator& operator=(const NormalizationTransliterator&);
-
/**
* Transliterator API.
* @return A copy of the object.
@@ -100,6 +95,12 @@ class NormalizationTransliterator : public Transliterator {
*/
NormalizationTransliterator(const UnicodeString& id,
UNormalizationMode mode, int32_t opt);
+
+private:
+ /**
+ * Assignment operator.
+ */
+ NormalizationTransliterator& operator=(const NormalizationTransliterator&);
};
U_NAMESPACE_END
diff --git a/icu4c/source/i18n/titletrn.cpp b/icu4c/source/i18n/titletrn.cpp
index e85087179dc..76c17d1bad7 100644
--- a/icu4c/source/i18n/titletrn.cpp
+++ b/icu4c/source/i18n/titletrn.cpp
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 2001-2005, International Business Machines
+* Copyright (C) 2001-2007, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@@ -48,11 +48,11 @@ TitlecaseTransliterator::TitlecaseTransliterator(const TitlecaseTransliterator&
/**
* Assignment operator.
*/
-TitlecaseTransliterator& TitlecaseTransliterator::operator=(
+/*TitlecaseTransliterator& TitlecaseTransliterator::operator=(
const TitlecaseTransliterator& o) {
CaseMapTransliterator::operator=(o);
return *this;
-}
+}*/
/**
* Transliterator API.
diff --git a/icu4c/source/i18n/titletrn.h b/icu4c/source/i18n/titletrn.h
index 376e0efb611..a093152b66c 100644
--- a/icu4c/source/i18n/titletrn.h
+++ b/icu4c/source/i18n/titletrn.h
@@ -46,11 +46,6 @@ class TitlecaseTransliterator : public CaseMapTransliterator {
*/
TitlecaseTransliterator(const TitlecaseTransliterator&);
- /**
- * Assignment operator.
- */
- TitlecaseTransliterator& operator=(const TitlecaseTransliterator&);
-
/**
* Transliterator API.
* @return a copy of the object.
@@ -67,7 +62,7 @@ class TitlecaseTransliterator : public CaseMapTransliterator {
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
- protected:
+protected:
/**
* Implements {@link Transliterator#handleTransliterate}.
@@ -80,6 +75,12 @@ class TitlecaseTransliterator : public CaseMapTransliterator {
*/
virtual void handleTransliterate(Replaceable& text, UTransPosition& offset,
UBool isIncremental) const;
+
+private:
+ /**
+ * Assignment operator.
+ */
+ TitlecaseTransliterator& operator=(const TitlecaseTransliterator&);
};
U_NAMESPACE_END
diff --git a/icu4c/source/i18n/tolowtrn.cpp b/icu4c/source/i18n/tolowtrn.cpp
index 267ce406d35..c93f4d0eff8 100644
--- a/icu4c/source/i18n/tolowtrn.cpp
+++ b/icu4c/source/i18n/tolowtrn.cpp
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 2001-2004, International Business Machines
+* Copyright (C) 2001-2007, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@@ -47,11 +47,11 @@ LowercaseTransliterator::LowercaseTransliterator(const LowercaseTransliterator&
/**
* Assignment operator.
*/
-LowercaseTransliterator& LowercaseTransliterator::operator=(
+/*LowercaseTransliterator& LowercaseTransliterator::operator=(
const LowercaseTransliterator& o) {
CaseMapTransliterator::operator=(o);
return *this;
-}
+}*/
/**
* Transliterator API.
diff --git a/icu4c/source/i18n/tolowtrn.h b/icu4c/source/i18n/tolowtrn.h
index 1d8374aafed..564b215a728 100644
--- a/icu4c/source/i18n/tolowtrn.h
+++ b/icu4c/source/i18n/tolowtrn.h
@@ -44,11 +44,6 @@ class LowercaseTransliterator : public CaseMapTransliterator {
*/
LowercaseTransliterator(const LowercaseTransliterator&);
- /**
- * Assignment operator.
- */
- LowercaseTransliterator& operator=(const LowercaseTransliterator&);
-
/**
* Transliterator API.
* @return a copy of the object.
@@ -64,6 +59,12 @@ class LowercaseTransliterator : public CaseMapTransliterator {
* ICU "poor man's RTTI", returns a UClassID for this class.
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
+private:
+
+ /**
+ * Assignment operator.
+ */
+ LowercaseTransliterator& operator=(const LowercaseTransliterator&);
};
U_NAMESPACE_END
diff --git a/icu4c/source/i18n/toupptrn.cpp b/icu4c/source/i18n/toupptrn.cpp
index 0678c36073c..4b7c7d06aca 100644
--- a/icu4c/source/i18n/toupptrn.cpp
+++ b/icu4c/source/i18n/toupptrn.cpp
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 2001-2004, International Business Machines
+* Copyright (C) 2001-2007, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@@ -47,11 +47,11 @@ UppercaseTransliterator::UppercaseTransliterator(const UppercaseTransliterator&
/**
* Assignment operator.
*/
-UppercaseTransliterator& UppercaseTransliterator::operator=(
+/*UppercaseTransliterator& UppercaseTransliterator::operator=(
const UppercaseTransliterator& o) {
CaseMapTransliterator::operator=(o);
return *this;
-}
+}*/
/**
* Transliterator API.
diff --git a/icu4c/source/i18n/toupptrn.h b/icu4c/source/i18n/toupptrn.h
index e1ff991efa7..77799acbfd6 100644
--- a/icu4c/source/i18n/toupptrn.h
+++ b/icu4c/source/i18n/toupptrn.h
@@ -44,11 +44,6 @@ class UppercaseTransliterator : public CaseMapTransliterator {
*/
UppercaseTransliterator(const UppercaseTransliterator&);
- /**
- * Assignment operator.
- */
- UppercaseTransliterator& operator=(const UppercaseTransliterator&);
-
/**
* Transliterator API.
* @return a copy of the object.
@@ -64,6 +59,12 @@ class UppercaseTransliterator : public CaseMapTransliterator {
* ICU "poor man's RTTI", returns a UClassID for this class.
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
+
+private:
+ /**
+ * Assignment operator.
+ */
+ UppercaseTransliterator& operator=(const UppercaseTransliterator&);
};
U_NAMESPACE_END
diff --git a/icu4c/source/i18n/uni2name.cpp b/icu4c/source/i18n/uni2name.cpp
index dcc49d758ff..5eba79daceb 100644
--- a/icu4c/source/i18n/uni2name.cpp
+++ b/icu4c/source/i18n/uni2name.cpp
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 2001-2004, International Business Machines
+* Copyright (C) 2001-2007, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@@ -48,11 +48,11 @@ UnicodeNameTransliterator::UnicodeNameTransliterator(const UnicodeNameTransliter
/**
* Assignment operator.
*/
-UnicodeNameTransliterator& UnicodeNameTransliterator::operator=(
+/*UnicodeNameTransliterator& UnicodeNameTransliterator::operator=(
const UnicodeNameTransliterator& o) {
Transliterator::operator=(o);
return *this;
-}
+}*/
/**
* Transliterator API.
diff --git a/icu4c/source/i18n/uni2name.h b/icu4c/source/i18n/uni2name.h
index a145d64c102..aede864564a 100644
--- a/icu4c/source/i18n/uni2name.h
+++ b/icu4c/source/i18n/uni2name.h
@@ -43,11 +43,6 @@ class UnicodeNameTransliterator : public Transliterator {
*/
UnicodeNameTransliterator(const UnicodeNameTransliterator&);
- /**
- * Assignment operator.
- */
- UnicodeNameTransliterator& operator=(const UnicodeNameTransliterator&);
-
/**
* Transliterator API.
*/
@@ -77,6 +72,12 @@ class UnicodeNameTransliterator : public Transliterator {
virtual void handleTransliterate(Replaceable& text, UTransPosition& offset,
UBool isIncremental) const;
+private:
+ /**
+ * Assignment operator.
+ */
+ UnicodeNameTransliterator& operator=(const UnicodeNameTransliterator&);
+
};
U_NAMESPACE_END