OSDN Git Service

CImgMergeFrm.cpp: Fix warning C4407
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Wed, 5 Jun 2019 22:48:11 +0000 (07:48 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Wed, 5 Jun 2019 22:48:11 +0000 (07:48 +0900)
Src/ImgMergeFrm.h

index 98c2c3e..f754cbe 100644 (file)
@@ -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