mention struct to compile without -fpermissive

DadSchoorse · Dec 12, 2019 · 0ec94ce · 0ec94ce
1 parent 9e9deda
commit 0ec94ce
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/source/effect_codegen_spirv.cpp b/source/effect_codegen_spirv.cpp
@@ -123,7 +123,7 @@ class codegen_spirv final : public codegen
 private:
 	struct type_lookup
 	{
-		type type;
+		struct type type;
 		spv::StorageClass storage;
 		bool is_ptr;
 		spv::Id id;

diff --git a/source/effect_expression.hpp b/source/effect_expression.hpp
@@ -129,12 +129,12 @@ namespace reshadefx
 			signed char swizzle[4];
 		};
 
-		type type = {};
+		struct type type = {};
 		uint32_t base = 0;
-		constant constant = {};
+		struct constant constant = {};
 		bool is_lvalue = false;
 		bool is_constant = false;
-		location location;
+		struct location location;
 		std::vector<operation> chain;
 
 		/// <summary>

diff --git a/source/effect_module.hpp b/source/effect_module.hpp
@@ -72,10 +72,10 @@ namespace reshadefx
 	/// </summary>
 	struct struct_member_info
 	{
-		type type;
+		struct type type;
 		std::string name;
 		std::string semantic;
-		location location;
+		struct location location;
 		uint32_t definition = 0;
 	};
 
@@ -84,7 +84,7 @@ namespace reshadefx
 	/// </summary>
 	struct annotation
 	{
-		type type;
+		struct type type;
 		std::string name;
 		constant value;
 	};
@@ -132,7 +132,7 @@ namespace reshadefx
 	struct uniform_info
 	{
 		std::string name;
-		type type;
+		struct type type;
 		uint32_t size = 0;
 		uint32_t offset = 0;
 		std::vector<annotation> annotations;

diff --git a/source/effect_preprocessor.hpp b/source/effect_preprocessor.hpp
@@ -92,14 +92,14 @@ namespace reshadefx
 	private:
 		struct if_level
 		{
-			token token;
+			struct token token;
 			bool value, skipping;
 			if_level *parent;
 		};
 		struct input_level
 		{
 			std::string name;
-			std::unique_ptr<lexer> lexer;
+			std::unique_ptr<class lexer> lexer;
 			token next_token;
 			std::stack<if_level> if_stack;
 			std::unordered_set<std::string> hidden_macros;

diff --git a/source/effect_symbol_table.hpp b/source/effect_symbol_table.hpp
@@ -39,8 +39,8 @@ namespace reshadefx
 	{
 		symbol_type op = symbol_type::invalid;
 		uint32_t id = 0;
-		type type = {};
-		constant constant = {};
+		struct type type = {};
+		struct constant constant = {};
 		const function_info *function = nullptr;
 	};
 
@@ -93,7 +93,7 @@ namespace reshadefx
 
 	private:
 		struct scoped_symbol : symbol {
-			scope scope; // Store scope with symbol data
+			struct scope scope; // Store scope with symbol data
 		};
 
 		scope _current_scope;

diff --git a/source/effect_token.hpp b/source/effect_token.hpp
@@ -190,7 +190,7 @@ namespace reshadefx
 	struct token
 	{
 		tokenid id;
-		location location;
+		struct location location;
 		size_t offset, length;
 		union
 		{