summaryrefslogtreecommitdiffstats
path: root/base/word_iterator.h
diff options
context:
space:
mode:
authoravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-11 21:26:52 +0000
committeravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-11 21:26:52 +0000
commitb1080093bca40696fae18292fbd40129412cb381 (patch)
tree51c1ab105688b2464e8bbe683d45be36a4db3479 /base/word_iterator.h
parent783f5be582cb485e42018d1ff948000eeac1bc2f (diff)
downloadchromium_src-b1080093bca40696fae18292fbd40129412cb381.zip
chromium_src-b1080093bca40696fae18292fbd40129412cb381.tar.gz
chromium_src-b1080093bca40696fae18292fbd40129412cb381.tar.bz2
Fixes word_iterator to actually compile. Next time, never just paste code in that _should_ fix things without actually compiling :(
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/word_iterator.h')
-rw-r--r--base/word_iterator.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/base/word_iterator.h b/base/word_iterator.h
index 8329f64..097290f 100644
--- a/base/word_iterator.h
+++ b/base/word_iterator.h
@@ -31,9 +31,11 @@
#define BASE_WORD_ITERATOR_H__
#include <string>
+#include <vector>
+
+#include "unicode/uchar.h"
#include "base/basictypes.h"
-#include "unicode/umachine.h" // Needed for U_WCHAR_IS_UTF16.
// The WordIterator class iterates through the words and word breaks
// in a string. (In the string " foo bar! ", the word breaks are at the
@@ -94,7 +96,7 @@ class WordIterator {
private:
// ICU iterator.
void* iter_;
-#ifndef U_WCHAR_IS_UTF16
+#if !defined(WCHAR_T_IS_UTF16)
std::vector<UChar> chars_;
#endif