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

fix: Use correct conversion from JSON to Material #754

Merged
merged 5 commits into from
Mar 23, 2021

Conversation

beomki-yeo
Copy link
Contributor

Two lines in MaterialJsonConverter.cpp of Json plugins showed the following compile error:
call of overloaded ‘Material(const value_type&)’ is ambiguous

Looks like "at" method of json objects causes the ambiguity issue, so I changed it to "get" method to resolve it (suggested by @paulgessinger)

@codecov
Copy link

codecov bot commented Mar 19, 2021

Codecov Report

Merging #754 (dd2dcf0) into master (f8c504e) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #754   +/-   ##
=======================================
  Coverage   48.86%   48.86%           
=======================================
  Files         325      325           
  Lines       16682    16682           
  Branches     7791     7791           
=======================================
  Hits         8151     8151           
  Misses       3061     3061           
  Partials     5470     5470           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f8c504e...dd2dcf0. Read the comment docs.

@paulgessinger
Copy link
Member

In principle this looks fine, but the material conversion unit tests seem to fail. Could you have a look?

@paulgessinger paulgessinger changed the title fix: Json hotfix fix: Use correct conversion from JSON to Material Mar 19, 2021
@paulgessinger paulgessinger added this to the next milestone Mar 19, 2021
@beomki-yeo
Copy link
Contributor Author

it is fixed now

@asalzburger
Copy link
Contributor

Updating - @Corentin-Allaire - can you review, please?

Copy link
Contributor

@Corentin-Allaire Corentin-Allaire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@asalzburger asalzburger merged commit 34e75e6 into acts-project:master Mar 23, 2021
@beomki-yeo beomki-yeo deleted the json_hotfix branch March 24, 2021 23:15
@paulgessinger paulgessinger modified the milestones: next, v7.0.0 Apr 8, 2021
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

4 participants