Skip to content

Commit 4525c6e

Browse files
jpaulmjpaulm
committed
Project updated to use newest Boost (1_67_0)
1 parent 4832615 commit 4525c6e

File tree

27 files changed

+312
-277
lines changed

27 files changed

+312
-277
lines changed

‎.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@ hs_err_pid*
2424
*.exe
2525
*.opensdf
2626
*.opendb
27-
*/output.fil
28-
*/autres.fil
2927
**/Release/
3028
**/Debug/
3129

30+
#data files
31+
*/output.fil
32+
*/autres.fil
33+
3234
# System crap
3335
Thumbs.db
3436
.DS_Store

‎.vs/CppFBP/v15/Browse.VC.db

84.5 MB
Binary file not shown.

‎.vs/CppFBP/v15/Solution.VC.db

1.83 MB
Binary file not shown.

‎CppFBP.sln

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27703.2035
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppFBPCore", "CppFBPCore\CppFBPCore.vcxproj", "{CD601953-D9D2-4A73-BC98-962132D532F4}"
77
EndProject
@@ -16,6 +16,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSubnets", "TestSubnets\
1616
EndProjectSection
1717
EndProject
1818
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Thxgen", "Thxgen\Thxgen.vcxproj", "{FC15EBBB-A017-4C60-B65E-FB534FD0D6C4}"
19+
ProjectSection(ProjectDependencies) = postProject
20+
{CD601953-D9D2-4A73-BC98-962132D532F4} = {CD601953-D9D2-4A73-BC98-962132D532F4}
21+
{DDAECF69-DCC6-4FFE-8EEC-1641BD277B1F} = {DDAECF69-DCC6-4FFE-8EEC-1641BD277B1F}
22+
EndProjectSection
1923
EndProject
2024
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CopyFile", "TestNetworks\CopyFile\CopyFile.vcxproj", "{D324AC2E-065C-4C89-A889-0A181C7688E3}"
2125
ProjectSection(ProjectDependencies) = postProject
@@ -39,6 +43,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TimingTest1", "TestNetworks
3943
EndProject
4044
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TryLua", "TestNetworks\TryLua\TryLua.vcxproj", "{A96FB3AE-C6C8-46CF-BA0F-D5593BE35E43}"
4145
ProjectSection(ProjectDependencies) = postProject
46+
{CD601953-D9D2-4A73-BC98-962132D532F4} = {CD601953-D9D2-4A73-BC98-962132D532F4}
4247
{DDAECF69-DCC6-4FFE-8EEC-1641BD277B1F} = {DDAECF69-DCC6-4FFE-8EEC-1641BD277B1F}
4348
EndProjectSection
4449
EndProject
@@ -255,4 +260,7 @@ Global
255260
GlobalSection(SolutionProperties) = preSolution
256261
HideSolutionNode = FALSE
257262
EndGlobalSection
263+
GlobalSection(ExtensibilityGlobals) = postSolution
264+
SolutionGuid = {B9CF2DB2-4434-4256-9F99-4C5431E73886}
265+
EndGlobalSection
258266
EndGlobal

‎CppFBPComponents/CppFBPComponents.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -22,34 +22,34 @@
2222
<ProjectGuid>{DDAECF69-DCC6-4FFE-8EEC-1641BD277B1F}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>cppcomponents</RootNamespace>
25-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>DynamicLibrary</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
3131
<CharacterSet>MultiByte</CharacterSet>
32-
<PlatformToolset>v140</PlatformToolset>
32+
<PlatformToolset>v141</PlatformToolset>
3333
</PropertyGroup>
3434
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3535
<ConfigurationType>StaticLibrary</ConfigurationType>
3636
<UseDebugLibraries>true</UseDebugLibraries>
3737
<CharacterSet>MultiByte</CharacterSet>
38-
<PlatformToolset>v140</PlatformToolset>
38+
<PlatformToolset>v141</PlatformToolset>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4141
<ConfigurationType>StaticLibrary</ConfigurationType>
4242
<UseDebugLibraries>false</UseDebugLibraries>
4343
<WholeProgramOptimization>true</WholeProgramOptimization>
4444
<CharacterSet>MultiByte</CharacterSet>
45-
<PlatformToolset>v140</PlatformToolset>
45+
<PlatformToolset>v141</PlatformToolset>
4646
</PropertyGroup>
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4848
<ConfigurationType>StaticLibrary</ConfigurationType>
4949
<UseDebugLibraries>false</UseDebugLibraries>
5050
<WholeProgramOptimization>true</WholeProgramOptimization>
5151
<CharacterSet>MultiByte</CharacterSet>
52-
<PlatformToolset>v140</PlatformToolset>
52+
<PlatformToolset>v141</PlatformToolset>
5353
</PropertyGroup>
5454
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5555
<ImportGroup Label="ExtensionSettings">

