Skip to content

Commit 608829b

Browse files
jheckingjhecking
authored
Merge pull request #287 from aerospike/node11-deprecation-warnings
Fix deprecation warnings in Node 10.12 & 11 builds
2 parents 716cd61 + 640bfd1 commit 608829b

36 files changed

+177
-164
lines changed

‎.appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ image:
44
platform: x64
55
environment:
66
matrix:
7+
- nodejs_version: "10"
78
- nodejs_version: "8"
89
- nodejs_version: "6"
9-
- nodejs_version: "4"
1010

1111
install:
1212
- ps: Install-Product node $env:nodejs_version $env:platform

‎binding.gyp

+13
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,19 @@
100100
'src/include',
101101
"<!(node -e \"require('nan')\")",
102102
],
103+
'configurations': {
104+
'Release': {
105+
"cflags": [
106+
"-Wno-deprecated-declarations",
107+
],
108+
"xcode_settings": {
109+
"OTHER_CFLAGS": [
110+
"-Wno-deprecated-declarations",
111+
],
112+
},
113+
'msvs_disabled_warnings': [4996],
114+
},
115+
},
103116
'conditions': [
104117
['OS=="linux"',{
105118
'libraries': [

‎src/main/aerospike.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ NAN_METHOD(register_as_event_loop)
4646

4747
as_policy_event policy;
4848
as_policy_event_init(&policy);
49-
eventpolicy_from_jsobject(&policy, info[0]->ToObject(), &g_log_info);
49+
eventpolicy_from_jsobject(&policy, info[0].As<Object>(), &g_log_info);
5050

5151
as_event_loop* loop;
5252
as_error err;
@@ -76,7 +76,7 @@ NAN_METHOD(setDefaultLogging)
7676
{
7777
Nan::HandleScope();
7878
if (info[0]->IsObject()){
79-
if (log_from_jsobject(&g_log_info, info[0]->ToObject()) == AS_NODE_PARAM_OK) {
79+
if (log_from_jsobject(&g_log_info, info[0].As<Object>()) == AS_NODE_PARAM_OK) {
8080
if (g_log_info.level < 0) {
8181
// common logging does not support log level "OFF"
8282
as_log_set_level(AS_LOG_LEVEL_ERROR);

‎src/main/async.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ bool async_scan_listener(as_error* err, as_record* record, void* udata, as_event
155155

156156
bool continue_scan = true;
157157
if (result->IsBoolean()) {
158-
continue_scan = result->ToBoolean()->Value();
158+
continue_scan = Nan::To<bool>(result).FromJust();
159159
as_v8_debug(log, "Async scan callback returned: %s", continue_scan ? "true" : "false");
160160
}
161161
return continue_scan;

‎src/main/client.cc

+13-15
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,16 @@ NAN_METHOD(AerospikeClient::New)
6464
as_config config;
6565
as_config_init(&config);
6666

67-
if (info[0]->IsObject()) {
68-
Local<Value> v8_log_info = info[0]->ToObject()->Get(Nan::New("log").ToLocalChecked()) ;
69-
if (v8_log_info->IsObject()) {
70-
log_from_jsobject(client->log, v8_log_info->ToObject());
71-
}
67+
Local<Object> v8Config = info[0].As<Object>();
68+
69+
Local<Value> v8LogInfo = v8Config->Get(Nan::New("log").ToLocalChecked()) ;
70+
if (v8LogInfo->IsObject()) {
71+
log_from_jsobject(client->log, v8LogInfo.As<Object>());
7272
}
7373

74-
if (info[0]->IsObject()) {
75-
int result = config_from_jsobject(&config, info[0]->ToObject(), client->log);
76-
if (result != AS_NODE_PARAM_OK) {
77-
Nan::ThrowError("Invalid client configuration");
78-
}
74+
int result = config_from_jsobject(&config, v8Config, client->log);
75+
if (result != AS_NODE_PARAM_OK) {
76+
Nan::ThrowError("Invalid client configuration");
7977
}
8078

8179
aerospike_init(client->as, &config);
@@ -159,8 +157,8 @@ NAN_METHOD(AerospikeClient::AddSeedHost)
159157
TYPE_CHECK_REQ(info[0], IsString, "hostname must be a string");
160158
TYPE_CHECK_REQ(info[1], IsNumber, "port must be a number");
161159

162-
Nan::Utf8String hostname(info[0]->ToString());
163-
uint16_t port = (uint16_t) info[1]->ToInteger()->Value();
160+
Nan::Utf8String hostname(info[0].As<String>());
161+
uint16_t port = (uint16_t) Nan::To<uint32_t>(info[1]).FromJust();
164162

165163
as_cluster_add_seed(client->as->cluster, *hostname, NULL, port);
166164
}
@@ -176,8 +174,8 @@ NAN_METHOD(AerospikeClient::RemoveSeedHost)
176174
TYPE_CHECK_REQ(info[0], IsString, "hostname must be a string");
177175
TYPE_CHECK_REQ(info[1], IsNumber, "port must be a number");
178176

179-
Nan::Utf8String hostname(info[0]->ToString());
180-
uint16_t port = (uint16_t) info[1]->ToInteger()->Value();
177+
Nan::Utf8String hostname(info[0].As<String>());
178+
uint16_t port = (uint16_t) Nan::To<uint32_t>(info[1]).FromJust();
181179

182180
as_cluster_remove_seed(client->as->cluster, *hostname, port);
183181
}
@@ -186,7 +184,7 @@ NAN_METHOD(AerospikeClient::SetLogLevel)
186184
{
187185
AerospikeClient* client = Nan::ObjectWrap::Unwrap<AerospikeClient>(info.Holder());
188186
if (info[0]->IsObject()) {
189-
log_from_jsobject(client->log, info[0]->ToObject());
187+
log_from_jsobject(client->log, info[0].As<Object>());
190188
}
191189
info.GetReturnValue().Set(info.Holder());
192190
}

‎src/main/commands/apply_async.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@ NAN_METHOD(AerospikeClient::ApplyAsync)
4646
char* udf_module = NULL;
4747
char* udf_function = NULL;
4848

49-
if (key_from_jsobject(&key, info[0]->ToObject(), log) != AS_NODE_PARAM_OK) {
49+
if (key_from_jsobject(&key, info[0].As<Object>(), log) != AS_NODE_PARAM_OK) {
5050
CmdErrorCallback(cmd, AEROSPIKE_ERR_PARAM, "Key object invalid");
5151
goto Cleanup;
5252
}
5353
key_initalized = true;
5454

55-
if (udfargs_from_jsobject(&udf_module, &udf_function, &udf_args, info[1]->ToObject(), log) != AS_NODE_PARAM_OK ) {
55+
if (udfargs_from_jsobject(&udf_module, &udf_function, &udf_args, info[1].As<Object>(), log) != AS_NODE_PARAM_OK ) {
5656
CmdErrorCallback(cmd, AEROSPIKE_ERR_PARAM, "UDF args object invalid");
5757
goto Cleanup;
5858
}
5959

6060
if (info[2]->IsObject()) {
61-
if (applypolicy_from_jsobject(&policy, info[2]->ToObject(), log) != AS_NODE_PARAM_OK) {
61+
if (applypolicy_from_jsobject(&policy, info[2].As<Object>(), log) != AS_NODE_PARAM_OK) {
6262
CmdErrorCallback(cmd, AEROSPIKE_ERR_PARAM, "Policy object invalid");
6363
goto Cleanup;
6464
}

‎src/main/commands/batch_exists.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ prepare(const Nan::FunctionCallbackInfo<Value> &info)
9393

9494
if (info[1]->IsObject()) {
9595
cmd->policy = (as_policy_batch*) cf_malloc(sizeof(as_policy_batch));
96-
if (batchpolicy_from_jsobject(cmd->policy, info[1]->ToObject(), log) != AS_NODE_PARAM_OK) {
96+
if (batchpolicy_from_jsobject(cmd->policy, info[1].As<Object>(), log) != AS_NODE_PARAM_OK) {
9797
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Batch policy parameter invalid");
9898
}
9999
}

‎src/main/commands/batch_get.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ prepare(const Nan::FunctionCallbackInfo<v8::Value> &info)
9494

9595
if (info[1]->IsObject() ) {
9696
cmd->policy = (as_policy_batch*) cf_malloc(sizeof(as_policy_batch));
97-
if (batchpolicy_from_jsobject(cmd->policy, info[1]->ToObject(), log) != AS_NODE_PARAM_OK) {
97+
if (batchpolicy_from_jsobject(cmd->policy, info[1].As<Object>(), log) != AS_NODE_PARAM_OK) {
9898
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Batch policy parameter invalid");
9999
}
100100
}

‎src/main/commands/batch_read_async.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ NAN_METHOD(AerospikeClient::BatchReadAsync)
4444
}
4545

4646
if (info[1]->IsObject()) {
47-
if (batchpolicy_from_jsobject(&policy, info[1]->ToObject(), log) != AS_NODE_PARAM_OK) {
47+
if (batchpolicy_from_jsobject(&policy, info[1].As<Object>(), log) != AS_NODE_PARAM_OK) {
4848
CmdErrorCallback(cmd, AEROSPIKE_ERR_PARAM, "Policy object invalid");
4949
free_batch_records(records);
5050
goto Cleanup;

‎src/main/commands/batch_select.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ prepare(const Nan::FunctionCallbackInfo<v8::Value> &info)
105105

106106
if (info[2]->IsObject() ) {
107107
cmd->policy = (as_policy_batch*) cf_malloc(sizeof(as_policy_batch));
108-
if (batchpolicy_from_jsobject(cmd->policy, info[2]->ToObject(), log) != AS_NODE_PARAM_OK) {
108+
if (batchpolicy_from_jsobject(cmd->policy, info[2].As<Object>(), log) != AS_NODE_PARAM_OK) {
109109
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Batch policy parameter invalid");
110110
}
111111
}

‎src/main/commands/exists_async.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ NAN_METHOD(AerospikeClient::ExistsAsync)
3939
as_policy_read* p_policy = NULL;
4040
as_status status;
4141

42-
if (key_from_jsobject(&key, info[0]->ToObject(), log) != AS_NODE_PARAM_OK) {
42+
if (key_from_jsobject(&key, info[0].As<Object>(), log) != AS_NODE_PARAM_OK) {
4343
CmdErrorCallback(cmd, AEROSPIKE_ERR_PARAM, "Key object invalid");
4444
goto Cleanup;
4545
}
4646
key_initalized = true;
4747

4848
if (info[1]->IsObject()) {
49-
if (readpolicy_from_jsobject(&policy, info[1]->ToObject(), log) != AS_NODE_PARAM_OK) {
49+
if (readpolicy_from_jsobject(&policy, info[1].As<Object>(), log) != AS_NODE_PARAM_OK) {
5050
CmdErrorCallback(cmd, AEROSPIKE_ERR_PARAM, "Policy object invalid");
5151
goto Cleanup;
5252
}

‎src/main/commands/get_async.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ NAN_METHOD(AerospikeClient::GetAsync)
3939
as_policy_read* p_policy = NULL;
4040
as_status status = AEROSPIKE_ERR;
4141

42-
if (key_from_jsobject(&key, info[0]->ToObject(), log) != AS_NODE_PARAM_OK) {
42+
if (key_from_jsobject(&key, info[0].As<Object>(), log) != AS_NODE_PARAM_OK) {
4343
CmdErrorCallback(cmd, AEROSPIKE_ERR_PARAM, "Key object invalid");
4444
goto Cleanup;
4545
}
4646
key_initalized = true;
4747

4848
if (info[1]->IsObject()) {
49-
if (readpolicy_from_jsobject(&policy, info[1]->ToObject(), log) != AS_NODE_PARAM_OK) {
49+
if (readpolicy_from_jsobject(&policy, info[1].As<Object>(), log) != AS_NODE_PARAM_OK) {
5050
CmdErrorCallback(cmd, AEROSPIKE_ERR_PARAM, "Policy object invalid");
5151
goto Cleanup;
5252
}

‎src/main/commands/index_create.cc

+7-7
Original file line numberDiff line numberDiff line change
@@ -57,27 +57,27 @@ prepare(const Nan::FunctionCallbackInfo<Value> &info)
5757
IndexCreateCommand* cmd = new IndexCreateCommand(client, info[7].As<Function>());
5858
LogInfo* log = client->log;
5959

60-
if (as_strlcpy(cmd->ns, *Nan::Utf8String(info[0]->ToString()), AS_NAMESPACE_MAX_SIZE) > AS_NAMESPACE_MAX_SIZE) {
60+
if (as_strlcpy(cmd->ns, *Nan::Utf8String(info[0].As<String>()), AS_NAMESPACE_MAX_SIZE) > AS_NAMESPACE_MAX_SIZE) {
6161
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Namespace exceeds max. length (%d)", AS_NAMESPACE_MAX_SIZE);
6262
}
6363

6464
if (info[1]->IsString()) {
65-
if (as_strlcpy(cmd->set, *Nan::Utf8String(info[1]->ToString()), AS_SET_MAX_SIZE) > AS_SET_MAX_SIZE) {
65+
if (as_strlcpy(cmd->set, *Nan::Utf8String(info[1].As<String>()), AS_SET_MAX_SIZE) > AS_SET_MAX_SIZE) {
6666
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Set exceeds max. length (%d)", AS_SET_MAX_SIZE);
6767
}
6868
}
6969

70-
if (as_strlcpy(cmd->bin, *Nan::Utf8String(info[2]->ToString()), AS_BIN_NAME_MAX_LEN) > AS_BIN_NAME_MAX_LEN) {
70+
if (as_strlcpy(cmd->bin, *Nan::Utf8String(info[2].As<String>()), AS_BIN_NAME_MAX_LEN) > AS_BIN_NAME_MAX_LEN) {
7171
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Bin name exceeds max. length (%d)", AS_BIN_NAME_MAX_LEN);
7272
}
7373

74-
cmd->index = strdup(*Nan::Utf8String(info[3]->ToString()));
75-
cmd->itype = (as_index_type) info[4]->ToInteger()->Value();
76-
cmd->dtype = (as_index_datatype) info[5]->ToInteger()->Value();
74+
cmd->index = strdup(*Nan::Utf8String(info[3].As<String>()));
75+
cmd->itype = (as_index_type) Nan::To<int>(info[4]).FromJust();
76+
cmd->dtype = (as_index_datatype) Nan::To<int>(info[5]).FromJust();
7777

7878
if (info[6]->IsObject()) {
7979
cmd->policy = (as_policy_info*) cf_malloc(sizeof(as_policy_info));
80-
if (infopolicy_from_jsobject(cmd->policy, info[6]->ToObject(), log) != AS_NODE_PARAM_OK) {
80+
if (infopolicy_from_jsobject(cmd->policy, info[6].As<Object>(), log) != AS_NODE_PARAM_OK) {
8181
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Policy parameter is invalid");
8282
}
8383
}

‎src/main/commands/index_remove.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ prepare(const Nan::FunctionCallbackInfo<Value> &info)
5353
IndexRemoveCommand* cmd = new IndexRemoveCommand(client, info[3].As<Function>());
5454
LogInfo* log = cmd->log = client->log;
5555

56-
if (as_strlcpy(cmd->ns, *Nan::Utf8String(info[0]->ToString()), AS_NAMESPACE_MAX_SIZE) > AS_NAMESPACE_MAX_SIZE) {
56+
if (as_strlcpy(cmd->ns, *Nan::Utf8String(info[0].As<String>()), AS_NAMESPACE_MAX_SIZE) > AS_NAMESPACE_MAX_SIZE) {
5757
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Namespace exceeds max. length (%d)", AS_NAMESPACE_MAX_SIZE);
5858
}
5959

60-
cmd->index = strdup(*Nan::Utf8String(info[1]->ToString()));
60+
cmd->index = strdup(*Nan::Utf8String(info[1].As<String>()));
6161

6262
if (info[2]->IsObject()) {
6363
cmd->policy = (as_policy_info*)cf_malloc(sizeof(as_policy_info));
64-
if(infopolicy_from_jsobject(cmd->policy, info[2]->ToObject(), log) != AS_NODE_PARAM_OK) {
64+
if(infopolicy_from_jsobject(cmd->policy, info[2].As<Object>(), log) != AS_NODE_PARAM_OK) {
6565
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Policy parameter is invalid");
6666
}
6767
}

‎src/main/commands/info.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ prepare(const Nan::FunctionCallbackInfo<v8::Value> &info)
6060

6161
if (info[0]->IsString()) {
6262
cmd->request = (char*) cf_malloc(MAX_INFO_REQUEST_LEN);
63-
size_t reqlen = as_strlcpy(cmd->request, *Nan::Utf8String(info[0]->ToString()), MAX_INFO_REQUEST_LEN);
63+
size_t reqlen = as_strlcpy(cmd->request, *Nan::Utf8String(info[0].As<String>()), MAX_INFO_REQUEST_LEN);
6464
if (reqlen > MAX_INFO_REQUEST_LEN) {
6565
as_v8_info(log, "Info request exceeds max. length (%zu > %i): \"%s...\"", reqlen, MAX_INFO_REQUEST_LEN, cmd->request);
6666
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Info request exceeds max. length");
@@ -70,14 +70,14 @@ prepare(const Nan::FunctionCallbackInfo<v8::Value> &info)
7070
}
7171

7272
if (info[1]->IsObject()) {
73-
if (host_from_jsobject(info[1]->ToObject(), &cmd->addr, &cmd->port, log) != AS_NODE_PARAM_OK) {
73+
if (host_from_jsobject(info[1].As<Object>(), &cmd->addr, &cmd->port, log) != AS_NODE_PARAM_OK) {
7474
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Host parameter is invalid");
7575
}
7676
}
7777

7878
if (info[2]->IsObject()) {
7979
cmd->policy = (as_policy_info*) cf_malloc(sizeof(as_policy_info));
80-
if (infopolicy_from_jsobject(cmd->policy, info[2]->ToObject(), log) != AS_NODE_PARAM_OK ) {
80+
if (infopolicy_from_jsobject(cmd->policy, info[2].As<Object>(), log) != AS_NODE_PARAM_OK ) {
8181
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Policy parameter is invalid");
8282
}
8383
}

‎src/main/commands/info_foreach.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ prepare(const Nan::FunctionCallbackInfo<Value> &info)
9595

9696
if (info[0]->IsString()) {
9797
cmd->request = (char*) malloc(INFO_REQUEST_LEN);
98-
if (as_strlcpy(cmd->request, *Nan::Utf8String(info[0]->ToString()), INFO_REQUEST_LEN) > INFO_REQUEST_LEN) {
98+
if (as_strlcpy(cmd->request, *Nan::Utf8String(info[0].As<String>()), INFO_REQUEST_LEN) > INFO_REQUEST_LEN) {
9999
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Info request exceeds max. length (%d)", INFO_REQUEST_LEN);
100100
}
101101
} else {
@@ -104,7 +104,7 @@ prepare(const Nan::FunctionCallbackInfo<Value> &info)
104104

105105
if (info[1]->IsObject()) {
106106
cmd->policy = (as_policy_info*) cf_malloc(sizeof(as_policy_info));
107-
if (infopolicy_from_jsobject(cmd->policy, info[1]->ToObject(), log) != AS_NODE_PARAM_OK ) {
107+
if (infopolicy_from_jsobject(cmd->policy, info[1].As<Object>(), log) != AS_NODE_PARAM_OK ) {
108108
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Policy parameter is invalid");
109109
}
110110
}

‎src/main/commands/job_info.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ prepare(const Nan::FunctionCallbackInfo<Value> &info)
5454
JobInfoCommand* cmd = new JobInfoCommand(client, info[3].As<Function>());
5555
LogInfo* log = client->log;
5656

57-
cmd->job_id = info[0]->ToInteger()->Value();
58-
cmd->module = strdup(*Nan::Utf8String(info[1]->ToString()));
57+
cmd->job_id = Nan::To<int64_t>(info[0]).FromJust();
58+
cmd->module = strdup(*Nan::Utf8String(info[1].As<String>()));
5959

6060
if (info[2]->IsObject()) {
6161
cmd->policy = (as_policy_info*) cf_malloc(sizeof(as_policy_info));
62-
if (infopolicy_from_jsobject(cmd->policy, info[2]->ToObject(), log) != AS_NODE_PARAM_OK) {
62+
if (infopolicy_from_jsobject(cmd->policy, info[2].As<Object>(), log) != AS_NODE_PARAM_OK) {
6363
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Policy parameter is invalid");
6464
}
6565
}

‎src/main/commands/operate_async.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ NAN_METHOD(AerospikeClient::OperateAsync)
4444
as_policy_operate* p_policy = NULL;
4545
as_status status;
4646

47-
if (key_from_jsobject(&key, info[0]->ToObject(), log) != AS_NODE_PARAM_OK) {
47+
if (key_from_jsobject(&key, info[0].As<Object>(), log) != AS_NODE_PARAM_OK) {
4848
CmdErrorCallback(cmd, AEROSPIKE_ERR_PARAM, "Key object invalid");
4949
goto Cleanup;
5050
}
@@ -57,13 +57,13 @@ NAN_METHOD(AerospikeClient::OperateAsync)
5757
operations_initalized = true;
5858

5959
if (info[2]->IsObject()) {
60-
Local<Object> metadata = info[2]->ToObject();
60+
Local<Object> metadata = info[2].As<Object>();
6161
setTTL(metadata, &operations.ttl, log);
6262
setGeneration(metadata, &operations.gen, log);
6363
}
6464

6565
if (info[3]->IsObject()) {
66-
if (operatepolicy_from_jsobject(&policy, info[3]->ToObject(), log) != AS_NODE_PARAM_OK) {
66+
if (operatepolicy_from_jsobject(&policy, info[3].As<Object>(), log) != AS_NODE_PARAM_OK) {
6767
CmdErrorCallback(cmd, AEROSPIKE_ERR_PARAM, "Policy object invalid");
6868
goto Cleanup;
6969
}

‎src/main/commands/put_async.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,27 @@ NAN_METHOD(AerospikeClient::PutAsync)
4343
as_policy_write* p_policy = NULL;
4444
as_status status;
4545

46-
if (key_from_jsobject(&key, info[0]->ToObject(), log) != AS_NODE_PARAM_OK) {
46+
if (key_from_jsobject(&key, info[0].As<Object>(), log) != AS_NODE_PARAM_OK) {
4747
CmdErrorCallback(cmd, AEROSPIKE_ERR_PARAM, "Key object invalid");
4848
goto Cleanup;
4949
}
5050
key_initalized = true;
5151

52-
if (recordbins_from_jsobject(&record, info[1]->ToObject(), log) != AS_NODE_PARAM_OK) {
52+
if (recordbins_from_jsobject(&record, info[1].As<Object>(), log) != AS_NODE_PARAM_OK) {
5353
CmdErrorCallback(cmd, AEROSPIKE_ERR_PARAM, "Record object invalid");
5454
goto Cleanup;
5555
}
5656
record_initalized = true;
5757

5858
if (info[2]->IsObject()) {
59-
if (recordmeta_from_jsobject(&record, info[2]->ToObject(), log) != AS_NODE_PARAM_OK) {
59+
if (recordmeta_from_jsobject(&record, info[2].As<Object>(), log) != AS_NODE_PARAM_OK) {
6060
CmdErrorCallback(cmd, AEROSPIKE_ERR_PARAM, "Meta object invalid");
6161
goto Cleanup;
6262
}
6363
}
6464

6565
if (info[3]->IsObject()) {
66-
if (writepolicy_from_jsobject(&policy, info[3]->ToObject(), log) != AS_NODE_PARAM_OK) {
66+
if (writepolicy_from_jsobject(&policy, info[3].As<Object>(), log) != AS_NODE_PARAM_OK) {
6767
CmdErrorCallback(cmd, AEROSPIKE_ERR_PARAM, "Policy object invalid");
6868
goto Cleanup;
6969
}

‎src/main/commands/query_apply.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ prepare(const Nan::FunctionCallbackInfo<v8::Value> &info)
6969

7070
if (info[3]->IsObject()) {
7171
cmd->policy = (as_policy_query*) cf_malloc(sizeof(as_policy_query));
72-
if (querypolicy_from_jsobject(cmd->policy, info[3]->ToObject(), log) != AS_NODE_PARAM_OK) {
72+
if (querypolicy_from_jsobject(cmd->policy, info[3].As<Object>(), log) != AS_NODE_PARAM_OK) {
7373
return CmdSetError(cmd, AEROSPIKE_ERR_PARAM, "Policy parameter is invalid");
7474
}
7575
}

‎src/main/commands/query_async.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ NAN_METHOD(AerospikeClient::QueryAsync)
5252
setup_query(&query, info[0], info[1], info[2], log);
5353

5454
if (info[3]->IsObject()) {
55-
if (querypolicy_from_jsobject(&policy, info[3]->ToObject(), log) != AS_NODE_PARAM_OK) {
55+
if (querypolicy_from_jsobject(&policy, info[3].As<Object>(), log) != AS_NODE_PARAM_OK) {
5656
CmdErrorCallback(cmd, AEROSPIKE_ERR_PARAM, "Policy object invalid");
5757
goto Cleanup;
5858
}

0 commit comments

Comments
 (0)