Merge remote-tracking branch 'origin/develop' into rtti

anpilog · Oct 4, 2021 · d36b490 · d36b490
2 parents 745f92b + 728cff8
commit d36b490
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Source/buildbindingccpp.go b/Source/buildbindingccpp.go
@@ -1365,7 +1365,11 @@ func buildCppHeader(component ComponentDefinition, w LanguageWriter, NameSpace s
 	w.Writeln("  {")
 	w.Writeln("    %s_uint32 nMajor, nMinor, nMicro;", NameSpace)
 	w.Writeln("    %s(nMajor, nMinor, nMicro);", global.VersionMethod)
-	w.Writeln("    if ( (nMajor != %s_VERSION_MAJOR) || (nMinor < %s_VERSION_MINOR) ) {", strings.ToUpper(NameSpace), strings.ToUpper(NameSpace))
+	if minorVersion(component.Version) > 0 {
+		w.Writeln("    if ( (nMajor != %s_VERSION_MAJOR) || (nMinor < %s_VERSION_MINOR) ) {", strings.ToUpper(NameSpace), strings.ToUpper(NameSpace))
+	} else {
+		w.Writeln("    if (nMajor != %s_VERSION_MAJOR) {", strings.ToUpper(NameSpace))
+	}
 	w.Writeln("      return %s_ERROR_INCOMPATIBLEBINARYVERSION;", strings.ToUpper(NameSpace))
 	w.Writeln("    }")
 	w.Writeln("    return %s_SUCCESS;", strings.ToUpper(NameSpace))

diff --git a/Source/buildbindingcsharp.go b/Source/buildbindingcsharp.go
@@ -979,7 +979,7 @@ func buildBindingCSharpImplementation(component ComponentDefinition, w LanguageW
 			}
 		}
 
-		w.Writeln("  class C%s %s", class.ClassName, CSharpParentClassName)
+		w.Writeln("  public class C%s %s", class.ClassName, CSharpParentClassName)
 		w.Writeln("  {")
 
 		if component.isBaseClass(class) {