Skip to content

Commit 238a510

Browse files
author
D. A. Pellegrino
committed
234 - Removed use of the deprecated C++ register keyword.
1 parent 96e01d9 commit 238a510

7 files changed

Lines changed: 11 additions & 13 deletions

File tree

libcds/include/libcdsTrees.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ namespace cds_utils
7878
}
7979

8080
/* writes e[p..p+len-1] = s, len <= W*/
81-
inline void bitwrite (register uint *e, register uint p, register uint len, register uint s) {
81+
inline void bitwrite (uint *e, uint p, uint len, uint s) {
8282
e += p/W;
8383
p %= W;
8484
if (len == W) {

libcds/src/static/coders/huff.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ namespace cds_static
139139
return H;
140140
}
141141

142-
void bitzero (register uint *e, register uint p,
143-
register uint len) {
142+
void bitzero (uint *e, uint p, uint len) {
144143

145144
e += p/W; p %= W;
146145
if (p+len >= W) {

libcds/src/static/suffixtree/RMQ_succinct.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ namespace cds_static
104104
unsigned int RMQ_succinct::log2fast(unsigned int v) {
105105
unsigned int c = 0; // c will be lg(v)
106106
// temporaries
107-
register unsigned int t, tt;
107+
unsigned int t, tt;
108108

109109
if ((tt = v >> 16))
110110
c = (t = v >> 24) ? 24 + LogTable256[t] : 16 + LogTable256[tt & 0xFF];

libcds/src/static/suffixtree/RMQ_succinct_lcp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ namespace cds_static
103103

104104
uint RMQ_succinct_lcp::log2fast(uint v) {
105105
uint c = 0; // c will be lg(v)
106-
register uint t, tt; // temporaries
106+
uint t, tt; // temporaries
107107

108108
if ((tt = v >> 16))
109109
c = (t = v >> 24) ? 24 + LogTable256[t] : 16 + LogTable256[tt & 0xFF];

libcds/src/static/suffixtree/factorization.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ namespace cds_static
5858
uint levelSizeAux[7]={0,0,0,0,0,0,0};
5959
uint cont[7]={0,0,0,0,0,0,0};
6060
listLength = l_Length;
61-
register uint i;
61+
uint i;
6262
int j, k;
6363
uint value, newvalue;
6464
uint bits_BS_len = 0;
@@ -139,7 +139,7 @@ namespace cds_static
139139

140140
uint factorization::access(uint param) {
141141
uint mult=0;
142-
register uint j;
142+
uint j;
143143
uint partialSum=0;
144144
uint ini=param-1;
145145
uint * bsData = ((BitSequenceRG *)bS)->data;
@@ -173,7 +173,7 @@ namespace cds_static
173173

174174
uint factorization::access_seq(uint param, size_t *next_pos, bool dir) {
175175
uint mult=0;
176-
register uint j;
176+
uint j;
177177
uint partialSum=0;
178178
uint ini=param-1;
179179
uint * bsData = ((BitSequenceRG *)bS)->data;

libcds/src/static/suffixtree/factorization_var.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace cds_static
4141
uint *cont;
4242
uint *contB;
4343
listLength = l_Length;
44-
register uint i;
44+
uint i;
4545
int j, k;
4646
uint value, newvalue;
4747
uint bits_BS_len = 0;
@@ -171,7 +171,7 @@ namespace cds_static
171171

172172
uint factorization_var::access(uint param) {
173173
uint mult=0;
174-
register uint j;
174+
uint j;
175175
uint partialSum=0;
176176
uint ini = param-1;
177177
unsigned char readByte;
@@ -200,7 +200,7 @@ namespace cds_static
200200

201201
uint factorization_var::access_seq(uint param, size_t *next_pos, bool dir) {
202202
uint mult=0;
203-
register uint j;
203+
uint j;
204204
uint partialSum=0;
205205
uint ini = param-1;
206206
unsigned char readByte;

libhdt/src/huffman/huff.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ namespace URICompressed{
162162
return H;
163163
}
164164

165-
void bitzero (register uint *e, register uint64_t p,
166-
register uint len) {
165+
void bitzero (uint *e, uint64_t p, uint len) {
167166

168167
e += p/W; p %= W;
169168
if (p+len >= W) {

0 commit comments

Comments
 (0)