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

src: replace macro with lambda #13676

Closed
wants to merge 1 commit into from
Closed

src: replace macro with lambda #13676

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: 22 additions & 22 deletions src/base64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,28 +58,28 @@ bool base64_decode_group_slow(char* const dst, const size_t dstlen,
size_t* const i, size_t* const k) {
uint8_t hi;
uint8_t lo;
#define V(expr) \
for (;;) { \
const uint8_t c = src[*i]; \
lo = unbase64(c); \
*i += 1; \
if (lo < 64) \
break; /* Legal character. */ \
if (c == '=' || *i >= srclen) \
return false; /* Stop decoding. */ \
} \
expr; \
if (*i >= srclen) \
return false; \
if (*k >= dstlen) \
return false; \
hi = lo;
V(/* Nothing. */);
V(dst[(*k)++] = ((hi & 0x3F) << 2) | ((lo & 0x30) >> 4));
V(dst[(*k)++] = ((hi & 0x0F) << 4) | ((lo & 0x3C) >> 2));
V(dst[(*k)++] = ((hi & 0x03) << 6) | ((lo & 0x3F) >> 0));
#undef V
return true; // Continue decoding.
auto V = [&](auto expr) {
Copy link
Member

Choose a reason for hiding this comment

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

😢

In file included from ../src/inspector_socket.cc:6:0:
../src/base64.h: In function ‘bool node::base64_decode_group_slow(char*, size_t, const TypeName*, size_t, size_t*, size_t*)’:
../src/base64.h:60:16: error: use of ‘auto’ in lambda parameter declaration only available with -std=c++14 or -std=gnu++14
   auto V = [&](auto expr) {
                ^~~~

I’m not sure what to do about that. :/

Copy link
Contributor Author

@seishun seishun Jun 14, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

According to http://en.cppreference.com/w/cpp/compiler_support, polymorphic lambdas have been supported in GCC starting with version 4.9, which was released on April 22, 2014. Any reason why we can't require a compiler that's less than 3 years old?

According to this answer, -std=c++14 is supported in GCC from 5.2, but we can use -std=c++1y instead.

for (;;) {
const uint8_t c = src[*i];
lo = unbase64(c);
*i += 1;
if (lo < 64)
break; /* Legal character. */
if (c == '=' || *i >= srclen)
return false; /* Stop decoding. */
}
expr();
if (*i >= srclen)
return false;
if (*k >= dstlen)
return false;
hi = lo;
return true;
};
return V([] {}) &&
V([&] { dst[(*k)++] = ((hi & 0x3F) << 2) | ((lo & 0x30) >> 4); }) &&
V([&] { dst[(*k)++] = ((hi & 0x0F) << 4) | ((lo & 0x3C) >> 2); }) &&
V([&] { dst[(*k)++] = ((hi & 0x03) << 6) | ((lo & 0x3F) >> 0); });
}


Expand Down