diff options
| author | Frank Barchard <fbarchard@google.com> | 2020-04-23 12:09:40 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-23 20:09:36 +0000 |
| commit | 86e4cdd91ff6061558550a548525e0a3a0cec6a8 (patch) | |
| tree | b29c120f698c67fcaa58ed0caf14b6fe03bd86c3 /util/cpuid.c | |
| parent | 1cd417bda9db9477d20f5ab950048630bcf55a08 (diff) | |
| download | libyuv-86e4cdd91ff6061558550a548525e0a3a0cec6a8.tar.gz | |
CPUID util add namespace if compiled as C++ Add comment about namespace for C++ Remove unnecessary includes
Bug: libyuv:858
Change-Id: I71473aff572752460a2f77b2b2058f78410b54af
Tested: g++ -Iinclude/ -o cpuid util/cpuid.c source/cpu_id.cc
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/2163353
Reviewed-by: richard winterton <rrwinterton@gmail.com>
Reviewed-by: Frank Barchard <fbarchard@chromium.org>
Commit-Queue: Frank Barchard <fbarchard@chromium.org>
Diffstat (limited to 'util/cpuid.c')
| -rw-r--r-- | util/cpuid.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/util/cpuid.c b/util/cpuid.c index 84c06022..46f9c1bf 100644 --- a/util/cpuid.c +++ b/util/cpuid.c @@ -12,10 +12,11 @@ #include <stdlib.h> #include <string.h> -#define INCLUDE_LIBYUV_COMPARE_H_ -#include "libyuv.h" -#include "./psnr.h" -#include "./ssim.h" +#include "libyuv/cpu_id.h" + +#ifdef __cplusplus +using namespace libyuv; +#endif int main(int argc, const char* argv[]) { int cpu_flags = TestCpuFlag(-1); @@ -83,7 +84,7 @@ int main(int argc, const char* argv[]) { int has_avx2 = TestCpuFlag(kCpuHasAVX2); int has_erms = TestCpuFlag(kCpuHasERMS); int has_fma3 = TestCpuFlag(kCpuHasFMA3); - int has_f16c = TestCpuFlag(kCpuHasF16C); + int has_f16c = TestCpuFlag(kCpuHasF16C); int has_gfni = TestCpuFlag(kCpuHasGFNI); int has_avx512bw = TestCpuFlag(kCpuHasAVX512BW); int has_avx512vl = TestCpuFlag(kCpuHasAVX512VL); |