Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Adam <dev@robert-adam.de>2021-03-04 13:32:06 +0300
committerRobert Adam <dev@robert-adam.de>2021-03-06 20:57:22 +0300
commit725569f6c2f6c4360783701ed5d4036a968d7d89 (patch)
tree7316ce5d1d37311fcc46f7b1e23befb16d270de5 /src/mumble/OverlayConfig.cpp
parent6e42e2b5015de31c9bc8be1c82c5e89c847f36da (diff)
REFAC(client): Avoid name clash for "registrar"
When performing a unity build the usage of the variable name "registrar" in a bunch of places for a static variable, can cause name clashes. Thus the different variables where renamed.
Diffstat (limited to 'src/mumble/OverlayConfig.cpp')
-rw-r--r--src/mumble/OverlayConfig.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mumble/OverlayConfig.cpp b/src/mumble/OverlayConfig.cpp
index 13f9b1dab..b3e7c59cc 100644
--- a/src/mumble/OverlayConfig.cpp
+++ b/src/mumble/OverlayConfig.cpp
@@ -45,7 +45,7 @@ static ConfigWidget *OverlayConfigDialogNew(Settings &st) {
return new OverlayConfig(st);
}
-static ConfigRegistrar registrar(6000, OverlayConfigDialogNew);
+static ConfigRegistrar registrarOverlayConfig(6000, OverlayConfigDialogNew);
#endif
void OverlayConfig::initDisplayFps() {