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.

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

Merge changes from Windows 1809 October Update #5787

Merged
merged 5 commits into from
Oct 23, 2018

Conversation

Cellule
Copy link
Contributor

@Cellule Cellule commented Oct 17, 2018

This change is Reviewable

@@ -999,52 +1002,52 @@ using namespace Js;
{
return FALSE;
}
RecyclableObject* object = RecyclableObject::UnsafeFromVar(instance);
RecyclableObject* object = RecyclableObject::UnsafeFromVar(instance);
Copy link
Contributor

Choose a reason for hiding this comment

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

What happened with the indentation here?

Copy link
Contributor

@dilijev dilijev left a comment

Choose a reason for hiding this comment

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

There's some formatting weirdness. My changes look okay. I'll take a closer look later.

{
PropertyDescriptor desc;
return GetOwnPropertyDescriptor(object, propertyId, requestContext, &desc);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

What happened with the indentation here?

case CacheType_LocalWithoutProperty:
Assert(!object->HasOwnProperty(propertyId));
return FALSE;
default:
Copy link
Contributor

Choose a reason for hiding this comment

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

Indentation in this file in general looks pretty messed up.

@Cellule
Copy link
Contributor Author

Cellule commented Oct 17, 2018

I fixed the weird indentation in JavascriptOperators.cpp

Copy link
Contributor

@dilijev dilijev left a comment

Choose a reason for hiding this comment

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

"Fix Prefast warning in Utf8 code" LGTM

Copy link
Contributor

@dilijev dilijev left a comment

Choose a reason for hiding this comment

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

Fix Linux build
Fix indentation
LGTM

@chakrabot chakrabot merged commit f5492fe into chakra-core:release/1.10 Oct 23, 2018
chakrabot pushed a commit that referenced this pull request Oct 23, 2018
Merge pull request #5787 from Cellule:1809_october
chakrabot pushed a commit that referenced this pull request Oct 23, 2018
…tober Update

Merge pull request #5787 from Cellule:1809_october
@Cellule Cellule deleted the 1809_october branch October 23, 2018 01:24
chakrabot pushed a commit that referenced this pull request Oct 23, 2018
…indows 1809 October Update

Merge pull request #5787 from Cellule:1809_october
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants