diff options
| author | Chris Robinson <[email protected]> | 2018-11-24 16:58:49 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2018-11-24 16:58:49 -0800 |
| commit | 9e10f632c7a5d66b0f896753e197970eec3ab7cf (patch) | |
| tree | e8370fd4a8ebffa3fc110aaffe4aab218ac284ec /OpenAL32 | |
| parent | 16a60dc371254ba4936f4f5c13c32d060b9911ac (diff) | |
Replace remaining uses of std::vector with al::vector
Which uses a custom allocator that uses our allocation functions.
Diffstat (limited to 'OpenAL32')
| -rw-r--r-- | OpenAL32/Include/alMain.h | 2 | ||||
| -rw-r--r-- | OpenAL32/alBuffer.cpp | 2 | ||||
| -rw-r--r-- | OpenAL32/alEffect.cpp | 2 | ||||
| -rw-r--r-- | OpenAL32/alFilter.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 1a2f7d8d..21aa1e89 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -853,6 +853,6 @@ void StartEventThrd(ALCcontext *ctx); void StopEventThrd(ALCcontext *ctx); -std::vector<std::string> SearchDataFiles(const char *match, const char *subdir); +al::vector<std::string> SearchDataFiles(const char *match, const char *subdir); #endif diff --git a/OpenAL32/alBuffer.cpp b/OpenAL32/alBuffer.cpp index 0580b33a..5c40a27e 100644 --- a/OpenAL32/alBuffer.cpp +++ b/OpenAL32/alBuffer.cpp @@ -439,7 +439,7 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *buffers) /* Store the allocated buffer IDs in a separate local list, to avoid * modifying the user storage in case of failure. */ - std::vector<ALuint> ids; + al::vector<ALuint> ids; ids.reserve(n); do { ALbuffer *buffer = AllocBuffer(context.get()); diff --git a/OpenAL32/alEffect.cpp b/OpenAL32/alEffect.cpp index e25e2007..2bc60e24 100644 --- a/OpenAL32/alEffect.cpp +++ b/OpenAL32/alEffect.cpp @@ -312,7 +312,7 @@ AL_API ALvoid AL_APIENTRY alGenEffects(ALsizei n, ALuint *effects) /* Store the allocated buffer IDs in a separate local list, to avoid * modifying the user storage in case of failure. */ - std::vector<ALuint> ids; + al::vector<ALuint> ids; ids.reserve(n); do { ALeffect *effect = AllocEffect(context.get()); diff --git a/OpenAL32/alFilter.cpp b/OpenAL32/alFilter.cpp index bda03fae..5b15e7e0 100644 --- a/OpenAL32/alFilter.cpp +++ b/OpenAL32/alFilter.cpp @@ -373,7 +373,7 @@ AL_API ALvoid AL_APIENTRY alGenFilters(ALsizei n, ALuint *filters) /* Store the allocated buffer IDs in a separate local list, to avoid * modifying the user storage in case of failure. */ - std::vector<ALuint> ids; + al::vector<ALuint> ids; ids.reserve(n); do { ALfilter *filter = AllocFilter(context.get()); |