Update to Visual Studio 2015

README.md

@@ -12,9 +12,9 @@ Support is available on [the forums](http://forum.aegisub.org) or [on IRC](irc:/
 
 Prerequisites:
 
-1. Visual Studio 2013 (Express edition is good enough) or the Windows 8.1 SDK (command line builds only).
-2. A recent DirectX SDK
-4. [Yasm](http://yasm.tortall.net/) installed to somewhere on your path.
+1. Visual Studio 2015 (the freee Community edition is good enough)
+2. The June 2010 DirectX SDK (the final release before DirectSound was dropped)
+3. [Yasm](http://yasm.tortall.net/) installed to somewhere on your path.
 
 There are a few optional dependencies:
 

build/aegisub.props

@@ -34,7 +34,7 @@
     <WholeProgramOptimization Condition="'$(Configuration)'=='Release'" >true</WholeProgramOptimization>
     <CharacterSet                                                       >Unicode</CharacterSet>
     <CharacterSet             Condition="'$(AegisubMBCS)'=='true'"      >MultiByte</CharacterSet>
-    <PlatformToolset                                                    >v120_xp</PlatformToolset>
+    <PlatformToolset                                                    >v140_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 

build/libaegisub/libaegisub.vcxproj

@@ -16,6 +16,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>
+        $(WindowsSDK_IncludePath);
         $(SrcDir);
         $(SrcDir)include;
         %(AdditionalIncludeDirectories)

build/wx/wxWidgets.vcxproj

@@ -21,6 +21,7 @@
       <AdditionalIncludeDirectories>$(SrcDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
+      <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <InstallHeader>
       <HeaderRoot>$(SrcDir)include</HeaderRoot>

libaegisub/common/io.cpp

@@ -56,7 +56,7 @@ Save::Save(fs::path const& file, bool binary)
 	}
 }
 
-Save::~Save() {
+Save::~Save() noexcept(false) {
 	fp.reset(); // Need to close before rename on Windows to unlock the file
 	for (int i = 0; i < 10; ++i) {
 		try {

libaegisub/include/libaegisub/io.h

@@ -38,7 +38,7 @@ class Save {
 
 public:
 	Save(fs::path const& file, bool binary = false);
-	~Save();
+	~Save() noexcept(false);
 	std::ostream& Get() { return *fp; }
 };
 

libaegisub/include/libaegisub/line_iterator.h

@@ -43,14 +43,10 @@ public:
 
 	line_iterator_base() = default;
 	line_iterator_base(line_iterator_base const&) = default;
-#ifndef _MSC_VER
 	line_iterator_base(line_iterator_base&&) = default;
-#endif
 
 	line_iterator_base& operator=(line_iterator_base const&) = default;
-#ifndef _MSC_VER
 	line_iterator_base& operator=(line_iterator_base&&) = default;
-#endif
 
 	bool operator==(line_iterator_base const& rgt) const { return stream == rgt.stream; }
 	bool operator!=(line_iterator_base const& rgt) const { return !operator==(rgt); }

src/ass_override.cpp

@@ -52,27 +52,7 @@ AssOverrideParameter::AssOverrideParameter(VariableDataType type, AssParameterCl
 {
 }
 
-#ifdef _MSC_VER
-AssOverrideParameter::AssOverrideParameter(AssOverrideParameter&& o)
-: value(std::move(o.value))
-, block(std::move(o.block))
-, type(o.type)
-, classification(o.classification)
-, omitted(o.omitted)
-{
-}
-
-AssOverrideParameter& AssOverrideParameter::operator=(AssOverrideParameter&& rhs) {
-	value = std::move(rhs.value);
-	block = std::move(rhs.block);
-	type = rhs.type;
-	classification = rhs.classification;
-	return *this;
-}
-#endif
-
-AssOverrideParameter::~AssOverrideParameter() {
-}
+AssOverrideParameter::~AssOverrideParameter() = default;
 
 template<> std::string AssOverrideParameter::Get<std::string>() const {
 	if (omitted) throw agi::InternalError("AssOverrideParameter::Get() called on omitted parameter");
@@ -454,22 +434,6 @@ AssOverrideTag::AssOverrideTag(std::string const& text) {
 	SetText(text);
 }
 
-#ifdef _MSC_VER
-AssOverrideTag::AssOverrideTag(AssOverrideTag&& rhs)
-: valid(rhs.valid)
-, Name(std::move(rhs.Name))
-, Params(std::move(rhs.Params))
-{
-}
-
-AssOverrideTag& AssOverrideTag::operator=(AssOverrideTag&& rhs) {
-	valid = rhs.valid;
-	Name = std::move(rhs.Name);
-	Params = std::move(rhs.Params);
-	return *this;
-}
-#endif
-
 void AssOverrideTag::Clear() {
 	Params.clear();
 	Params.reserve(6);

src/ass_override.h

@@ -69,13 +69,8 @@ class AssOverrideParameter {
 
 public:
 	AssOverrideParameter(VariableDataType type, AssParameterClass classification);
-#ifdef _MSC_VER
-	AssOverrideParameter(AssOverrideParameter&&);
-	AssOverrideParameter& operator=(AssOverrideParameter&&);
-#else
 	AssOverrideParameter(AssOverrideParameter&&) = default;
 	AssOverrideParameter& operator=(AssOverrideParameter&&) = default;
-#endif
 	~AssOverrideParameter();
 
 	/// Type of parameter
@@ -98,13 +93,8 @@ class AssOverrideTag {
 public:
 	AssOverrideTag() = default;
 	AssOverrideTag(std::string const& text);
-#ifdef _MSC_VER
-	AssOverrideTag(AssOverrideTag&&);
-	AssOverrideTag& operator=(AssOverrideTag&&);
-#else
 	AssOverrideTag(AssOverrideTag&&) = default;
 	AssOverrideTag& operator=(AssOverrideTag&&) = default;
-#endif
 
 	std::string Name;
 	std::vector<AssOverrideParameter> Params;

src/block_cache.h

@@ -54,16 +54,6 @@ class DataBlockCache {
 
 		/// The blocks contained in the macroblock
 		BlockArray blocks;
-
-#ifdef _MSC_VER
-		MacroBlock() = default;
-		MacroBlock(MacroBlock&& rgt) : position(rgt.position), blocks(std::move(rgt.blocks)) { }
-		MacroBlock& operator=(MacroBlock&& rgt) {
-			position = rgt.position;
-			blocks = std::move(rgt.blocks);
-			return *this;
-		}
-#endif
 	};
 
 	/// Type of an array of macro blocks
@@ -105,17 +95,6 @@ class DataBlockCache {
 	}
 
 public:
-#ifdef _MSC_VER
-	DataBlockCache(DataBlockCache&& rgt)
-	: data(std::move(rgt.data))
-	, age(std::move(rgt.age))
-	, macroblock_size(rgt.macroblock_size)
-	, macroblock_index_mask(rgt.macroblock_index_mask)
-	, size(rgt.size)
-	, factory(std::move(rgt.factory))
-	{ }
-#endif
-
 	/// @brief Constructor
 	/// @param block_count Total number of blocks the cache will manage
 	/// @param factory     Factory object to use for producing blocks

src/command/edit.cpp

@@ -164,11 +164,7 @@ struct parsed_line {
 	std::vector<std::unique_ptr<AssDialogueBlock>> blocks;
 
 	parsed_line(AssDialogue *line) : line(line), blocks(line->ParseTags()) { }
-#ifdef _MSC_VER
-	parsed_line(parsed_line&& r) : line(r.line), blocks(std::move(r.blocks)) { }
-#else
 	parsed_line(parsed_line&& r) = default;
-#endif
 
 	const AssOverrideTag *find_tag(int blockn, std::string const& tag_name, std::string const& alt) const {
 		for (auto ovr : blocks | sliced(0, blockn + 1) | reversed | agi::of_type<AssDialogueBlockOverride>()) {

src/subtitle_format_ebu3264.cpp

@@ -526,9 +526,6 @@ namespace
 		return tti;
 	}
 
-#ifdef _MSC_VER
-#define vsnprintf _vsnprintf
-#endif
 	void fieldprintf(char *field, size_t fieldlen, const char *format, ...)
 	{
 		char buf[16];