commit 573b2b325140470d4ce0721bb3203fb722c3dd6f
author Treehugger Robot <treehugger-gerrit@google.com> Sat Nov 10 01:11:38 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 10 01:11:38 2018 +0000
tree e4f52089b72f321689d2041e63d3d7464816828d
parent 899de9664941820eaae3f23555f8b3b506a6087f
parent 6dfd058c4be1a9140281363db77349c99d43dffa

Merge "C++17 compatibility."

Android.mk

diff --git a/Android.mk b/Android.mk
index 1ca997d..214ddcf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -70,7 +70,6 @@
        -Wall -Werror \
        -Wno-implicit-fallthrough \
        -Wno-sizeof-pointer-memaccess \
-       -Wno-deprecated-register \
        -Wno-sign-compare \
        -Wno-parentheses-equality \
        -Wno-unused-variable

cv/src/mycvHaarDetectObjects.cpp

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 @@
 	 *	whether (op - res - one) underflowed.
 	 */
 	
-	register int op, res, one;
+	int op, res, one;
 	
 	op = x;
 	res = 0;