‎CppFBPCore/CppFBPCore.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -21,34 +21,34 @@
2121
<PropertyGroup Label="Globals">
2222
<ProjectGuid>{CD601953-D9D2-4A73-BC98-962132D532F4}</ProjectGuid>
2323
<RootNamespace>CppFBPCore</RootNamespace>
24-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
24+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
2525
</PropertyGroup>
2626
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2828
<ConfigurationType>StaticLibrary</ConfigurationType>
2929
<UseDebugLibraries>true</UseDebugLibraries>
3030
<CharacterSet>MultiByte</CharacterSet>
31-
<PlatformToolset>v140</PlatformToolset>
31+
<PlatformToolset>v141</PlatformToolset>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3434
<ConfigurationType>StaticLibrary</ConfigurationType>
3535
<UseDebugLibraries>true</UseDebugLibraries>
3636
<CharacterSet>MultiByte</CharacterSet>
37-
<PlatformToolset>v140</PlatformToolset>
37+
<PlatformToolset>v141</PlatformToolset>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4040
<ConfigurationType>StaticLibrary</ConfigurationType>
4141
<UseDebugLibraries>false</UseDebugLibraries>
4242
<WholeProgramOptimization>true</WholeProgramOptimization>
4343
<CharacterSet>MultiByte</CharacterSet>
44-
<PlatformToolset>v140</PlatformToolset>
44+
<PlatformToolset>v141</PlatformToolset>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4747
<ConfigurationType>StaticLibrary</ConfigurationType>
4848
<UseDebugLibraries>false</UseDebugLibraries>
4949
<WholeProgramOptimization>true</WholeProgramOptimization>
5050
<CharacterSet>MultiByte</CharacterSet>
51-
<PlatformToolset>v140</PlatformToolset>
51+
<PlatformToolset>v141</PlatformToolset>
5252
</PropertyGroup>
5353
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5454
<ImportGroup Label="ExtensionSettings">

‎CppFBPCore/intcomps/Network.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#include <stdarg.h>
99
#include <stdio.h>
1010
#include <conio.h>
11+
#include <string>
12+
#include <iostream>
1113
#include "thzcbs.h"
1214
#include "cppfbp.h"
1315

