Skip to content

Commit ceb182a

Browse files
dlidstromdlidstrom
authored
Merge pull request #31 from tyler97/fix-visual-studio-build
fixing visual studio build
2 parents ffea56f + 9d38b14 commit ceb182a

File tree

3 files changed

+53
-49
lines changed

3 files changed

+53
-49
lines changed

‎Duplo.vcxproj‎

Lines changed: 46 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
6060
<TreatWarningAsError>true</TreatWarningAsError>
6161
<LanguageStandard>stdcpplatest</LanguageStandard>
62+
<DisableSpecificWarnings>4146;</DisableSpecificWarnings>
6263
</ClCompile>
6364
<Link>
6465
<OutputFile>$(OutDir)Duplo.exe</OutputFile>
@@ -90,48 +91,6 @@
9091
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
9192
</Link>
9293
</ItemDefinitionGroup>
93-
<ItemGroup>
94-
<ClCompile Include="src/ArgumentParser.cpp" />
95-
<ClCompile Include="src/CstyleCommentsFilter.cpp" />
96-
<ClCompile Include="src/CstyleUtils.cpp" />
97-
<ClCompile Include="src/Duplo.cpp" />
98-
<ClCompile Include="src/FileTypeFactory.cpp" />
99-
<ClCompile Include="src/FileTypeBase.cpp" />
100-
<ClCompile Include="src/FileType_C.cpp" />
101-
<ClCompile Include="src/FileType_CS.cpp" />
102-
<ClCompile Include="src/FileType_S.cpp" />
103-
<ClCompile Include="src/FileType_Unknown.cpp" />
104-
<ClCompile Include="src/FileType_VB.cpp" />
105-
<ClCompile Include="src/HashUtil.cpp" />
106-
<ClCompile Include="src/Main.cpp" />
107-
<ClCompile Include="src/NoopLineFilter.cpp" />
108-
<ClCompile Include="src/SourceFile.cpp" />
109-
<ClCompile Include="src/SourceLine.cpp" />
110-
<ClCompile Include="src/StringUtil.cpp" />
111-
<ClCompile Include="src/TextFile.cpp" />
112-
</ItemGroup>
113-
<ItemGroup>
114-
<ClInclude Include="src/ArgumentParser.h" />
115-
<ClInclude Include="src/CstyleCommentsFilter.h" />
116-
<ClInclude Include="src/CstyleUtils.h" />
117-
<ClInclude Include="src/Duplo.h" />
118-
<ClInclude Include="src/FileTypeFactory.h" />
119-
<ClInclude Include="src/FileTypeBase.h" />
120-
<ClInclude Include="src/src/FileType_C.h" />
121-
<ClInclude Include="src/src/FileType_CS.h" />
122-
<ClInclude Include="src/FileType_S.h" />
123-
<ClInclude Include="src/FileType_Unknown.h" />
124-
<ClInclude Include="src/FileType_VB.h" />
125-
<ClInclude Include="src/Fwd.h" />
126-
<ClInclude Include="src/HashUtil.h" />
127-
<ClInclude Include="src/IFileType.h" />
128-
<ClInclude Include="src/ILineFilter.h" />
129-
<ClInclude Include="src/NoopLineFilter.h" />
130-
<ClInclude Include="src/SourceFile.h" />
131-
<ClInclude Include="src/SourceLine.h" />
132-
<ClInclude Include="src/StringUtil.h" />
133-
<ClInclude Include="src/TextFile.h" />
134-
</ItemGroup>
13594
<ItemGroup>
13695
<None Include=".clang-format" />
13796
<None Include=".editorconfig" />
@@ -142,7 +101,51 @@
142101
<ItemGroup>
143102
<Xml Include="duplo.xsl" />
144103
</ItemGroup>
104+
<ItemGroup>
105+
<ClCompile Include="src\ArgumentParser.cpp" />
106+
<ClCompile Include="src\CstyleCommentsFilter.cpp" />
107+
<ClCompile Include="src\CstyleUtils.cpp" />
108+
<ClCompile Include="src\Duplo.cpp" />
109+
<ClCompile Include="src\FileTypeBase.cpp" />
110+
<ClCompile Include="src\FileTypeFactory.cpp" />
111+
<ClCompile Include="src\FileType_C.cpp" />
112+
<ClCompile Include="src\FileType_CS.cpp" />
113+
<ClCompile Include="src\FileType_S.cpp" />
114+
<ClCompile Include="src\FileType_Unknown.cpp" />
115+
<ClCompile Include="src\FileType_VB.cpp" />
116+
<ClCompile Include="src\HashUtil.cpp" />
117+
<ClCompile Include="src\Main.cpp" />
118+
<ClCompile Include="src\NoopLineFilter.cpp" />
119+
<ClCompile Include="src\Options.cpp" />
120+
<ClCompile Include="src\SourceFile.cpp" />
121+
<ClCompile Include="src\SourceLine.cpp" />
122+
<ClCompile Include="src\StringUtil.cpp" />
123+
<ClCompile Include="src\TextFile.cpp" />
124+
</ItemGroup>
125+
<ItemGroup>
126+
<ClInclude Include="src\ArgumentParser.h" />
127+
<ClInclude Include="src\CstyleCommentsFilter.h" />
128+
<ClInclude Include="src\CstyleUtils.h" />
129+
<ClInclude Include="src\Duplo.h" />
130+
<ClInclude Include="src\FileTypeBase.h" />
131+
<ClInclude Include="src\FileTypeFactory.h" />
132+
<ClInclude Include="src\FileType_C.h" />
133+
<ClInclude Include="src\FileType_CS.h" />
134+
<ClInclude Include="src\FileType_S.h" />
135+
<ClInclude Include="src\FileType_Unknown.h" />
136+
<ClInclude Include="src\FileType_VB.h" />
137+
<ClInclude Include="src\Fwd.h" />
138+
<ClInclude Include="src\HashUtil.h" />
139+
<ClInclude Include="src\IFileType.h" />
140+
<ClInclude Include="src\ILineFilter.h" />
141+
<ClInclude Include="src\NoopLineFilter.h" />
142+
<ClInclude Include="src\Options.h" />
143+
<ClInclude Include="src\SourceFile.h" />
144+
<ClInclude Include="src\SourceLine.h" />
145+
<ClInclude Include="src\StringUtil.h" />
146+
<ClInclude Include="src\TextFile.h" />
147+
</ItemGroup>
145148
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
146149
<ImportGroup Label="ExtensionTargets">
147150
</ImportGroup>
148-
</Project>
151+
</Project>

