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:
ad25d19
)
DireItemIterator.h: Use nullptr instead of NULL
author
sdottaka
<sdottaka@users.sourceforge.net>
Sun, 20 Sep 2015 07:49:40 +0000
(16:49 +0900)
committer
sdottaka
<sdottaka@users.sourceforge.net>
Sun, 20 Sep 2015 07:49:40 +0000
(16:49 +0900)
Src/DirItemIterator.h
patch
|
blob
|
history
diff --git
a/Src/DirItemIterator.h
b/Src/DirItemIterator.h
index
2c96453
..
d8622dc
100644
(file)
--- a/
Src/DirItemIterator.h
+++ b/
Src/DirItemIterator.h
@@
-86,7
+86,7
@@
class DirItemIterator : public std::iterator<std::forward_iterator_tag, DIFFITEM
{
public:
DirItemIterator(IListCtrl *pList, int sel = -1, bool selected = false, bool reverse = false) :
- m_pList(pList), m_sel(sel), m_selected(selected), m_reverse(reverse), m_pdi(
NULL
)
+ m_pList(pList), m_sel(sel), m_selected(selected), m_reverse(reverse), m_pdi(
nullptr
)
{
if (m_sel == -1)
{
@@
-112,7
+112,7
@@
public:
}
}
- DirItemIterator() : m_pList(
NULL), m_sel(-1), m_reverse(false
)
+ DirItemIterator() : m_pList(
nullptr), m_sel(-1), m_reverse(false), m_pdi(nullptr
)
{
}