Skip to content

Fixed a bug causing the header file to be included twice #1803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tritao merged 1 commit into from
Dec 7, 2023
Merged

Fixed a bug causing the header file to be included twice #1803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Generator/Generators/C/CppHeaders.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using CppSharp.AST;
using CppSharp.AST.Extensions;
Expand Down Expand Up @@ -87,7 +88,8 @@ public void GenerateIncludeForwardRefs(TranslationUnit unit)
if (typeRef.Include.TranslationUnit == unit)
continue;

if (typeRef.Include.File == unit.FileName)
var filename = Context.Options.GenerateName != null ? $"{Context.Options.GenerateName(TranslationUnit)}{Path.GetExtension(TranslationUnit.FileName)}" : TranslationUnit.FileName;
if (typeRef.Include.File == filename)
continue;

var include = typeRef.Include;
Expand Down
3 changes: 2 additions & 1 deletion src/Generator/Generators/C/CppSources.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ public virtual void GenerateForwardReferenceHeaders(TranslationUnit unit)

foreach (var typeRef in typeReferenceCollector.TypeReferences)
{
if (typeRef.Include.File == unit.FileName)
var filename = Context.Options.GenerateName != null ? $"{Context.Options.GenerateName(TranslationUnit)}{Path.GetExtension(TranslationUnit.FileName)}" : TranslationUnit.FileName;
if (typeRef.Include.File == filename)
continue;

var include = typeRef.Include;
Expand Down
4 changes: 3 additions & 1 deletion src/Generator/Generators/CLI/CLIHeaders.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using CppSharp.AST;
using CppSharp.AST.Extensions;
Expand Down Expand Up @@ -61,7 +62,8 @@ public void GenerateIncludeForwardRefs()
if (typeRef.Include.TranslationUnit == TranslationUnit)
continue;

if (typeRef.Include.File == TranslationUnit.FileName)
var filename = Context.Options.GenerateName != null ? $"{Context.Options.GenerateName(TranslationUnit)}{Path.GetExtension(TranslationUnit.FileName)}" : TranslationUnit.FileName;
if (typeRef.Include.File == filename)
continue;

var include = typeRef.Include;
Expand Down
4 changes: 3 additions & 1 deletion src/Generator/Generators/CLI/CLISources.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using CppSharp.AST;
using CppSharp.AST.Extensions;
Expand Down Expand Up @@ -61,7 +62,8 @@ public void GenerateForwardReferenceHeaders()

foreach (var typeRef in typeReferenceCollector.TypeReferences)
{
if (typeRef.Include.File == TranslationUnit.FileName)
var filename = Context.Options.GenerateName != null ? $"{Context.Options.GenerateName(TranslationUnit)}{Path.GetExtension(TranslationUnit.FileName)}" : TranslationUnit.FileName;
if (typeRef.Include.File == filename)
continue;

var include = typeRef.Include;
Expand Down