Skip to content

Changed type to qbyte to avoid conflict with std #44

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

Closed
artuuuro wants to merge 1 commit into from
Closed

Changed type to qbyte to avoid conflict with std #44

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
44 changes: 23 additions & 21 deletions src/qball/Base64Transcoder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,18 @@ Base64Transcoder::Base64Transcoder()
}

////////////////////////////////////////////////////////////////////////////////
int Base64Transcoder::encode(int nbytes, const byte* const from, char* const to)
int Base64Transcoder::encode(int nbytes, const qbyte* const from, char* const to)
{
const byte* fptr = from;
const qbyte* fptr = from;
char* tptr = to;

int n3 = nbytes / 3; // number of groups of three bytes

while ( n3-- > 0 )
{
byte ig0 = *fptr++;
byte ig1 = *fptr++;
byte ig2 = *fptr++;
qbyte ig0 = *fptr++;
qbyte ig1 = *fptr++;
qbyte ig2 = *fptr++;

*tptr++ = etable[ig0 >> 2];
*tptr++ = etable[((ig0 & 3) << 4) | (ig1 >> 4)];
Expand All @@ -97,9 +97,9 @@ int Base64Transcoder::encode(int nbytes, const byte* const from, char* const to)

if ( nr == 2 )
{
byte ig0 = *fptr++;
byte ig1 = *fptr++;
byte ig2 = 0;
qbyte ig0 = *fptr++;
qbyte ig1 = *fptr++;
qbyte ig2 = 0;

*tptr++ = etable[ig0 >> 2];
*tptr++ = etable[((ig0 & 3) << 4) | (ig1 >> 4)];
Expand All @@ -108,8 +108,8 @@ int Base64Transcoder::encode(int nbytes, const byte* const from, char* const to)
}
else if ( nr == 1 )
{
byte ig0 = *fptr++;
byte ig1 = 0;
qbyte ig0 = *fptr++;
qbyte ig1 = 0;

*tptr++ = etable[ig0 >> 2];
*tptr++ = etable[((ig0 & 3) << 4) | (ig1 >> 4)];
Expand All @@ -122,7 +122,7 @@ int Base64Transcoder::encode(int nbytes, const byte* const from, char* const to)

////////////////////////////////////////////////////////////////////////////////
int Base64Transcoder::decode(const int nchars, const char* const from,
byte* const to)
qbyte* const to)
{
// Decode Base64 chars in array "from" into bytes in array "to"
// White space and new lines are skipped
Expand All @@ -131,11 +131,13 @@ int Base64Transcoder::decode(const int nchars, const char* const from,
// nchars: number of chars in array "from"
// the number of bytes successfully translated is returned

byte a0,a1,a2,a3,b0,b1,b2,b3;
qbyte a0,a1,a2,a3,b0,b1,b2,b3;

int c;
const char* fptr = from;
const char* const fptr_end = from+nchars+1;
byte* tptr = to;
qbyte* tptr = to;


while ( fptr < fptr_end-4 )
{
Expand All @@ -153,8 +155,8 @@ int Base64Transcoder::decode(const int nchars, const char* const from,
#endif
break;
}
a0 = (byte) c;
b0 = (byte) dtable[c];
a0 = (qbyte) c;
b0 = (qbyte) dtable[c];

do
{
Expand All @@ -169,8 +171,8 @@ int Base64Transcoder::decode(const int nchars, const char* const from,
#endif
break;
}
a1 = (byte) c;
b1 = (byte) dtable[c];
a1 = (qbyte) c;
b1 = (qbyte) dtable[c];

do
{
Expand All @@ -185,8 +187,8 @@ int Base64Transcoder::decode(const int nchars, const char* const from,
#endif
break;
}
a2 = (byte) c;
b2 = (byte) dtable[c];
a2 = (qbyte) c;
b2 = (qbyte) dtable[c];

do
{
Expand All @@ -201,8 +203,8 @@ int Base64Transcoder::decode(const int nchars, const char* const from,
#endif
break;
}
a3 = (byte) c;
b3 = (byte) dtable[c];
a3 = (qbyte) c;
b3 = (qbyte) dtable[c];

if ((b0|b1|b2|b3) & 0x80)
{
Expand Down
8 changes: 4 additions & 4 deletions src/qball/Base64Transcoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@
#include <cstdio>
#include <string>
using namespace std;
typedef unsigned char byte;
typedef unsigned char qbyte; // qball byte to avoid conflicts with std::byte

class Base64Transcoder
{
char etable[64]; // encode table
byte dtable[256]; // decode table
qbyte dtable[256]; // decode table

public:

Base64Transcoder();
int encode(int nbytes, const byte* const from, char* const to);
int decode(int nchars, const char* const from, byte* const to);
int encode(int nbytes, const qbyte* const from, char* const to);
int decode(int nchars, const char* const from, qbyte* const to);
void byteswap_double(size_t n, double* const x);
void byteswap_int(size_t n, int* const x);
int print(int nchars, const char* const buf, ostream& o);
Expand Down
4 changes: 2 additions & 2 deletions src/qball/SlaterDet.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2886,7 +2886,7 @@ void SlaterDet::print(ostream& os, string encoding) {
int outlen = xcdr.nchars(nbytes);
char* b = new char[outlen];
assert(b!=0);
xcdr.encode(nbytes,(byte*) &wftmpr[0],b);
xcdr.encode(nbytes,(qbyte*) &wftmpr[0],b);
// Note: optional x0,y0,z0 attributes not used, default is zero
os << "<grid_function type=\"double\""
<< " nx=\"" << ft.np0()
Expand Down Expand Up @@ -3146,7 +3146,7 @@ void SlaterDet::write(SharedFilePtr& sfp, string encoding, double weight, int is
int outlen = xcdr.nchars(nbytes);
char* b = new char[outlen];
assert(b!=0);
xcdr.encode(nbytes,(byte*) &tmpr[0],b);
xcdr.encode(nbytes,(qbyte*) &tmpr[0],b);
// Note: optional x0,y0,z0 attributes not used, default is zero
if ( ctxt_.myrow() == 0 )
{
Expand Down