‎src/Duplo.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ namespace {
116116
if (longestFiles.size() < 10) {
117117
addSorted(numLines, lines[i]);
118118
} else {
119-
auto [l, r] = longestFiles.back();
119+
auto& [l, r] = longestFiles.back();
120120
(void)r;
121121
if (l < numLines) {
122122
addSorted(numLines, lines[i]);
@@ -133,7 +133,7 @@ namespace {
133133
<< std::sqrt(matrix.max_size())
134134
<< " lines at most." << std::endl
135135
<< "Longest files:" << std::endl;
136-
for (auto [l, f] : longestFiles) {
136+
for (auto& [l, f] : longestFiles) {
137137
stream << l << ": " << f << std::endl;
138138
}
139139

@@ -152,7 +152,7 @@ namespace {
152152
stream
153153
<< ex.what() << std::endl
154154
<< "Longest files:" << std::endl;
155-
for (auto [l, f] : longestFiles) {
155+
for (auto& [l, f] : longestFiles) {
156156
stream << l << ": " << f << std::endl;
157157
}
158158

‎src/SourceLine.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
#include "SourceFile.h"
44

55
#include <algorithm>
6+
#include <iterator>
67

7-
SourceLine::SourceLine(const std::string& line, int lineNumber) {
8-
m_line = line;
9-
m_lineNumber = lineNumber;
8+
SourceLine::SourceLine(const std::string& line, int lineNumber)
9+
: m_line(line),
10+
m_lineNumber(lineNumber) {
1011

1112
std::string cleanLine;
1213

0 commit comments

Comments
 (0)