From 461b16b1be91748dd873cb2330891b7ab6c57046 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 29 Oct 2017 21:16:01 +0100 Subject: [PATCH] CLCD: fix possible compile error error: declaration of 'power' shadows a global declaration [-Werror=shadow] Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7490497b4e0ab34305d611a6ede698058363fddf Author: Thilo Graf Date: 2017-10-29 (Sun, 29 Oct 2017) ------------------ This commit was generated by Migit --- src/driver/lcdd.h | 2 +- src/driver/simple_display.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/driver/lcdd.h b/src/driver/lcdd.h index 3b2539319..86254cee7 100644 --- a/src/driver/lcdd.h +++ b/src/driver/lcdd.h @@ -219,7 +219,7 @@ class CLCD int brightness; unsigned int timeout_cnt; unsigned int switch_name_time_cnt; - void setlcdparameter(int dimm, int power); + void setlcdparameter(int dimm, int _power); void count_down(); #endif diff --git a/src/driver/simple_display.cpp b/src/driver/simple_display.cpp index 7191f5d0f..ca32519ce 100644 --- a/src/driver/simple_display.cpp +++ b/src/driver/simple_display.cpp @@ -692,14 +692,14 @@ void CLCD::count_down() { } } -void CLCD::setlcdparameter(int dimm, const int power) +void CLCD::setlcdparameter(int dimm, const int _power) { if(dimm < 0) dimm = 0; else if(dimm > 15) dimm = 15; - if(!power) + if(!_power) dimm = 0; if(brightness == dimm)