Browse Source

Fix build on win32

Michael Ragazzon 6 years ago
parent
commit
461f328166
2 changed files with 2 additions and 2 deletions
  1. 1 1
      Include/RmlUi/Core/Variant.h
  2. 1 1
      Source/Core/StyleSheetParser.cpp

+ 1 - 1
Include/RmlUi/Core/Variant.h

@@ -148,7 +148,7 @@ private:
 	void Set(const FontEffectsPtr& value);
 	void Set(const FontEffectsPtr& value);
 	void Set(FontEffectsPtr&& value);
 	void Set(FontEffectsPtr&& value);
 	
 	
-	static constexpr size_t LOCAL_DATA_SIZE = sizeof(TransitionList);
+	static constexpr size_t LOCAL_DATA_SIZE = (sizeof(TransitionList) > sizeof(String) ? sizeof(TransitionList) : sizeof(String));
 
 
 	Type type;
 	Type type;
 	alignas(TransitionList) char data[LOCAL_DATA_SIZE];
 	alignas(TransitionList) char data[LOCAL_DATA_SIZE];

+ 1 - 1
Source/Core/StyleSheetParser.cpp

@@ -150,7 +150,7 @@ static bool IsValidIdentifier(const String& str)
 	if (str.empty())
 	if (str.empty())
 		return false;
 		return false;
 
 
-	for (int i = 0; i < str.size(); i++)
+	for (size_t i = 0; i < str.size(); i++)
 	{
 	{
 		char c = str[i];
 		char c = str[i];
 		bool valid = (
 		bool valid = (