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:
fedc5b8
)
CImgMergeFrm.cpp: Fix warning C4407
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Wed, 5 Jun 2019 22:48:11 +0000
(07:48 +0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Wed, 5 Jun 2019 22:48:11 +0000
(07:48 +0900)
Src/ImgMergeFrm.h
patch
|
blob
|
history
diff --git
a/Src/ImgMergeFrm.h
b/Src/ImgMergeFrm.h
index
98c2c3e
..
f754cbe
100644
(file)
--- a/
Src/ImgMergeFrm.h
+++ b/
Src/ImgMergeFrm.h
@@
-39,7
+39,7
@@
class CDirDoc;
/**
* @brief Frame class for file compare, handles panes, statusbar etc.
*/
-class CImgMergeFrame : public
IMergeDoc, public CMergeFrameCommon
+class CImgMergeFrame : public
CMergeFrameCommon,public IMergeDoc
{
private:
enum BUFFERTYPE