fixing merge issues

Author: richgel999

encoder/basisu_pvrtc1_4.h

@@ -235,7 +235,7 @@ namespace basisu
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #endif
-#endif
+
 			memset(m_blocks.get_ptr(), 0, m_blocks.size_in_bytes());
 #if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic pop

transcoder/basisu_containers.h

@@ -1507,15 +1507,13 @@ namespace basisu
 #if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
-#endif
 #endif
 				if ((m_p) && (other.m_p))
 				{
 					memcpy(m_p, other.m_p, m_size * sizeof(T));
 				}
 #if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif
 #endif
 			}
 			else
@@ -1650,13 +1648,11 @@ namespace basisu
 #if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
-#endif
 #endif
 				if ((m_p) && (other.m_p))
 					memcpy((void *)m_p, other.m_p, other.m_size * sizeof(T));
 #if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif
 #endif
 			}
 			else
@@ -2239,7 +2235,6 @@ namespace basisu
 
 #if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif
 #endif
 			}
 			else
@@ -2488,13 +2483,11 @@ namespace basisu
 #if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
-#endif
 #endif
 				memset(m_p, *reinterpret_cast<const uint8_t*>(&o), m_size);
 
 #if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif
 #endif
 			}
 			else