Skip to content

Commit b33a87d

Browse files
committed
src: remove STATIC_ASSERT() macro
This macro does not not rightfully belong in node.h, remove it. Replace the one use site with a C++11 `static_assert` construct.
1 parent 2d82cdf commit b33a87d

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

src/node.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,6 @@ NODE_EXTERN v8::Handle<v8::Value> MakeCallback(
148148
#define NODE_STRINGIFY_HELPER(n) #n
149149
#endif
150150

151-
#ifndef STATIC_ASSERT
152-
#if defined(_MSC_VER)
153-
# define STATIC_ASSERT(expr) static_assert(expr, "")
154-
# else
155-
# define STATIC_ASSERT(expr) static_cast<void>((sizeof(char[-1 + !!(expr)])))
156-
# endif
157-
#endif
158-
159151
#ifdef _WIN32
160152
// TODO(tjfontaine) consider changing the usage of ssize_t to ptrdiff_t
161153
#if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED)

src/node_v8_platform.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ void Platform::WorkerBody(void* arg) {
101101
TaskQueue::TaskQueue() {
102102
int err;
103103

104-
STATIC_ASSERT(kRingSize == (kRingSize & (~(kRingSize - 1))));
104+
static_assert(kRingSize == (kRingSize & (~(kRingSize - 1))),
105+
"kRingSize is not a power of two");
105106

106107
size_ = kRingSize;
107108
ring_ = new Task*[size_];

0 commit comments

Comments
 (0)