From 499187cf80e59a56f590cc10230c9470d9b6eab0 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Fri, 22 Apr 2022 11:24:12 +0200
Subject: [PATCH] DDEve: fix 's' shadow warning
---
DDEve/include/DDEve/PopupMenu.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/DDEve/include/DDEve/PopupMenu.h b/DDEve/include/DDEve/PopupMenu.h
index af1e8a189..a7aa33522 100644
--- a/DDEve/include/DDEve/PopupMenu.h
+++ b/DDEve/include/DDEve/PopupMenu.h
@@ -58,9 +58,9 @@ namespace dd4hep {
/// Add a menu separator to the menu.
virtual void AddSeparator(TGMenuEntry* before = 0);
/// Add a menu label to the menu.
- virtual void AddLabel(const char* s, const TGPicture* p = 0, TGMenuEntry* before = 0);
+ virtual void AddLabel(const char* label, const TGPicture* p = 0, TGMenuEntry* before = 0);
/// Add a (cascading) popup menu to a popup menu.
- virtual void AddPopup(const char* s, TGPopupMenu* popup, TGMenuEntry* before = 0, const TGPicture* p = 0);
+ virtual void AddPopup(const char* name, TGPopupMenu* popup, TGMenuEntry* before = 0, const TGPicture* p = 0);
/// Add a new popup menu entry with a callback
virtual int AddEntry(const char* name, Callback cb, void* ud=0, const TGPicture* p=0, TGMenuEntry* before=0);
/// Add a new popup menu entry with a callback
--
GitLab