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

Replace STL-like containers by their STL counterparts #890

Merged
merged 4 commits into from Apr 29, 2019
Merged

Conversation

gervandiepen
Copy link
Contributor

Classes Map (and variations), List, Queue and Stack have been replaced by their STL counterparts.
These Casacore classes are not built/installed anymore unless -DBUILD_DEPRECATED is given to cmake.

Close #118

@dpetry
Copy link
Contributor

dpetry commented Apr 1, 2019

MSConcat is making use of simpleOrderedMap a lot. Did you already look at that?

@dpetry
Copy link
Contributor

dpetry commented Apr 1, 2019

OK, I looked at your changes to MSConcat and you definitely did look at it. :)
Question: you had to define an inline function getMapValue(). Is not even this simple functionality provided by the STL map? I am wondering why we are abandoning the CASA simpleOrderedMap if the STL version offers so few features ...

@gervandiepen
Copy link
Contributor Author

gervandiepen commented Apr 1, 2019 via email

@gervandiepen
Copy link
Contributor Author

Darrell Schiebel has built and tested the CASA package using this PR. All rests pass, so it can be merged.

@gervandiepen gervandiepen merged commit cf041e4 into master Apr 29, 2019
@gijzelaerr gijzelaerr deleted the issue118 branch May 14, 2019 12:35
@gijzelaerr gijzelaerr added this to the 3.1.1 milestone May 21, 2019
@AlexKurek
Copy link

I tried to use this flag in 3.1.2 and I got:

cmake -DCMAKE_INSTALL_PREFIX=${INSTALLDIR}/casacore/ -DDATA_DIR=${INSTALLDIR}/casacore/data -DBUILD_PYTHON3=ON -DBUILD_PYTHON=OFF -DPYTHON3_EXECUTABLE=/usr/bin/python3 -DENABLE_TABLELOCKING=OFF -DUSE_OPENMP=ON -DUSE_FFTW3=TRUE -DUSE_HDF5=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="${CXX_FLAGS} -fsigned-char -DNDEBUG" -DBUILD_DEPRECATED ../src/

Parse error in command line argument: -DBUILD_DEPRECATED
Should be: VAR:type=value
CMake Error: No cmake script provided.
CMake Error: Problem processing arguments. Aborting.

@tammojan
Copy link
Contributor

Try with -DBUILD_DEPRECATED=True.

@sarrvesh
Copy link

sarrvesh commented Feb 3, 2020

I am facing the same issue while compiling casarest with casacore 3.2.1. I tried casarest master and 1.5.0. Following the comments above, I tried using the branch useSTL and it fails with a different error:

[ 29%] Building CXX object msvis/CMakeFiles/casa_msvis.dir/MSVis/CalVisBuffer.cc.o
In file included from /casarest/msvis/MSVis/VisBuffer.h:39:0,
from /casarest/msvis/MSVis/CalVisBuffer.h:32,
from /casarest/msvis/MSVis/CalVisBuffer.cc:28:
/casarest/msvis/MSVis/VisibilityIterator.h:566:17: error: 'ROMSColumns' does not name a type; did you mean 'MSColumns'?
virtual const ROMSColumns& msColumns() const
^~~~~~~~~~~
MSColumns
In file included from /casarest/msvis/MSVis/CalVisBuffer.h:32:0,
from /casarest/msvis/MSVis/CalVisBuffer.cc:28:
/casarest/msvis/MSVis/VisBuffer.h:644:19: error: 'ROMSColumns' does not name a type; did you mean 'MSColumns'?
virtual const ROMSColumns & msColumns() const {
^~~~~~~~~~~
MSColumns
msvis/CMakeFiles/casa_msvis.dir/build.make:86: recipe for target 'msvis/CMakeFiles/casa_msvis.dir/MSVis/CalVisBuffer.cc.o' failed

@schiebel
Copy link
Contributor

schiebel commented Feb 3, 2020

I believe ROMSColumns has been removed. MSColumns should be used even for read-only usage.

@bennahugo
Copy link

bennahugo commented Feb 3, 2020

Workaround with -DBUILD_DEPRECATED=True as in dockerfile of casacore/casarest#31

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.

Discussion: Replace List,Map, etc. by STL counterparts
8 participants