diff options
| author | Chris Robinson <[email protected]> | 2019-01-23 15:09:11 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2019-01-23 15:09:11 -0800 |
| commit | ebb46cf4cf42a551e8240bb07e4feaf0c10ea1ca (patch) | |
| tree | cb544775f647ebf9fb5ab935a20f6be15fd68a34 | |
| parent | 1ec86864078833ceab4e44f4c9c8ceeefa6503b7 (diff) | |
Rename a header
To workaround an apparent MSVC error
| -rw-r--r-- | Alc/mixer/hrtfbase.h (renamed from Alc/mixer/hrtf.h) | 6 | ||||
| -rw-r--r-- | Alc/mixer/mixer_c.cpp | 2 | ||||
| -rw-r--r-- | Alc/mixer/mixer_neon.cpp | 2 | ||||
| -rw-r--r-- | Alc/mixer/mixer_sse.cpp | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/Alc/mixer/hrtf.h b/Alc/mixer/hrtfbase.h index 9ae1b20d..facb577f 100644 --- a/Alc/mixer/hrtf.h +++ b/Alc/mixer/hrtfbase.h @@ -1,5 +1,5 @@ -#ifndef MIXER_HRTF_H -#define MIXER_HRTF_H +#ifndef MIXER_HRTFBASE_H +#define MIXER_HRTFBASE_H #include "alu.h" #include "../hrtf.h" @@ -192,4 +192,4 @@ inline void MixDirectHrtfBase(ALfloat *RESTRICT LeftOut, ALfloat *RESTRICT Right } } -#endif /* MIXER_HRTF_H */ +#endif /* MIXER_HRTFBASE_H */ diff --git a/Alc/mixer/mixer_c.cpp b/Alc/mixer/mixer_c.cpp index 26358e73..4ca7c84d 100644 --- a/Alc/mixer/mixer_c.cpp +++ b/Alc/mixer/mixer_c.cpp @@ -9,7 +9,7 @@ #include "alSource.h" #include "alAuxEffectSlot.h" #include "defs.h" -#include "hrtf.h" +#include "hrtfbase.h" static inline ALfloat do_point(const InterpState&, const ALfloat *RESTRICT vals, const ALsizei) noexcept diff --git a/Alc/mixer/mixer_neon.cpp b/Alc/mixer/mixer_neon.cpp index a60f054d..649ff8d3 100644 --- a/Alc/mixer/mixer_neon.cpp +++ b/Alc/mixer/mixer_neon.cpp @@ -10,7 +10,7 @@ #include "alu.h" #include "hrtf.h" #include "defs.h" -#include "hrtf.h" +#include "hrtfbase.h" diff --git a/Alc/mixer/mixer_sse.cpp b/Alc/mixer/mixer_sse.cpp index 093dbda8..8d5660ed 100644 --- a/Alc/mixer/mixer_sse.cpp +++ b/Alc/mixer/mixer_sse.cpp @@ -12,7 +12,7 @@ #include "alSource.h" #include "alAuxEffectSlot.h" #include "defs.h" -#include "hrtf.h" +#include "hrtfbase.h" template<> diff --git a/CMakeLists.txt b/CMakeLists.txt index b7a6add0..bc61cc9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -776,7 +776,7 @@ SET(ALC_OBJS Alc/panning.cpp Alc/mixvoice.cpp Alc/mixer/defs.h - Alc/mixer/hrtf.h + Alc/mixer/hrtfbase.h Alc/mixer/mixer_c.cpp ) |