diff options
| author | Elliott Hughes <enh@google.com> | 2018-11-09 16:05:18 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2018-11-09 16:05:18 -0800 |
| commit | 6dfd058c4be1a9140281363db77349c99d43dffa (patch) | |
| tree | e4f52089b72f321689d2041e63d3d7464816828d | |
| parent | 899de9664941820eaae3f23555f8b3b506a6087f (diff) | |
| download | opencv-6dfd058c4be1a9140281363db77349c99d43dffa.tar.gz | |
C++17 compatibility.
The `register` storage specifier has been removed.
This code has been removed in internal master, so just patch the AOSP
copy locally for now.
Bug: http://b/111067277
Test: builds
Change-Id: I3d9405402d0e156a244833fe50e0ff92a96e6717
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | cv/src/mycvHaarDetectObjects.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -70,7 +70,6 @@ LOCAL_CFLAGS += \ -Wall -Werror \ -Wno-implicit-fallthrough \ -Wno-sizeof-pointer-memaccess \ - -Wno-deprecated-register \ -Wno-sign-compare \ -Wno-parentheses-equality \ -Wno-unused-variable diff --git a/cv/src/mycvHaarDetectObjects.cpp b/cv/src/mycvHaarDetectObjects.cpp index 739ef7a..12d111c 100644 --- a/cv/src/mycvHaarDetectObjects.cpp +++ b/cv/src/mycvHaarDetectObjects.cpp @@ -432,7 +432,7 @@ isqrt(int x) * whether (op - res - one) underflowed. */ - register int op, res, one; + int op, res, one; op = x; res = 0; |