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/Debug.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/Debug.h')
| -rw-r--r-- | libutils/include/utils/Debug.h | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/libutils/include/utils/Debug.h b/libutils/include/utils/Debug.h index 96bd70eb0..c3b902617 100644 --- a/libutils/include/utils/Debug.h +++ b/libutils/include/utils/Debug.h @@ -14,27 +14,9 @@ * limitations under the License. */ -#ifndef ANDROID_UTILS_DEBUG_H -#define ANDROID_UTILS_DEBUG_H +#pragma once -#include <stdint.h> -#include <sys/types.h> +// Note: new code should use static_assert directly. -namespace android { -// --------------------------------------------------------------------------- - -#ifdef __cplusplus -template<bool> struct CompileTimeAssert; -template<> struct CompileTimeAssert<true> {}; -#define COMPILE_TIME_ASSERT(_exp) \ - template class CompileTimeAssert< (_exp) >; -#endif - -// DO NOT USE: Please use static_assert instead -#define COMPILE_TIME_ASSERT_FUNCTION_SCOPE(_exp) \ - CompileTimeAssert<( _exp )>(); - -// --------------------------------------------------------------------------- -} // namespace android - -#endif // ANDROID_UTILS_DEBUG_H +#define COMPILE_TIME_ASSERT static_assert +#define COMPILE_TIME_ASSERT_FUNCTION_SCOPE static_assert |