|
|
@ -117,7 +117,7 @@ namespace CppSharp.Generators.CLI |
|
|
|
var returnVarName = Context.ReturnVarName; |
|
|
|
var returnVarName = Context.ReturnVarName; |
|
|
|
if (quals.IsConst != Context.ReturnType.Qualifiers.IsConst) |
|
|
|
if (quals.IsConst != Context.ReturnType.Qualifiers.IsConst) |
|
|
|
{ |
|
|
|
{ |
|
|
|
var nativeTypePrinter = new CppTypePrinter(Context.Driver.TypeDatabase, false); |
|
|
|
var nativeTypePrinter = new CppTypePrinter(false); |
|
|
|
var returnType = Context.ReturnType.Type.Desugar(); |
|
|
|
var returnType = Context.ReturnType.Type.Desugar(); |
|
|
|
var constlessPointer = new PointerType() |
|
|
|
var constlessPointer = new PointerType() |
|
|
|
{ |
|
|
|
{ |
|
|
@ -137,7 +137,7 @@ namespace CppSharp.Generators.CLI |
|
|
|
Modifier = pointer.Modifier, |
|
|
|
Modifier = pointer.Modifier, |
|
|
|
QualifiedPointee = new QualifiedType(pointee) |
|
|
|
QualifiedPointee = new QualifiedType(pointee) |
|
|
|
}; |
|
|
|
}; |
|
|
|
var nativeTypePrinter = new CppTypePrinter(Context.Driver.TypeDatabase); |
|
|
|
var nativeTypePrinter = new CppTypePrinter(); |
|
|
|
var nativeTypeName = desugaredPointer.Visit(nativeTypePrinter, quals); |
|
|
|
var nativeTypeName = desugaredPointer.Visit(nativeTypePrinter, quals); |
|
|
|
Context.Return.Write("reinterpret_cast<{0}>({1})", nativeTypeName, |
|
|
|
Context.Return.Write("reinterpret_cast<{0}>({1})", nativeTypeName, |
|
|
|
returnVarName); |
|
|
|
returnVarName); |
|
|
@ -516,7 +516,7 @@ namespace CppSharp.Generators.CLI |
|
|
|
{ |
|
|
|
{ |
|
|
|
var function = pointee as FunctionType; |
|
|
|
var function = pointee as FunctionType; |
|
|
|
|
|
|
|
|
|
|
|
var cppTypePrinter = new CppTypePrinter(Context.Driver.TypeDatabase); |
|
|
|
var cppTypePrinter = new CppTypePrinter(); |
|
|
|
var cppTypeName = pointer.Visit(cppTypePrinter, quals); |
|
|
|
var cppTypeName = pointer.Visit(cppTypePrinter, quals); |
|
|
|
|
|
|
|
|
|
|
|
return VisitDelegateType(function, cppTypeName); |
|
|
|
return VisitDelegateType(function, cppTypeName); |
|
|
@ -545,7 +545,7 @@ namespace CppSharp.Generators.CLI |
|
|
|
var finalPointee = pointer.GetFinalPointee(); |
|
|
|
var finalPointee = pointer.GetFinalPointee(); |
|
|
|
if (finalPointee.IsPrimitiveType()) |
|
|
|
if (finalPointee.IsPrimitiveType()) |
|
|
|
{ |
|
|
|
{ |
|
|
|
var cppTypePrinter = new CppTypePrinter(Context.Driver.TypeDatabase); |
|
|
|
var cppTypePrinter = new CppTypePrinter(); |
|
|
|
var cppTypeName = pointer.Visit(cppTypePrinter, quals); |
|
|
|
var cppTypeName = pointer.Visit(cppTypePrinter, quals); |
|
|
|
|
|
|
|
|
|
|
|
Context.Return.Write("({0})", cppTypeName); |
|
|
|
Context.Return.Write("({0})", cppTypeName); |
|
|
@ -613,7 +613,7 @@ namespace CppSharp.Generators.CLI |
|
|
|
cppTypeName = "::" + typedef.Declaration.QualifiedOriginalName; |
|
|
|
cppTypeName = "::" + typedef.Declaration.QualifiedOriginalName; |
|
|
|
else |
|
|
|
else |
|
|
|
{ |
|
|
|
{ |
|
|
|
var cppTypePrinter = new CppTypePrinter(Context.Driver.TypeDatabase); |
|
|
|
var cppTypePrinter = new CppTypePrinter(); |
|
|
|
cppTypeName = decl.Type.Visit(cppTypePrinter, quals); |
|
|
|
cppTypeName = decl.Type.Visit(cppTypePrinter, quals); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|