diff options
| author | Patrick Scott <phanna@android.com> | 2010-10-01 11:39:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-01 11:39:15 -0700 |
| commit | 861ae25ee467b1c61efac79b19f3f072b2380669 (patch) | |
| tree | 9c16dadf1f8b024c1613cf10fb4e8b6d8826e7b7 /base | |
| parent | 3f7126408d27e1125110468d0fbdf0eeb446fefe (diff) | |
| parent | 49139a52abc21019da7fcbafdef393ad960ea0e2 (diff) | |
| download | external_chromium-861ae25ee467b1c61efac79b19f3f072b2380669.zip external_chromium-861ae25ee467b1c61efac79b19f3f072b2380669.tar.gz external_chromium-861ae25ee467b1c61efac79b19f3f072b2380669.tar.bz2 | |
Merge "Build fixes for the simulator."
Diffstat (limited to 'base')
| -rw-r--r-- | base/file_path.h | 2 | ||||
| -rw-r--r-- | base/file_util_android.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/base/file_path.h b/base/file_path.h index e14655c..6887cdc 100644 --- a/base/file_path.h +++ b/base/file_path.h @@ -367,7 +367,7 @@ class FilePath { // Provide a hash function so that hash_sets and maps can contain FilePath // objects. #if defined(COMPILER_GCC) -namespace std { +namespace __gnu_cxx { template<> struct hash<FilePath> { diff --git a/base/file_util_android.cc b/base/file_util_android.cc index 59fb2de..e101e34 100644 --- a/base/file_util_android.cc +++ b/base/file_util_android.cc @@ -49,8 +49,10 @@ _mktemp(char *path) return(_gettemp(path, (int *)NULL, 0, 0) ? path : (char *)NULL); } +#ifdef __BIONIC__ __warn_references(mktemp, "warning: mktemp() possibly used unsafely; consider using mkstemp()"); +#endif char * mktemp(char *path) |