diff options
| author | Ian Rogers <irogers@google.com> | 2014-11-04 23:59:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-04 23:59:30 +0000 |
| commit | e411af9e493e6fcb246fa64e1017a7396e00b735 (patch) | |
| tree | 88fc915060dab4ad1e118fdf4d56f576671629a8 | |
| parent | 390d972a2a09b9cf03024d91a53e224f91a88e6d (diff) | |
| parent | ef4d1341e70d2683d5d9f2a8892535ae90eb184c (diff) | |
| download | libcore-e411af9e493e6fcb246fa64e1017a7396e00b735.zip libcore-e411af9e493e6fcb246fa64e1017a7396e00b735.tar.gz libcore-e411af9e493e6fcb246fa64e1017a7396e00b735.tar.bz2 | |
am ef4d1341: Merge "Don\'t define DISALLOW_COPY_AND_ASSIGN."
* commit 'ef4d1341e70d2683d5d9f2a8892535ae90eb184c':
Don't define DISALLOW_COPY_AND_ASSIGN.
| -rw-r--r-- | luni/src/main/native/libcore_icu_ICU.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/luni/src/main/native/libcore_icu_ICU.cpp b/luni/src/main/native/libcore_icu_ICU.cpp index d27b11d..7b92b1d 100644 --- a/luni/src/main/native/libcore_icu_ICU.cpp +++ b/luni/src/main/native/libcore_icu_ICU.cpp @@ -64,13 +64,6 @@ #include <unistd.h> #include <vector> -// TODO: put this in a header file and use it everywhere! -// DISALLOW_COPY_AND_ASSIGN disallows the copy and operator= functions. -// It goes in the private: declarations in a class. -#define DISALLOW_COPY_AND_ASSIGN(TypeName) \ - TypeName(const TypeName&); \ - void operator=(const TypeName&) - class ScopedResourceBundle { public: ScopedResourceBundle(UResourceBundle* bundle) : bundle_(bundle) { |