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

Remove register keyword as it has been deprecated since c++17 #475

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove register keyword as it has been deprecated since c++17 #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2136663
fix pbs_tcp_timeout has a different language linkage
listout May 12, 2023
a560117
remove register storage class as it s been deprecate since c++17
listout May 12, 2023
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
2 changes: 1 addition & 1 deletion src/include/tcp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ int tcp_wcommit(struct tcp_chan *chan, int);
int tcp_rskip(struct tcp_chan *chan,size_t);
int tcp_chan_has_data(struct tcp_chan *chan);

extern time_t pbs_tcp_timeout;
extern "C" time_t pbs_tcp_timeout;
Copy link

@yselkowitz yselkowitz Sep 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

This causes an error with C, needs to be something like:

Suggested change
extern "C" time_t pbs_tcp_timeout;
#ifdef __cplusplus
extern "C" time_t pbs_tcp_timeout;
#else
extern time_t pbs_tcp_timeout;
#endif


#endif /* TCP_PBS_H */
2 changes: 1 addition & 1 deletion src/lib/Libattr/attr_func.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ svrattrl *attrlist_alloc(
int szval) /* I */

{
register size_t tsize;
size_t tsize;
svrattrl *pal;

/* alloc memory block <SVRATTRL><NAME><RESC><VAL> */
Expand Down
4 changes: 2 additions & 2 deletions src/resmom/cygwin/mom_mach.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2773,7 +2773,7 @@ char *sessions(
int njids = 0;
pid_t *jids, *hold;
static int maxjid = 200;
register pid_t jobid;
pid_t jobid;

if (attrib != NULL)
{
Expand Down Expand Up @@ -3024,7 +3024,7 @@ char *nusers(
int nuids = 0;
uid_t *uids, *hold;
static int maxuid = 200;
register uid_t uid;
uid_t uid;

if (attrib != NULL)
{
Expand Down
2 changes: 1 addition & 1 deletion src/resmom/linux/mom_mach.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4245,7 +4245,7 @@ const char *nusers(
int nuids = 0;
uid_t *uids, *hold;
static int maxuid = 200;
register uid_t uid;
uid_t uid;
#ifdef NUMA_SUPPORT
char mom_check_name[PBS_MAXSERVERNAME], *s;
job *pjob;
Expand Down
4 changes: 2 additions & 2 deletions src/resmom/mom_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1913,8 +1913,8 @@ void mom_server_all_update_stat(void)

long power(

register int x,
register int n)
int x,
int n)

{
register long p;
Expand Down
2 changes: 1 addition & 1 deletion src/resmom/mom_server_lib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ int send_update();

void mom_server_all_update_stat(void);

long power(register int x, register int n);
long power(int x, int n);

int calculate_retry_seconds(int count);

Expand Down
4 changes: 2 additions & 2 deletions src/resmom/solaris7/mom_mach.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1627,7 +1627,7 @@ sessions(struct rm_attribute *attrib)
int njids = 0;
pid_t *jids, *hold;
static int maxjid = 200;
register pid_t jobid;
pid_t jobid;

if (attrib)
{
Expand Down Expand Up @@ -1818,7 +1818,7 @@ nusers(struct rm_attribute *attrib)
int nuids = 0;
uid_t *uids, *hold;
static int maxuid = 200;
register uid_t uid;
uid_t uid;

if (attrib)
{
Expand Down
8 changes: 4 additions & 4 deletions src/server/node_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5310,10 +5310,10 @@ int node_avail(
char *pc;

std::vector<prop> plist;
register int xavail;
register int xalloc;
register int xresvd;
register int xdown;
int xavail;
int xalloc;
int xresvd;
int xdown;
int node_req = 1;
int gpu_req = 0;
int mic_req = 0;
Expand Down