mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fix compilation with libc++

Browse source
This commit is contained in:
Thomas Goyne 2012-12-28 09:24:51 -08:00
parent b0cbc049ec
commit 43d3fac178
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
aegisub/build/standard-settings.props
View file

@ -23,6 +23,7 @@
$(BoostPath); $(BoostPath);
%(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories> </AdditionalIncludeDirectories>
<DisableSpecificWarnings>4345</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<AdditionalIncludeDirectories>$(AegisubSourceBase)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(AegisubSourceBase)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

5
aegisub/src/audio_provider_ram.h
View file

@ -34,6 +34,7 @@
#include "include/aegisub/audio_provider.h" #include "include/aegisub/audio_provider.h"
#include <array>
#include <boost/container/stable_vector.hpp> #include <boost/container/stable_vector.hpp>
namespace agi { namespace agi {
@ -42,7 +43,11 @@ namespace agi {
} }
class RAMAudioProvider : public AudioProvider { class RAMAudioProvider : public AudioProvider {
#ifdef _MSC_VER
boost::container::stable_vector<char[1 << 22]> blockcache; boost::container::stable_vector<char[1 << 22]> blockcache;
#else
boost::container::stable_vector<std::array<char, 1 << 22>> blockcache;
#endif
bool samples_native_endian; bool samples_native_endian;
void FillCache(AudioProvider *source, agi::ProgressSink *ps); void FillCache(AudioProvider *source, agi::ProgressSink *ps);