Fixed pragmas in headers so they work with Visual C++

ykaravas · Dec 8, 2017 · 75c4334 · 75c4334
1 parent c960cb8
commit 75c4334
Show file tree

Hide file tree

Showing 118 changed files with 243 additions and 120 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@
 **/cmake_install.cmake
 **/*.bmp
 **/bin/**
+**/bin/
 
diff --git a/ABitmapClass/bin/ABitmapClass b/ABitmapClass/bin/ABitmapClass
diff --git a/ABitmapClass/src/BitmapFileHeader.h b/ABitmapClass/src/BitmapFileHeader.h
@@ -12,17 +12,19 @@
 
 using namespace std;
 
-#pragma pack(2)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapFileHeader {
 	char header[2] { 'B', 'M' };
 	int32_t fileSize;
 	int32_t reserved { 0 };
 	int32_t dataOffset;
 };
 
+#pragma pack(pop)
+
 }
 
 #endif /* BITMAPFILEHEADER_H_ */
diff --git a/ABitmapClass/src/BitmapInfoHeader.h b/ABitmapClass/src/BitmapInfoHeader.h
@@ -5,10 +5,10 @@
 
 using namespace std;
 
-#pragma pack(2)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapInfoHeader {
 	int32_t headerSize{40};
 	int32_t width;
@@ -23,6 +23,8 @@ struct BitmapInfoHeader {
 	int32_t importantColors{0};
 };
 
+#pragma pack(pop)
+
 }
 
 #endif
diff --git a/AMandelbrotClass/bin/AMandelbrotClass b/AMandelbrotClass/bin/AMandelbrotClass
diff --git a/AMandelbrotClass/src/BitmapFileHeader.h b/AMandelbrotClass/src/BitmapFileHeader.h
@@ -12,17 +12,19 @@
 
 using namespace std;
 
-#pragma pack(2)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapFileHeader {
 	char header[2] { 'B', 'M' };
 	int32_t fileSize;
 	int32_t reserved { 0 };
 	int32_t dataOffset;
 };
 
+#pragma pack(pop)
+
 }
 
 #endif /* BITMAPFILEHEADER_H_ */
diff --git a/AMandelbrotClass/src/BitmapInfoHeader.h b/AMandelbrotClass/src/BitmapInfoHeader.h
@@ -5,10 +5,10 @@
 
 using namespace std;
 
-#pragma pack(2)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapInfoHeader {
 	int32_t headerSize{40};
 	int32_t width;
@@ -23,6 +23,8 @@ struct BitmapInfoHeader {
 	int32_t importantColors{0};
 };
 
+#pragma pack(pop)
+
 }
 
 #endif
diff --git a/AZoomClass/bin/AZoomClass b/AZoomClass/bin/AZoomClass
diff --git a/AZoomClass/src/BitmapFileHeader.h b/AZoomClass/src/BitmapFileHeader.h
@@ -12,17 +12,19 @@
 
 using namespace std;
 
-#pragma pack(2)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapFileHeader {
 	char header[2] { 'B', 'M' };
 	int32_t fileSize;
 	int32_t reserved { 0 };
 	int32_t dataOffset;
 };
 
+#pragma pack(pop)
+
 }
 
 #endif /* BITMAPFILEHEADER_H_ */
diff --git a/AZoomClass/src/BitmapInfoHeader.h b/AZoomClass/src/BitmapInfoHeader.h
@@ -5,10 +5,10 @@
 
 using namespace std;
 
-#pragma pack(2)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapInfoHeader {
 	int32_t headerSize{40};
 	int32_t width;
@@ -23,6 +23,8 @@ struct BitmapInfoHeader {
 	int32_t importantColors{0};
 };
 
+#pragma pack(pop)
+
 }
 
 #endif
diff --git a/AnRGBClass/bin/AnRGBClass b/AnRGBClass/bin/AnRGBClass
diff --git a/AnRGBClass/src/BitmapFileHeader.h b/AnRGBClass/src/BitmapFileHeader.h
@@ -12,17 +12,19 @@
 
 using namespace std;
 
-#pragma pack(2)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapFileHeader {
 	char header[2] { 'B', 'M' };
 	int32_t fileSize;
 	int32_t reserved { 0 };
 	int32_t dataOffset;
 };
 
+#pragma pack(pop)
+
 }
 
 #endif /* BITMAPFILEHEADER_H_ */
diff --git a/AnRGBClass/src/BitmapInfoHeader.h b/AnRGBClass/src/BitmapInfoHeader.h
@@ -5,10 +5,10 @@
 
 using namespace std;
 
-#pragma pack(2)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapInfoHeader {
 	int32_t headerSize{40};
 	int32_t width;
@@ -23,6 +23,8 @@ struct BitmapInfoHeader {
 	int32_t importantColors{0};
 };
 
+#pragma pack(pop)
+
 }
 
 #endif
diff --git a/ApplyingtheZoom/bin/ApplyingtheZoom b/ApplyingtheZoom/bin/ApplyingtheZoom
diff --git a/ApplyingtheZoom/src/BitmapFileHeader.h b/ApplyingtheZoom/src/BitmapFileHeader.h
@@ -12,10 +12,10 @@
 
 using namespace std;
 
-#pragma pack(push, 1)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapFileHeader {
 	char header[2] { 'B', 'M' };
 	int32_t fileSize;
