Skip to content

Support C++20 #8

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

Open
agagniere wants to merge 1 commit into
base: stable
Choose a base branch
from
Open

Support C++20 #8

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/lib/CommandLine/getopt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ struct option
/* Many other libraries have conflicting prototypes for getopt, with
differences in the consts, in stdlib.h. To avoid compilation
errors, only prototype getopt for the GNU C library. */
extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
extern int getopt (int __argc, char *const *__argv, const char *__shortopts)
__THROW __nonnull ((2,3));
# endif /* __GNU_LIBRARY__ */

# ifndef __need_getopt
Expand Down
3 changes: 1 addition & 2 deletions core/lib/FileHandling/RINEX/RinexClockBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ namespace gnsstk

string RinexClockBase::writeTime(const CivilTime& dt) const
{
if (dt == CommonTime::BEGINNING_OF_TIME)
if (dt == CivilTime(CommonTime::BEGINNING_OF_TIME))
{
return std::string(26, ' ');
}
Expand Down Expand Up @@ -111,4 +111,3 @@ namespace gnsstk


} // namespace

2 changes: 1 addition & 1 deletion core/lib/Geomatics/SatPass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ namespace gnsstk
dt = N * dt;
return;
}
if (refTime == CommonTime::BEGINNING_OF_TIME)
if (refTime == Epoch(CommonTime::BEGINNING_OF_TIME))
{
refTime = firstTime;
}
Expand Down
2 changes: 1 addition & 1 deletion core/lib/Geomatics/SatPassUtilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ namespace gnsstk
continue;
}

if (prevtime != CommonTime::BEGINNING_OF_TIME)
if (prevtime != Epoch(CommonTime::BEGINNING_OF_TIME))
{
// compute time since the last epoch
dt = obsdata.time - prevtime;
Expand Down