Merge From Master

Header clean on the way in.
deepskystacker · Mar 10, 2023 · acbc694 · acbc694
1 parent 6630f6b
commit acbc694
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/DeepSkyStacker/DeepSkyStacker.cpp b/DeepSkyStacker/DeepSkyStacker.cpp
@@ -36,13 +36,7 @@
 // DeepSkyStacker.cpp : Defines the entry point for the console application.
 //
 #include <stdafx.h>
-
 #include "DeepSkyStacker.h"
-
-#include <boost/interprocess/sync/named_mutex.hpp>
-#include <boost/interprocess/sync/scoped_lock.hpp>
-namespace bip = boost::interprocess;
-
 #include "ui_StackingDlg.h"
 #include "Ztrace.h"
 #include "StackingTasks.h"

diff --git a/DeepSkyStacker/MedianFilterEngine.cpp b/DeepSkyStacker/MedianFilterEngine.cpp
@@ -1,6 +1,4 @@
 #include <stdafx.h>
-#include <omp.h>
-
 #include "BitmapBase.h"
 #include "MedianFilterEngine.h"
 #include "avx_filter.h"

diff --git a/DeepSkyStacker/MultiBitmapProcess.cpp b/DeepSkyStacker/MultiBitmapProcess.cpp
@@ -1,5 +1,4 @@
 #include <stdafx.h>
-#include <omp.h>
 #include "MultiBitmapProcess.h"
 #include "StackingTasks.h"
 #include "MultiBitmap.h"

diff --git a/DeepSkyStacker/StdAfx.h b/DeepSkyStacker/StdAfx.h
@@ -79,6 +79,10 @@
 #include <future>
 #include <inttypes.h>
 #include <filesystem>
+#include <boost/interprocess/sync/named_mutex.hpp>
+#include <boost/interprocess/sync/scoped_lock.hpp>
+
+namespace bip = boost::interprocess;
 namespace fs = std::filesystem;
 
 using std::min;
@@ -94,5 +98,6 @@ using std::max;
 #include <commctrl.h>
 #include <afxole.h>
 #include <AFXPRIV.H>
+#include <richole.h>  // for IRichEditOleCallback
 #include <gdiplus.h>
 using namespace Gdiplus;
diff --git a/DeepSkyStackerCL/stdafx.h b/DeepSkyStackerCL/stdafx.h
@@ -40,6 +40,10 @@
 #include <future>
 #include <inttypes.h>
 #include <filesystem>
+#include <boost/interprocess/sync/named_mutex.hpp>
+#include <boost/interprocess/sync/scoped_lock.hpp>
+
+namespace bip = boost::interprocess;
 namespace fs = std::filesystem;
 
 using std::min;

diff --git a/DeepSkyStackerTest/stdafx.h b/DeepSkyStackerTest/stdafx.h
@@ -18,6 +18,10 @@
 #include <limits>
 #include <iostream>
 #include <filesystem>
+#include <boost/interprocess/sync/named_mutex.hpp>
+#include <boost/interprocess/sync/scoped_lock.hpp>
+
+namespace bip = boost::interprocess;
 namespace fs = std::filesystem;
 
 using std::min;

diff --git a/Tools/RichToolTipCtrl.h b/Tools/RichToolTipCtrl.h
@@ -45,7 +45,6 @@
 // RichToolTipCtrl.h : header file
 //
 
-#include <richole.h>  // for IRichEditOleCallback
 
 /////////////////////////////////////////////////////////////////////////////
 // CRichToolTipCtrl window

diff --git a/Tools/Toolhelp.h b/Tools/Toolhelp.h
@@ -11,8 +11,8 @@ Notices: Copyright (c) 2008 Jeffrey Richter & Christophe Nasarre
 
 
 //#include "CmnHdr.h"     /* See Appendix A. */
-#include <tlhelp32.h>
-#include <tchar.h>
+//#include <tlhelp32.h>
+//#include <tchar.h>
 
 
 ///////////////////////////////////////////////////////////////////////////////