Merge pull request #16378 from unknownbrackets/warnings

Cleanup some minor warnings
hrydgard · Nov 12, 2022 · f0f819a · f0f819a
2 parents 945288f + c20bcc1
commit f0f819a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/Common/Serialize/SerializeFuncs.h b/Common/Serialize/SerializeFuncs.h
@@ -33,11 +33,7 @@ void Do(PointerWrap &p, tm &t);
 
 // This makes it a compile error if you forget to define DoState() on non-POD.
 // Which also can be a problem, for example struct tm is non-POD on linux, for whatever reason...
-#ifdef _MSC_VER
-template<typename T, bool isPOD = std::is_pod<T>::value, bool isPointer = std::is_pointer<T>::value>
-#else
-template<typename T, bool isPOD = __is_pod(T), bool isPointer = std::is_pointer<T>::value>
-#endif
+template<typename T, bool isPOD = std::is_standard_layout<T>::value && std::is_trivial<T>::value, bool isPointer = std::is_pointer<T>::value>
 struct DoHelper_ {
 	static void DoArray(PointerWrap &p, T *x, int count) {
 		for (int i = 0; i < count; ++i)

diff --git a/Common/UI/View.cpp b/Common/UI/View.cpp
@@ -19,9 +19,9 @@
 
 namespace UI {
 
-const float ITEM_HEIGHT = 64.f;
-const float MIN_TEXT_SCALE = 0.8f;
-const float MAX_ITEM_SIZE = 65535.0f;
+static constexpr Size ITEM_HEIGHT = 64.f;
+static constexpr float MIN_TEXT_SCALE = 0.8f;
+static constexpr float MAX_ITEM_SIZE = 65535.0f;
 
 void MeasureBySpec(Size sz, float contentWidth, MeasureSpec spec, float *measured) {
 	*measured = sz;

diff --git a/Common/UI/View.h b/Common/UI/View.h
@@ -128,10 +128,10 @@ enum FocusDirection {
 	FOCUS_NEXT_PAGE,
 };
 
-enum {
-	WRAP_CONTENT = -1,
-	FILL_PARENT = -2,
-};
+typedef float Size;  // can also be WRAP_CONTENT or FILL_PARENT.
+
+static constexpr Size WRAP_CONTENT = -1.0f;
+static constexpr Size FILL_PARENT = -2.0f;
 
 // Gravity
 enum Gravity {
@@ -174,8 +174,6 @@ enum class BorderStyle {
 	ITEM_DOWN_BG,
 };
 
-typedef float Size;  // can also be WRAP_CONTENT or FILL_PARENT.
-
 enum Orientation {
 	ORIENT_HORIZONTAL,
 	ORIENT_VERTICAL,

diff --git a/Common/UI/ViewGroup.cpp b/Common/UI/ViewGroup.cpp
@@ -22,7 +22,7 @@
 
 namespace UI {
 
-const float ITEM_HEIGHT = 64.f;
+static constexpr Size ITEM_HEIGHT = 64.f;
 
 void ApplyGravity(const Bounds outer, const Margins &margins, float w, float h, int gravity, Bounds &inner) {
 	inner.w = w;

diff --git a/Common/VR/VRFramebuffer.cpp b/Common/VR/VRFramebuffer.cpp
@@ -9,7 +9,6 @@
 
 #include <cstdio>
 #include <cstdlib>
-#include <cstdbool>
 #include <cstring>
 #include <cmath>
 #include <ctime>