diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
| commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
| tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /libutils/include/utils/Vector.h | |
| parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
| parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) | |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'libutils/include/utils/Vector.h')
| -rw-r--r-- | libutils/include/utils/Vector.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libutils/include/utils/Vector.h b/libutils/include/utils/Vector.h index ddf71de24..be35ea2f0 100644 --- a/libutils/include/utils/Vector.h +++ b/libutils/include/utils/Vector.h @@ -23,15 +23,13 @@ #include <log/log.h> #include <utils/TypeHelpers.h> #include <utils/VectorImpl.h> - -/* - * Used to blacklist some functions from CFI. - * - */ #ifndef __has_attribute #define __has_attribute(x) 0 #endif +/* + * Used to exclude some functions from CFI. + */ #if __has_attribute(no_sanitize) #define UTILS_VECTOR_NO_CFI __attribute__((no_sanitize("cfi"))) #else |