Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ V8StackTraceId::V8StackTraceId(StringView json)
V8DebuggerId debuggerId(s);
if (!debuggerId.isValid()) return;
if (!dict->getBoolean(kShouldPause, &should_pause)) return;
id = parsedId;
id = (unsigned int)parsedId;
debugger_id = debuggerId.pair();
}

Expand Down
11 changes: 10 additions & 1 deletion NativeScript/inspector/utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include "include/v8-inspector.h"
#include "src/inspector/protocol/Protocol.h"
#include <vector>
#include <cmath>
#include <cstdio>

namespace v8_inspector {

Expand All @@ -22,8 +24,15 @@ static std::unique_ptr<protocol::Array<T>> fromValue(protocol::Value* value, pro

std::unique_ptr<protocol::Array<T>> result(new protocol::Array<T>());
errors->Push();

// This (log10) will return the max number of digits(-1) in the length of the array that we have to worry about, +1 for the null
int sizeArray = log10(array->size()) + 2;

for (size_t i = 0; i < array->size(); ++i) {
const char* name = std::to_string(i).c_str();
// Convert array index to a string value
char* name = new char[sizeArray];
sprintf(name, "%lu", i);

This comment was marked as abuse.


errors->SetName(name);
std::unique_ptr<T> item = protocol::ValueConversions<T>::fromValue(array->at(i), errors);
result->push_back(std::move(item));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class ResolveGlobalNamesCollisionsFilter {
for (auto& mptr : v) {
auto& module = *mptr;
std::pair<clang::Module*, std::vector<Meta*> > modulePair(module.first, std::vector<Meta*>());
for (const std::pair<std::string, std::vector<Meta*> >& metas : module.second) {
for (const std::pair<std::string, std::vector<Meta*> > metas : module.second) {
assert(metas.second.size() == 1);
for (Meta* meta : metas.second) {
modulePair.second.push_back(meta);
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "@nativescript/ios",
"description": "NativeScript Runtime for iOS",
"version": "7.0.0",
"version": "7.0.2-rc.1",
"keywords": [
"NativeScript",
"iOS",
"runtime"
],
"repository": {
"type": "git",
"url": "https://github.com/NativeScript/ios-runtime"
"url": "https://github.com/NativeScript/ns-v8ios-runtime"
},
"author": {
"name": "NativeScript Team",
Expand Down
5 changes: 3 additions & 2 deletions project-template/internal/nativescript-build.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ LDPLUSPLUS = $SRCROOT/internal/nsld.sh
// TNS_DEBUG_METADATA_PATH = $(SRCROOT)/debug-metadata

// Xcode 12
EXCLUDED_ARCHS__PLATFORM_NAME_iphonesimulator__NATIVE_ARCH_64_BIT_x86_64=arm64 arm64e armv7 armv7s armv6 armv8
EXCLUDED_ARCHS=$(EXCLUDED_ARCHS__PLATFORM_NAME_$(PLATFORM_NAME)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT))
EXCLUDED_ARCHS_x86_64 = arm64 arm64e
EXCLUDED_ARCHS[sdk=iphonesimulator*] = i386 armv6 armv7 armv7s armv8 $(EXCLUDED_ARCHS_$(NATIVE_ARCH_64_BIT))
EXCLUDED_ARCHS[sdk=iphoneos*] = i386 armv6 armv7 armv7s armv8 x86_64