From 008e6311478adaac1111250e74e6f7a2388bfa7b Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Tue, 18 Apr 2017 15:05:55 -0700 Subject: [PATCH] AP_HAL_Linux: Util: fix overriden function signature While at it, add final and override to mark this as being the overriden final implementation of this method. Thanks to Phillip Khandeliants (@khandeliants) for reporting. --- libraries/AP_HAL_Linux/Util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/AP_HAL_Linux/Util.h b/libraries/AP_HAL_Linux/Util.h index de8c481599..11c8b98bd9 100644 --- a/libraries/AP_HAL_Linux/Util.h +++ b/libraries/AP_HAL_Linux/Util.h @@ -48,7 +48,7 @@ public: */ void set_system_clock(uint64_t time_utc_usec); const char* get_custom_log_directory() { return custom_log_directory; } - const char* get_custom_terrain_directory() { return custom_terrain_directory; } + const char* get_custom_terrain_directory() const override final { return custom_terrain_directory; } void set_custom_log_directory(const char *_custom_log_directory) { custom_log_directory = _custom_log_directory; } void set_custom_terrain_directory(const char *_custom_terrain_directory) { custom_terrain_directory = _custom_terrain_directory; }