Skip to content

Commit d36b490

Browse files
committed
Merge remote-tracking branch 'origin/develop' into rtti
2 parents 745f92b + 728cff8 commit d36b490

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Source/buildbindingccpp.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1365,7 +1365,11 @@ func buildCppHeader(component ComponentDefinition, w LanguageWriter, NameSpace s
13651365
w.Writeln(" {")
13661366
w.Writeln(" %s_uint32 nMajor, nMinor, nMicro;", NameSpace)
13671367
w.Writeln(" %s(nMajor, nMinor, nMicro);", global.VersionMethod)
1368-
w.Writeln(" if ( (nMajor != %s_VERSION_MAJOR) || (nMinor < %s_VERSION_MINOR) ) {", strings.ToUpper(NameSpace), strings.ToUpper(NameSpace))
1368+
if minorVersion(component.Version) > 0 {
1369+
w.Writeln(" if ( (nMajor != %s_VERSION_MAJOR) || (nMinor < %s_VERSION_MINOR) ) {", strings.ToUpper(NameSpace), strings.ToUpper(NameSpace))
1370+
} else {
1371+
w.Writeln(" if (nMajor != %s_VERSION_MAJOR) {", strings.ToUpper(NameSpace))
1372+
}
13691373
w.Writeln(" return %s_ERROR_INCOMPATIBLEBINARYVERSION;", strings.ToUpper(NameSpace))
13701374
w.Writeln(" }")
13711375
w.Writeln(" return %s_SUCCESS;", strings.ToUpper(NameSpace))

Source/buildbindingcsharp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ func buildBindingCSharpImplementation(component ComponentDefinition, w LanguageW
979979
}
980980
}
981981

982-
w.Writeln(" class C%s %s", class.ClassName, CSharpParentClassName)
982+
w.Writeln(" public class C%s %s", class.ClassName, CSharpParentClassName)
983983
w.Writeln(" {")
984984

985985
if component.isBaseClass(class) {

0 commit comments

Comments
 (0)