Skip to content
Merged
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions src/java.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "java.h"
#include <string.h>
#include <string>
#ifdef WIN32
#else
#include <unistd.h>
Expand Down Expand Up @@ -1050,10 +1050,11 @@ NAN_METHOD(Java::instanceOf) {
void EIO_CallJs(uv_work_t* req) {
}

static std::string int_to_string(int i) {
char buf[32];
snprintf(buf, sizeof(buf), "%d", i);
return std::string(buf);
template <typename T>
std::string to_string(T value) {
std::ostringstream os;
os << value;
return os.str();
}

#if NODE_MINOR_VERSION >= 10
Expand All @@ -1071,7 +1072,7 @@ void EIO_AfterCallJs(uv_work_t* req) {
int ret = dynamicProxyData->java->getJvm()->GetEnv((void**)&env, JNI_BEST_VERSION);
if (ret != JNI_OK) {
dynamicProxyData->throwableClass = "java/lang/IllegalStateException";
dynamicProxyData->throwableMessage = "Could not retrieve JNIEnv: jvm->GetEnv returned " + int_to_string(ret);
dynamicProxyData->throwableMessage = "Could not retrieve JNIEnv: jvm->GetEnv returned " + to_string<int>(ret);
dynamicProxyData->done = DYNAMIC_PROXY_JS_ERROR;
return;
}
Expand Down