@@ -24,6 +24,7 @@ struct BitmapFileHeader {
 };
 
 #pragma pack(pop)
+
 }
 
 #endif /* BITMAPFILEHEADER_H_ */
diff --git a/ApplyingtheZoom/src/BitmapInfoHeader.h b/ApplyingtheZoom/src/BitmapInfoHeader.h
@@ -5,10 +5,10 @@
 
 using namespace std;
 
-#pragma pack(push, 1)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapInfoHeader {
 	int32_t headerSize{40};
 	int32_t width;
@@ -22,8 +22,9 @@ struct BitmapInfoHeader {
 	int32_t colors{0};
 	int32_t importantColors{0};
 };
-}
 
 #pragma pack(pop)
 
+}
+
 #endif
diff --git a/Bind/bin/Bind b/Bind/bin/Bind
diff --git a/BitmapFileHeaders/bin/BitmapFileHeaders b/BitmapFileHeaders/bin/BitmapFileHeaders
diff --git a/BitmapFileHeaders/src/BitmapFileHeader.h b/BitmapFileHeaders/src/BitmapFileHeader.h
@@ -12,17 +12,19 @@
 
 using namespace std;
 
-#pragma pack(2)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapFileHeader {
 	char header[2] { 'B', 'M' };
 	int32_t fileSize;
 	int32_t reserved { 0 };
 	int32_t dataOffset;
 };
 
+#pragma pack(pop)
+
 }
 
 #endif /* BITMAPFILEHEADER_H_ */
diff --git a/BitmapHeaderValues/bin/BitmapHeaderValues b/BitmapHeaderValues/bin/BitmapHeaderValues
diff --git a/BitmapHeaderValues/src/BitmapFileHeader.h b/BitmapHeaderValues/src/BitmapFileHeader.h
@@ -12,17 +12,19 @@
 
 using namespace std;
 
-#pragma pack(2)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapFileHeader {
 	char header[2] { 'B', 'M' };
 	int32_t fileSize;
 	int32_t reserved { 0 };
 	int32_t dataOffset;
 };
 
+#pragma pack(pop)
+
 }
 
 #endif /* BITMAPFILEHEADER_H_ */
diff --git a/BitmapHeaderValues/src/BitmapInfoHeader.h b/BitmapHeaderValues/src/BitmapInfoHeader.h
@@ -5,10 +5,10 @@
 
 using namespace std;
 
-#pragma pack(2)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapInfoHeader {
 	int32_t headerSize{40};
 	int32_t width;
@@ -23,6 +23,8 @@ struct BitmapInfoHeader {
 	int32_t importantColors{0};
 };
 
+#pragma pack(pop)
+
 }
 
 #endif
diff --git a/BitmapInfoHeaders/bin/BitmapInfoHeaders b/BitmapInfoHeaders/bin/BitmapInfoHeaders
diff --git a/BitmapInfoHeaders/src/BitmapInfoHeader.h b/BitmapInfoHeaders/src/BitmapInfoHeader.h
@@ -5,7 +5,9 @@
 
 using namespace std;
 
-#pragma pack(2)
+namespace caveofprogramming {
+
+#pragma pack(push, 2)
 
 struct BitmapInfoHeader {
 	int32_t headerSize{40};
@@ -21,4 +23,8 @@ struct BitmapInfoHeader {
 	int32_t importantColors{0};
 };
 
+#pragma pack(pop)
+
+}
+
 #endif
diff --git a/BitmapMemory/bin/BitmapMemory b/BitmapMemory/bin/BitmapMemory
diff --git a/BitmapMemory/src/BitmapFileHeader.h b/BitmapMemory/src/BitmapFileHeader.h
@@ -12,17 +12,19 @@
 
 using namespace std;
 
-#pragma pack(2)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapFileHeader {
 	char header[2] { 'B', 'M' };
 	int32_t fileSize;
 	int32_t reserved { 0 };
 	int32_t dataOffset;
 };
 
+#pragma pack(pop)
+
 }
 
 #endif /* BITMAPFILEHEADER_H_ */
diff --git a/BitmapMemory/src/BitmapInfoHeader.h b/BitmapMemory/src/BitmapInfoHeader.h
@@ -5,10 +5,10 @@
 
 using namespace std;
 
-#pragma pack(2)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapInfoHeader {
 	int32_t headerSize{40};
 	int32_t width;
@@ -23,6 +23,8 @@ struct BitmapInfoHeader {
 	int32_t importantColors{0};
 };
 
+#pragma pack(pop)
+
 }
 
 #endif
diff --git a/CalculatingRangeTotals/bin/CalculatingRangeTotals b/CalculatingRangeTotals/bin/CalculatingRangeTotals
diff --git a/CalculatingRangeTotals/src/BitmapFileHeader.h b/CalculatingRangeTotals/src/BitmapFileHeader.h
@@ -12,17 +12,19 @@
 
 using namespace std;
 
-#pragma pack(2)
-
 namespace caveofprogramming {
 
+#pragma pack(push, 2)
+
 struct BitmapFileHeader {
 	char header[2] { 'B', 'M' };
 	int32_t fileSize;
 	int32_t reserved { 0 };
 	int32_t dataOffset;
 };
 
+#pragma pack(pop)
+
 }
 
 #endif /* BITMAPFILEHEADER_H_ */