From 8ef5d97366ba9fcf4c57ed23a707f00e5db7e871 Mon Sep 17 00:00:00 2001 From: Adrian Conlon Date: Sun, 4 Nov 2018 12:58:01 +0000 Subject: [PATCH] Update boost from 1.65 -> 1.68 Signed-off-by: Adrian Conlon --- Intel8080/src/Intel8080.vcxproj | 8 ++++---- Intel8080/test/test_Intel8080.vcxproj | 8 ++++---- LR35902/src/LR35902.vcxproj | 8 ++++---- M6502/inc/Symbols.h | 2 +- M6502/src/M6502.vcxproj | 8 ++++---- M6502/src/Symbols.cpp | 25 +++++++++---------------- M6502/src/stdafx.h | 6 +----- M6502/test/test_M6502.vcxproj | 8 ++++---- MC6809/src/MC6809.vcxproj | 8 ++++---- MC6809/test/test_MC6809.vcxproj | 8 ++++---- Z80/fusetest_Z80/fusetest_Z80.vcxproj | 8 ++++---- Z80/src/Z80.vcxproj | 8 ++++---- Z80/test/test_Z80.vcxproj | 8 ++++---- src/EightBit.vcxproj | 8 ++++---- 14 files changed, 55 insertions(+), 66 deletions(-) diff --git a/Intel8080/src/Intel8080.vcxproj b/Intel8080/src/Intel8080.vcxproj index 930c9ae..6cdb2ac 100644 --- a/Intel8080/src/Intel8080.vcxproj +++ b/Intel8080/src/Intel8080.vcxproj @@ -71,16 +71,16 @@ - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) diff --git a/Intel8080/test/test_Intel8080.vcxproj b/Intel8080/test/test_Intel8080.vcxproj index 85238c9..69cfc0c 100644 --- a/Intel8080/test/test_Intel8080.vcxproj +++ b/Intel8080/test/test_Intel8080.vcxproj @@ -71,19 +71,19 @@ true - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) true - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) false - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) false - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) diff --git a/LR35902/src/LR35902.vcxproj b/LR35902/src/LR35902.vcxproj index 9254c6e..eeedd9d 100644 --- a/LR35902/src/LR35902.vcxproj +++ b/LR35902/src/LR35902.vcxproj @@ -69,16 +69,16 @@ - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) diff --git a/M6502/inc/Symbols.h b/M6502/inc/Symbols.h index 8ad255b..fee91da 100644 --- a/M6502/inc/Symbols.h +++ b/M6502/inc/Symbols.h @@ -30,7 +30,7 @@ namespace EightBit { std::map element; }; - std::vector split(const std::string& input, const std::vector& delimiters); + static std::vector split(const std::string& input, const std::string& regex); std::map> parsed; }; diff --git a/M6502/src/M6502.vcxproj b/M6502/src/M6502.vcxproj index d4efdf9..10f0c09 100644 --- a/M6502/src/M6502.vcxproj +++ b/M6502/src/M6502.vcxproj @@ -70,16 +70,16 @@ - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;$(IncludePath) diff --git a/M6502/src/Symbols.cpp b/M6502/src/Symbols.cpp index cdcb913..1a4183b 100644 --- a/M6502/src/Symbols.cpp +++ b/M6502/src/Symbols.cpp @@ -1,14 +1,9 @@ #include "stdafx.h" #include "Symbols.h" -#include - #include - -#include -#include -#include -#include +#include +#include EightBit::Symbols::Symbols(std::string path) noexcept { if (!path.empty()) { @@ -51,7 +46,7 @@ void EightBit::Symbols::Parse(std::string path) { std::string line; std::ifstream reader(path); while (std::getline(reader, line)) { - auto lineElements = split(line, { " ", "\t" }); + auto lineElements = split(line, " |\t"); if (lineElements.size() == 2) { auto type = lineElements[0]; auto dataElements = split(lineElements[1], { "," }); @@ -73,12 +68,10 @@ void EightBit::Symbols::Parse(std::string path) { } } -std::vector EightBit::Symbols::split(const std::string& input, const std::vector& delimiters) { - std::vector tokens; - boost::algorithm::split_regex( - tokens, - input, - boost::regex(boost::join(delimiters, "|")) - ); - return tokens; +std::vector EightBit::Symbols::split(const std::string& input, const std::string& regex) { + std::regex re(regex); + std::sregex_token_iterator + first { input.begin(), input.end(), re, -1 }, + last; + return { first, last }; } diff --git a/M6502/src/stdafx.h b/M6502/src/stdafx.h index f83ae99..6272346 100644 --- a/M6502/src/stdafx.h +++ b/M6502/src/stdafx.h @@ -8,16 +8,12 @@ #include #include #include +#include #include #include #include #include -#include -#include -#include -#include - #include #include #include diff --git a/M6502/test/test_M6502.vcxproj b/M6502/test/test_M6502.vcxproj index b6a49bf..6f1d5dc 100644 --- a/M6502/test/test_M6502.vcxproj +++ b/M6502/test/test_M6502.vcxproj @@ -70,23 +70,23 @@ - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;$(IncludePath) C:\Libraries\boost_1_65_1\lib64-msvc-14.1;$(LibraryPath) false true - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;$(IncludePath) C:\Libraries\boost_1_65_1\lib32-msvc-14.1;$(LibraryPath) true - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;$(IncludePath) C:\Libraries\boost_1_65_1\lib64-msvc-14.1;$(LibraryPath) false - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;$(IncludePath) C:\Libraries\boost_1_65_1\lib32-msvc-14.1;$(LibraryPath) diff --git a/MC6809/src/MC6809.vcxproj b/MC6809/src/MC6809.vcxproj index 2010afb..4cad0f7 100644 --- a/MC6809/src/MC6809.vcxproj +++ b/MC6809/src/MC6809.vcxproj @@ -86,19 +86,19 @@ false - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;$(IncludePath) true - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;$(IncludePath) true - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;$(IncludePath) false - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;$(IncludePath) diff --git a/MC6809/test/test_MC6809.vcxproj b/MC6809/test/test_MC6809.vcxproj index a505493..c6cab8f 100644 --- a/MC6809/test/test_MC6809.vcxproj +++ b/MC6809/test/test_MC6809.vcxproj @@ -71,19 +71,19 @@ false - ..\inc;..\..\inc;..\..\MC6850\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;..\..\MC6850\inc;$(IncludePath) true - ..\inc;..\..\inc;..\..\MC6850\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;..\..\MC6850\inc;$(IncludePath) true - ..\inc;..\..\inc;..\..\MC6850\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;..\..\MC6850\inc;$(IncludePath) false - ..\inc;..\..\inc;..\..\MC6850\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;..\..\MC6850\inc;$(IncludePath) diff --git a/Z80/fusetest_Z80/fusetest_Z80.vcxproj b/Z80/fusetest_Z80/fusetest_Z80.vcxproj index 9a27293..27897b5 100644 --- a/Z80/fusetest_Z80/fusetest_Z80.vcxproj +++ b/Z80/fusetest_Z80/fusetest_Z80.vcxproj @@ -72,19 +72,19 @@ false - ..\inc;..\..\inc;..\..\libraries\GSL\include;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) true - ..\inc;..\..\inc;..\..\libraries\GSL\include;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) true - ..\inc;..\..\inc;..\..\libraries\GSL\include;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) false - ..\inc;..\..\inc;..\..\libraries\GSL\include;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) diff --git a/Z80/src/Z80.vcxproj b/Z80/src/Z80.vcxproj index d0e8b1b..68f05e5 100644 --- a/Z80/src/Z80.vcxproj +++ b/Z80/src/Z80.vcxproj @@ -70,16 +70,16 @@ - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) diff --git a/Z80/test/test_Z80.vcxproj b/Z80/test/test_Z80.vcxproj index d5bdb6c..a9c0daa 100644 --- a/Z80/test/test_Z80.vcxproj +++ b/Z80/test/test_Z80.vcxproj @@ -66,16 +66,16 @@ - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_68_0;$(IncludePath) false diff --git a/src/EightBit.vcxproj b/src/EightBit.vcxproj index 51c5fdc..23b0523 100644 --- a/src/EightBit.vcxproj +++ b/src/EightBit.vcxproj @@ -70,16 +70,16 @@ - ..\inc;C:\Libraries\boost_1_65_1;$(VC_IncludePath);$(WindowsSDK_IncludePath) + ..\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath) - ..\inc;C:\Libraries\boost_1_65_1;$(VC_IncludePath);$(WindowsSDK_IncludePath) + ..\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath) - ..\inc;C:\Libraries\boost_1_65_1;$(VC_IncludePath);$(WindowsSDK_IncludePath) + ..\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath) - ..\inc;C:\Libraries\boost_1_65_1;$(VC_IncludePath);$(WindowsSDK_IncludePath) + ..\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath)