Merge pull request livecode#3199 from peter-b/misc/cleanup-mismatched-tags

peter-b · peter-b · commit f1b53da25680 · 2015-11-06T11:23:19.000Z
[Cleanup] Fix issues related to mismatched struct/class tags
diff --git a/config/emscripten-settings.gypi b/config/emscripten-settings.gypi
@@ -42,6 +42,8 @@
 		'-fno-exceptions',
 		'-fno-rtti',
 		'-std=<(c++_std)',
+
+		'-Werror=mismatched-tags',
 	],
 
 	'target_conditions':
diff --git a/engine/engine-sources.gypi b/engine/engine-sources.gypi
@@ -507,33 +507,33 @@
 			
 			# Group "Text"
 			'src/text.h',
-			'src/text-api.h',
-			'src/text-block.h',
-			'src/text-breakblock.h',
-			'src/text-breakingengine.h',
-			'src/text-cell.h',
-			'src/text-controlblock.h',
-			'src/text-imageblock.h',
-			'src/text-line.h',
-			'src/text-pane.h',
-			'src/text-paragraph.h',
-			'src/text-run.h',
-			'src/text-segment.h',
-			'src/text-simplebreakingengine.h',
+			#'src/text-api.h',
+			#'src/text-block.h',
+			#'src/text-breakblock.h',
+			#'src/text-breakingengine.h',
+			#'src/text-cell.h',
+			#'src/text-controlblock.h',
+			#'src/text-imageblock.h',
+			#'src/text-line.h',
+			#'src/text-pane.h',
+			#'src/text-paragraph.h',
+			#'src/text-run.h',
+			#'src/text-segment.h',
+			#'src/text-simplebreakingengine.h',
 			'src/text.cpp',
-			'src/text-api.cpp',
-			'src/text-block.cpp',
-			'src/text-breakblock.cpp',
-			'src/text-breakingengine.cpp',
-			'src/text-cell.cpp',
-			'src/text-controlblock.cpp',
-			'src/text-imageblock.cpp',
-			'src/text-line.cpp',
-			'src/text-pane.cpp',
-			'src/text-paragraph.cpp',
-			'src/text-run.cpp',
-			'src/text-segment.cpp',
-			'src/text-simplebreakingengine.cpp',
+			#'src/text-api.cpp',
+			#'src/text-block.cpp',
+			#'src/text-breakblock.cpp',
+			#'src/text-breakingengine.cpp',
+			#'src/text-cell.cpp',
+			#'src/text-controlblock.cpp',
+			#'src/text-imageblock.cpp',
+			#'src/text-line.cpp',
+			#'src/text-pane.cpp',
+			#'src/text-paragraph.cpp',
+			#'src/text-run.cpp',
+			#'src/text-segment.cpp',
+			#'src/text-simplebreakingengine.cpp',
 			
 			# Group "Desktop"
 			'src/quicktime.cpp',
diff --git a/engine/src/exec.h b/engine/src/exec.h
@@ -1046,7 +1046,7 @@ template<typename O, typename A, void (O::*Method)(MCExecContext&, MCNameRef, A)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-struct MCNativeControl;
+class MCNativeControl;
 struct MCNativeControlPtr
 {
     MCNativeControl *control;
diff --git a/engine/src/platform.h b/engine/src/platform.h
@@ -562,7 +562,7 @@ void MCPlatformWindowMaskRelease(MCPlatformWindowMaskRef mask);
 
 ////////////////////////////////////////////////////////////////////////////////
 
-typedef struct MCPlatformMenu *MCPlatformMenuRef;
+typedef class MCPlatformMenu *MCPlatformMenuRef;
 
 enum MCPlatformMenuItemProperty
 {

Original file line number	Diff line number	Diff line change
`@@ -1046,7 +1046,7 @@ template<typename O, typename A, void (O::*Method)(MCExecContext&, MCNameRef, A)`
`1046`	`1046`
`1047`	`1047`	`////////////////////////////////////////////////////////////////////////////////`
`1048`	`1048`
`1049`		`-struct MCNativeControl;`
	`1049`	`+class MCNativeControl;`
`1050`	`1050`	`struct MCNativeControlPtr`
`1051`	`1051`	`{`
`1052`	`1052`	`MCNativeControl *control;`
Original file line number	Diff line number	Diff line change
`@@ -562,7 +562,7 @@ void MCPlatformWindowMaskRelease(MCPlatformWindowMaskRef mask);`
`562`	`562`
`563`	`563`	`////////////////////////////////////////////////////////////////////////////////`
`564`	`564`
`565`		`-typedef struct MCPlatformMenu *MCPlatformMenuRef;`
	`565`	`+typedef class MCPlatformMenu *MCPlatformMenuRef;`
`566`	`566`
`567`	`567`	`enum MCPlatformMenuItemProperty`
`568`	`568`	`{`