summaryrefslogtreecommitdiffstats
path: root/libc/bionic/system_properties.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-05-09 19:12:08 -0700
committerElliott Hughes <enh@google.com>2014-05-09 19:12:08 -0700
commit8eac9af24ea7e570e0b297bcd6ac8a46ba3ecc39 (patch)
treed69e6b95bccca6e095b5e320198c552c9ee0e398 /libc/bionic/system_properties.cpp
parentb2c3c803f0f4a50acfdc31eb28bd83b48a0026fe (diff)
downloadbionic-8eac9af24ea7e570e0b297bcd6ac8a46ba3ecc39.zip
bionic-8eac9af24ea7e570e0b297bcd6ac8a46ba3ecc39.tar.gz
bionic-8eac9af24ea7e570e0b297bcd6ac8a46ba3ecc39.tar.bz2
Bring in google3-style DISALLOW_* macros.
I've been meaning to do this for a very long time... Change-Id: Ia8c16eee7c026c3c9505399948485fb778fb0152
Diffstat (limited to 'libc/bionic/system_properties.cpp')
-rw-r--r--libc/bionic/system_properties.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/libc/bionic/system_properties.cpp b/libc/bionic/system_properties.cpp
index 4e4684a..ec3d04b 100644
--- a/libc/bionic/system_properties.cpp
+++ b/libc/bionic/system_properties.cpp
@@ -54,6 +54,7 @@
#include <sys/atomics.h>
#include "private/bionic_atomic_inline.h"
+#include "private/bionic_macros.h"
#define ALIGN(x, a) (((x) + (a - 1)) & ~(a - 1))
@@ -100,9 +101,7 @@ struct prop_bt {
}
private:
- // Disallow copy and assign.
- prop_bt(const prop_bt&);
- prop_bt& operator=(const prop_bt&);
+ DISALLOW_COPY_AND_ASSIGN(prop_bt);
};
struct prop_area {
@@ -121,9 +120,7 @@ struct prop_area {
}
private:
- // Disallow copy and assign.
- prop_area(const prop_area&);
- prop_area& operator=(const prop_area&);
+ DISALLOW_COPY_AND_ASSIGN(prop_area);
};
struct prop_info {
@@ -141,9 +138,7 @@ struct prop_info {
ANDROID_MEMBAR_FULL();
}
private:
- // Disallow copy and assign.
- prop_info(const prop_info&);
- prop_info& operator=(const prop_info&);
+ DISALLOW_COPY_AND_ASSIGN(prop_info);
};
struct find_nth_cookie {