ICU-511.25.tar.gz

[apple/icu.git] / icuSources / common / stringtriebuilder.cpp

diff --git a/icuSources/common/stringtriebuilder.cpp b/icuSources/common/stringtriebuilder.cpp
index e3e58eb6c4f7d79b0e05d08ab1d4c33d3ac4c859..109fcdc5f8a2553118a18ee059b0085002a61537 100644 (file)
--- a/icuSources/common/stringtriebuilder.cpp
+++ b/icuSources/common/stringtriebuilder.cpp
@@ -1,6 +1,6 @@
 /*
 *******************************************************************************
 /*
 *******************************************************************************

-*   Copyright (C) 2010-2011, International Business Machines
+*   Copyright (C) 2010-2012, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 *   file name:  stringtriebuilder.cpp
 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 *   file name:  stringtriebuilder.cpp


@@ -12,7 +12,7 @@
 *   created by: Markus W. Scherer
 */
 
 *   created by: Markus W. Scherer
 */
 

-#include <typeinfo>  // for 'typeid' to work
+#include "utypeinfo.h"  // for 'typeid' to work

 #include "unicode/utypes.h"
 #include "unicode/stringtriebuilder.h"
 #include "uassert.h"
 #include "unicode/utypes.h"
 #include "unicode/stringtriebuilder.h"
 #include "uassert.h"


@@ -381,8 +381,6 @@ StringTrieBuilder::equalNodes(const void *left, const void *right) {
     return *(const Node *)left==*(const Node *)right;
 }
 
     return *(const Node *)left==*(const Node *)right;
 }
 

-UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(StringTrieBuilder)
-

 UBool
 StringTrieBuilder::Node::operator==(const Node &other) const {
     return this==&other || (typeid(*this)==typeid(other) && hash==other.hash);
 UBool
 StringTrieBuilder::Node::operator==(const Node &other) const {
     return this==&other || (typeid(*this)==typeid(other) && hash==other.hash);


@@ -396,8 +394,6 @@ StringTrieBuilder::Node::markRightEdgesFirst(int32_t edgeNumber) {
     return edgeNumber;
 }
 
     return edgeNumber;
 }
 

-UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(StringTrieBuilder::Node)
-

 UBool
 StringTrieBuilder::FinalValueNode::operator==(const Node &other) const {
     if(this==&other) {
 UBool
 StringTrieBuilder::FinalValueNode::operator==(const Node &other) const {
     if(this==&other) {