OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d5d05be
)
Fix Warning C26437 Do not slice (es.63).
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Sat, 5 Jan 2019 14:23:14 +0000
(23:23 +0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Sat, 5 Jan 2019 14:23:14 +0000
(23:23 +0900)
--HG--
branch : stable
Src/DiffList.cpp
patch
|
blob
|
history
diff --git
a/Src/DiffList.cpp
b/Src/DiffList.cpp
index
eb2f609
..
b477d76
100644
(file)
--- a/
Src/DiffList.cpp
+++ b/
Src/DiffList.cpp
@@
-926,7
+926,7
@@
void DiffList::AppendDiffList(const DiffList& list, int offset[] /*= nullptr*/,
{
for (std::vector<DiffRangeInfo>::const_iterator it = list.m_diffs.begin(); it != list.m_diffs.end(); ++it)
{
- D
IFFRANGE
dr = *it;
+ D
iffRangeInfo
dr = *it;
for (int file = 0; file < 3; ++file)
{
if (offset != nullptr)