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

std::array removals #2559

Merged
merged 2 commits into from
Mar 23, 2023
Merged

std::array removals #2559

merged 2 commits into from
Mar 23, 2023

Conversation

neheb
Copy link
Collaborator

@neheb neheb commented Mar 23, 2023

No description provided.

@neheb
Copy link
Collaborator Author

neheb commented Mar 23, 2023

@kmilos should fix CLANG64 compilation.

@neheb
Copy link
Collaborator Author

neheb commented Mar 23, 2023

From my reading of the code, Exiv2::ExifData::const_iterator evaluates to std::list::const_iterator. It's interesting that only CLANG64 on MSYS2 fails to compile.

@ghost
Copy link

ghost commented Mar 23, 2023

👇 Click on the image for a new way to code review

Review these changes using an interactive CodeSee Map

Legend

CodeSee Map legend

@codecov
Copy link

codecov bot commented Mar 23, 2023

Codecov Report

Merging #2559 (fafd43b) into main (513b0e8) will not change coverage.
The diff coverage is 66.66%.

❗ Current head fafd43b differs from pull request most recent head 65f15a3. Consider uploading reports for the commit 65f15a3 to get more accurate results

@@           Coverage Diff           @@
##             main    #2559   +/-   ##
=======================================
  Coverage   63.90%   63.90%           
=======================================
  Files         103      103           
  Lines       22398    22398           
  Branches    10830    10830           
=======================================
  Hits        14314    14314           
  Misses       5863     5863           
  Partials     2221     2221           
Impacted Files Coverage Δ
src/cr2image.cpp 19.04% <0.00%> (ø)
src/datasets.cpp 91.92% <ø> (ø)
src/tags.cpp 68.00% <ø> (ø)
src/tiffimage.cpp 72.34% <100.00%> (ø)
src/tiffvisitor_int.cpp 80.76% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@kmilos
Copy link
Collaborator

kmilos commented Mar 23, 2023

Exiv2::ExifData::const_iterator evaluates to std::list::const_iterator

Yeah, but we're not initializing the array with the return value, but with the function pointer, no? And that's not a literal either, but should be known/constant at compile time?

Anyhow, it would good if @1div0 could spare us a minute and try main w/ -DBUILD_SAMPLES=ON on his F38 using Clang 15 as well please?

src/cr2image.cpp Outdated Show resolved Hide resolved
@1div0
Copy link
Collaborator

1div0 commented Mar 23, 2023

Exiv2::ExifData::const_iterator evaluates to std::list::const_iterator

Yeah, but we're not initializing the array with the return value, but with the function pointer, no? And that's not a literal either, but should be known/constant at compile time?

Anyhow, it would good if @1div0 could spare us a minute and try main w/ -DBUILD_SAMPLES=ON on his F38 using Clang 15 as well please?

Sure, will do in the evening or WE. 2 busy now.

@neheb
Copy link
Collaborator Author

neheb commented Mar 23, 2023

Exiv2::ExifData::const_iterator evaluates to std::list::const_iterator

Yeah, but we're not initializing the array with the return value, but with the function pointer, no? And that's not a literal either, but should be known/constant at compile time?

Anyhow, it would good if @1div0 could spare us a minute and try main w/ -DBUILD_SAMPLES=ON on his F38 using Clang 15 as well please?

Yeah it should be. Probably a big with clang-15.

const_iterator is not constexpr. clang 15 on MSYS2 fails to compile
because of this.

Signed-off-by: Rosen Penev <[email protected]>
Signed-off-by: Rosen Penev <[email protected]>
Copy link
Collaborator

@kmilos kmilos left a comment

Choose a reason for hiding this comment

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

LGTM, but let's not merge just yet, until @1div0 can give feedback on main as is

@neheb
Copy link
Collaborator Author

neheb commented Mar 23, 2023

OK

@1div0
Copy link
Collaborator

1div0 commented Mar 23, 2023

@neheb neheb merged commit 05f2731 into Exiv2:main Mar 23, 2023
@neheb neheb deleted the mf branch March 23, 2023 20:29
@neheb
Copy link
Collaborator Author

neheb commented Mar 23, 2023

That error seems unrelated. Also, why are you building Jzon.cpp? That was removed from CMake quite a while ago.

edit:hmmm I ran that exiv2 command on my local Picture collection. I got

Uncaught exception: Overflow in Exiv2::DataBuf::c_data

in a specific folder. Can't get a backtrace with gdb for some reason.

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.

3 participants