summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2010-04-23 16:24:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-04-23 16:24:53 -0700
commitf6de594d028d78242d4e6434d7c103094b532dcc (patch)
tree8e30747c578e641755a2cf2e69799220bcaf2ff3 /include
parentbe223d94d90adf7ed9a316b8510199684575aa3b (diff)
parent0808cae1a2616ba9c708c7cc4489723b4060178e (diff)
downloadlibcore-f6de594d028d78242d4e6434d7c103094b532dcc.zip
libcore-f6de594d028d78242d4e6434d7c103094b532dcc.tar.gz
libcore-f6de594d028d78242d4e6434d7c103094b532dcc.tar.bz2
Merge "Dead code/cruft removal in the collation code." into dalvik-dev
Diffstat (limited to 'include')
-rw-r--r--include/ScopedUtfChars.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ScopedUtfChars.h b/include/ScopedUtfChars.h
index 8bc3e66..bfe9bb9 100644
--- a/include/ScopedUtfChars.h
+++ b/include/ScopedUtfChars.h
@@ -34,7 +34,7 @@ public:
}
}
- const char* data() const {
+ const char* c_str() const {
return mUtfChars;
}