From 057b253adba81430e51ce07951eda7dda03f7a08 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Thu, 19 Sep 2019 21:01:10 -0700
Subject: Use an anonymous namespace instead of static
---
alc/mixvoice.cpp | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
(limited to 'alc')
diff --git a/alc/mixvoice.cpp b/alc/mixvoice.cpp
index 34fe9275..1d18a3a5 100644
--- a/alc/mixvoice.cpp
+++ b/alc/mixvoice.cpp
@@ -76,10 +76,13 @@ Resampler ResamplerDefault = LinearResampler;
MixerFunc MixSamples = Mix_<CTag>;
RowMixerFunc MixRowSamples = MixRow_<CTag>;
-static HrtfMixerFunc MixHrtfSamples = MixHrtf_<CTag>;
-static HrtfMixerBlendFunc MixHrtfBlendSamples = MixHrtfBlend_<CTag>;
-static MixerFunc SelectMixer()
+namespace {
+
+HrtfMixerFunc MixHrtfSamples = MixHrtf_<CTag>;
+HrtfMixerBlendFunc MixHrtfBlendSamples = MixHrtfBlend_<CTag>;
+
+inline MixerFunc SelectMixer()
{
#ifdef HAVE_NEON
if((CPUCapFlags&CPU_CAP_NEON))
@@ -92,7 +95,7 @@ static MixerFunc SelectMixer()
return Mix_<CTag>;
}
-static RowMixerFunc SelectRowMixer()
+inline RowMixerFunc SelectRowMixer()
{
#ifdef HAVE_NEON
if((CPUCapFlags&CPU_CAP_NEON))
@@ -105,7 +108,7 @@ static RowMixerFunc SelectRowMixer()
return MixRow_<CTag>;
}
-static inline HrtfMixerFunc SelectHrtfMixer()
+inline HrtfMixerFunc SelectHrtfMixer()
{
#ifdef HAVE_NEON
if((CPUCapFlags&CPU_CAP_NEON))
@@ -118,7 +121,7 @@ static inline HrtfMixerFunc SelectHrtfMixer()
return MixHrtf_<CTag>;
}
-static inline HrtfMixerBlendFunc SelectHrtfBlendMixer()
+inline HrtfMixerBlendFunc SelectHrtfBlendMixer()
{
#ifdef HAVE_NEON
if((CPUCapFlags&CPU_CAP_NEON))
@@ -131,6 +134,9 @@ static inline HrtfMixerBlendFunc SelectHrtfBlendMixer()
return MixHrtfBlend_<CTag>;
}
+} // namespace
+
+
ResamplerFunc SelectResampler(Resampler resampler)
{
switch(resampler)
--
cgit v1.2.3