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

Fixing some symbol names and compilation breaks in other code #120

Merged
merged 2 commits into from
Jun 28, 2024

Conversation

fosterbrereton
Copy link
Member

@fosterbrereton fosterbrereton commented Jun 28, 2024

Two fixes in this PR:

  • Rename stlab* symbols to adobe* in enum_ops.hpp so it does not conflict with stlab's definitions when the two libraries coexist.
  • Changing some definitions in modifiers_t so it will compile correctly when used by MSVC. There are some long-defunct Adobe Platform Libraries files that we still have to compile (unfortunately) that are now breaking when using newer releases of ASL & MSVC:
    [2024-06-28T02:41:28.820Z] [MB: 16028ms][DEBUG] [9]D:\path\to\adobe_platform_libraries\adobe\future\widgets\sources\button_helper.cpp(41,65): error C2440: 'return': cannot convert from 'int' to 'adobe::modifiers_t' [D:\path\to\adobe_platform_libraries.vcxproj]
    This fixes those compiler breaks long enough for us to revisit and remove those APL dependencies in a latter phase of our work.

These changes are on behalf of @baheath, who did the lion's share of compiler wrangling.

@sean-parent
Copy link
Member

LGTM.

@sean-parent sean-parent merged commit 4963697 into main Jun 28, 2024
5 checks passed
@fosterbrereton fosterbrereton deleted the fosterbrereton/compilation-fixes branch June 28, 2024 18:44
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