Skip to content
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.

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

Changes to ease code compilation in gcc. V4 #541

Merged
merged 1 commit into from
Feb 24, 2018
Merged

Conversation

audetto
Copy link
Contributor

@audetto audetto commented Feb 21, 2018

Disk_t and HDD contain a std::string and for this reason they need a proper constructor, ZeroMemory is not guaranteed to work.

In this version there is no need to have a std::vector, as a c array actually initialises all items.

Signed-off-by: Andrea Odetti mariofutire@gmail.com

Disk_t and HDD contain a std::string and for this reason they need a proper constructor, ZeroMemory is not guaranteed to work.


Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
@tomcw
Copy link
Contributor

tomcw commented Feb 22, 2018

Great! Thanks for identifying this simplification (remaining with C-style arrays).

This LGTM, but I will give it some runtime testing before merging it into master.

@tomcw
Copy link
Contributor

tomcw commented Feb 24, 2018

A minor thing: why have you added HD_Insert() to the external interface in Harddisk.h?

@tomcw tomcw merged commit 6051bc5 into AppleWin:master Feb 24, 2018
@audetto
Copy link
Contributor Author

audetto commented Feb 24, 2018

It is committed now.
But HD_Insert is needed by the Qt frontend, strictly speaking not to compile in gcc.
Problem is that there is no way, other than calling HD_Select() to insert an image.

HD_select is OS specific and open a dialog window.

It is one of these cases where there is emulator code mixed with frontend - os specific code.

Andrea

@audetto audetto deleted the gcc_vs4 branch February 24, 2018 19:17
@tomcw
Copy link
Contributor

tomcw commented Feb 24, 2018

But HD_Insert is needed by the Qt frontend

I see... OK, I'll add a comment so that it's not removed from Harddisk.h.

NB. Configuration's Property Sheet Page ("Disk") calls HD_SelectImage() to pick the HDD image, and then internally calls HD_Insert().

@tomcw tomcw mentioned this pull request Mar 10, 2018
tomcw added a commit that referenced this pull request Mar 10, 2018
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.

None yet

2 participants