@@ -185,9 +187,10 @@ void Network::go(label_ent * label_blk, bool dynam, FILE * fp, bool timereq, _an
185187

186188
if (strcmp(name, "SUBNET") != 0) {
187189
//_CrtDumpMemoryLeaks();
188-
//char c;
190+
189191
printf("Press enter to terminate\n");
190-
std::cin.get(); // to see console
192+
std::string line;
193+
std::getline(std::cin, line); // read a line from std::cin into line
191194
//system("pause"); // to see console
192195
exit(0);
193196
}

‎CppFBPLua/CppFBPLua.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -22,32 +22,32 @@
2222
<ProjectGuid>{5AE4CD23-C68A-4539-B0C2-5948226F3A0F}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>CppFBPLua</RootNamespace>
25-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>StaticLibrary</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v140</PlatformToolset>
31+
<PlatformToolset>v141</PlatformToolset>
3232
<CharacterSet>Unicode</CharacterSet>
3333
</PropertyGroup>
3434
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3535
<ConfigurationType>DynamicLibrary</ConfigurationType>
3636
<UseDebugLibraries>false</UseDebugLibraries>
37-
<PlatformToolset>v140</PlatformToolset>
37+
<PlatformToolset>v141</PlatformToolset>
3838
<WholeProgramOptimization>true</WholeProgramOptimization>
3939
<CharacterSet>Unicode</CharacterSet>
4040
</PropertyGroup>
4141
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4242
<ConfigurationType>DynamicLibrary</ConfigurationType>
4343
<UseDebugLibraries>true</UseDebugLibraries>
44-
<PlatformToolset>v140</PlatformToolset>
44+
<PlatformToolset>v141</PlatformToolset>
4545
<CharacterSet>Unicode</CharacterSet>
4646
</PropertyGroup>
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4848
<ConfigurationType>DynamicLibrary</ConfigurationType>
4949
<UseDebugLibraries>false</UseDebugLibraries>
50-
<PlatformToolset>v140</PlatformToolset>
50+
<PlatformToolset>v141</PlatformToolset>
5151
<WholeProgramOptimization>true</WholeProgramOptimization>
5252
<CharacterSet>Unicode</CharacterSet>
5353
</PropertyGroup>

‎DynNetworks/CopyFileDyn/CopyFileDyn.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -22,34 +22,34 @@
2222
<ProjectGuid>{E6F3E8BE-FA79-4BEC-AA3B-3B33D8D9876A}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>CopyFileDyn</RootNamespace>
25-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>Application</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
3131
<CharacterSet>MultiByte</CharacterSet>
32-
<PlatformToolset>v140</PlatformToolset>
32+
<PlatformToolset>v141</PlatformToolset>
3333
</PropertyGroup>
3434
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3535
<ConfigurationType>Application</ConfigurationType>
3636
<UseDebugLibraries>true</UseDebugLibraries>
3737
<CharacterSet>MultiByte</CharacterSet>
38-
<PlatformToolset>v140</PlatformToolset>
38+
<PlatformToolset>v141</PlatformToolset>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4141
<ConfigurationType>Application</ConfigurationType>
4242
<UseDebugLibraries>false</UseDebugLibraries>
4343
<WholeProgramOptimization>true</WholeProgramOptimization>
4444
<CharacterSet>MultiByte</CharacterSet>
45-
<PlatformToolset>v140</PlatformToolset>
45+
<PlatformToolset>v141</PlatformToolset>
4646
</PropertyGroup>
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4848
<ConfigurationType>Application</ConfigurationType>
4949
<UseDebugLibraries>false</UseDebugLibraries>
5050
<WholeProgramOptimization>true</WholeProgramOptimization>
5151
<CharacterSet>MultiByte</CharacterSet>
52-
<PlatformToolset>v140</PlatformToolset>
52+
<PlatformToolset>v141</PlatformToolset>
5353
</PropertyGroup>
5454
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5555
<ImportGroup Label="ExtensionSettings">

‎DynNetworks/TryInfQDyn/TryInfQDyn.vcxproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -22,33 +22,34 @@
2222
<ProjectGuid>{94C91431-3434-4706-AA41-F0462B889E0B}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>TryInfQDyn</RootNamespace>
25+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
2526
</PropertyGroup>
2627
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2728
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2829
<ConfigurationType>Application</ConfigurationType>
2930
<UseDebugLibraries>true</UseDebugLibraries>
3031
<CharacterSet>Unicode</CharacterSet>
31-
<PlatformToolset>v140</PlatformToolset>
32+
<PlatformToolset>v141</PlatformToolset>
3233
</PropertyGroup>
3334
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3435
<ConfigurationType>Application</ConfigurationType>
3536
<UseDebugLibraries>true</UseDebugLibraries>
3637
<CharacterSet>Unicode</CharacterSet>
37-
<PlatformToolset>v140</PlatformToolset>
38+
<PlatformToolset>v141</PlatformToolset>
3839
</PropertyGroup>
3940
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4041
<ConfigurationType>Application</ConfigurationType>
4142
<UseDebugLibraries>false</UseDebugLibraries>
4243
<WholeProgramOptimization>true</WholeProgramOptimization>
4344
<CharacterSet>Unicode</CharacterSet>
44-
<PlatformToolset>v140</PlatformToolset>
45+
<PlatformToolset>v141</PlatformToolset>
4546
</PropertyGroup>
4647
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4748
<ConfigurationType>Application</ConfigurationType>
4849
<UseDebugLibraries>false</UseDebugLibraries>
4950
<WholeProgramOptimization>true</WholeProgramOptimization>
5051
<CharacterSet>Unicode</CharacterSet>
51-
<PlatformToolset>v140</PlatformToolset>
52+
<PlatformToolset>v141</PlatformToolset>
5253
</PropertyGroup>
5354
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5455
<ImportGroup Label="ExtensionSettings">

0 commit comments

Comments
 (0)