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.

Sign up for GitHub

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

Jump to bottom

clean up things that were missed in PR #1172 #1176

Merged
merged 1 commit into from
Mar 31, 2022
Merged

clean up things that were missed in PR #1172 #1176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions casa/Utilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@
#include <casacore/casa/Utilities/GenSort.h>
#include <casacore/casa/Utilities/Notice.h>
#include <casacore/casa/Utilities/PtrHolder.h>
#include <casacore/casa/Utilities/RegSequence.h>
#include <casacore/casa/Utilities/Regex.h>
#include <casacore/casa/Utilities/Register.h>
#include <casacore/casa/Utilities/Sequence.h>
#include <casacore/casa/Utilities/Sort.h>
#include <casacore/casa/Utilities/SortError.h>
Expand Down Expand Up @@ -125,9 +123,7 @@ namespace casacore { //# NAMESPACE CASACORE - BEGIN
// of any datatype can be derived from the base class
// <linkto class=Sequence>Sequence</linkto>.
// One example is <linkto class=uIntSequence>uIntSequence</linkto>,
// provided for general use. Another is
// <linkto class=RegSequence>RegSequence</linkto>, exclusively used
// by the <linkto group="Register.h#register">Register</linkto> function.
// provided for general use.
// <li> <linkto class=String>Strings</linkto>.
// for the C++ preprocessor
// </ul>
Expand Down
2 changes: 1 addition & 1 deletion casa/Utilities/Sequence2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
namespace casacore { //# NAMESPACE CASACORE - BEGIN

#if defined(USE_THREADS)
std::atomic<uInt> uIntSequence::next(1); // start at 1 to stay in sync with RegSequence
std::atomic<uInt> uIntSequence::next(1); // start at 1 to stay in sync with RegSequence, FIXME fix comment, RegSequnce no longer exists
tammojan marked this conversation as resolved.
Show resolved Hide resolved
#else
uInt uIntSequence::next = 1;
#endif
Expand Down