Skip to content

Issue #831: Fix compile issues on MinGW#845

Merged
alaindargelas merged 1 commit intochipsalliance:masterfrom
hs-apotell:Issue#831
Dec 23, 2022
Merged

Issue #831: Fix compile issues on MinGW#845
alaindargelas merged 1 commit intochipsalliance:masterfrom
hs-apotell:Issue#831

Conversation

@hs-apotell
Copy link
Collaborator

Issue actions/runner-images#831: Fix compile issues on MinGW

  • Use WIN32_LEAN_AND_MEAN when building on Windows to avoid pulling in irrelevant headers
  • Rename "interface" to "interface_inst" to avoid conflicting with system defined class with the same name.
  • Rename "module" to "module_inst" since the latter is now a C++ reserved word as of C++ 20.

* Use WIN32_LEAN_AND_MEAN when building on Windows to avoid pulling in
  irrelevant headers
* Rename "interface" to "interface_inst" to avoid conflicing with system
  defined class with the same name.
* Rename "module" to "module_inst" since the latter is now a C++
  reserved word as of C++ 20.
@hs-apotell hs-apotell marked this pull request as draft December 23, 2022 08:32
@hs-apotell hs-apotell marked this pull request as ready for review December 23, 2022 09:50
@hs-apotell
Copy link
Collaborator Author

The mac build failure is fixed by actions/runner-images#846. It's a CI runner image issue and not specific to Surelog or UHDM.

@alaindargelas alaindargelas merged commit 46b7b0f into chipsalliance:master Dec 23, 2022
@hs-apotell hs-apotell deleted the Issue#831 branch December 23, 2022 20:33
@alaindargelas
Copy link
Collaborator

alaindargelas commented Jan 15, 2023

@hs-apotell, I'm just realizing now what changed here.
There was no reason to change vpiModule into vpiModuleInst. Same with vpiInstance,. These are the STANDARD Verilog object model names. They pose no issue to the MinGW compiler....
Please submit a PR ASAP to revert back to vpiModule and vpiInstance.
The "module" class can be changed to module_inst, but not the vpiModule name which is in the standard.

There was no mention of the changes you made in the vpi_user.h in the explanation above.

Please do not change the content of vpi_user.h or sv_vpi_user.h without an explicit discussion. These are standard files.

@alaindargelas
Copy link
Collaborator

I opened #859

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants