Skip to content

Commit

Permalink
[MSVC] X86Assembler.h(108): error C2666: 'WebCore::operator -': 7 ove…
Browse files Browse the repository at this point in the history
…rloads have similar conversions

https://bugs.webkit.org/show_bug.cgi?id=189467

Unreviewed build fix for WinCairo port.

MSVC reports compilation errors if certain JSC header files are
included after "using namespace" statements.

* Sources.txt: Added @no-unify to InjectedBundleNodeHandle.cpp and InjectedBundleRangeHandle.cpp temporarily.

Canonical link: https://commits.webkit.org/204425@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@235839 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
fujii committed Sep 10, 2018
1 parent 04b4472 commit dd57fca
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
12 changes: 12 additions & 0 deletions Source/WebKit/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
2018-09-09 Fujii Hironori <Hironori.Fujii@sony.com>

[MSVC] X86Assembler.h(108): error C2666: 'WebCore::operator -': 7 overloads have similar conversions
https://bugs.webkit.org/show_bug.cgi?id=189467

Unreviewed build fix for WinCairo port.

MSVC reports compilation errors if certain JSC header files are
included after "using namespace" statements.

* Sources.txt: Added @no-unify to InjectedBundleNodeHandle.cpp and InjectedBundleRangeHandle.cpp temporarily.

2018-09-08 Wenson Hsieh <wenson_hsieh@apple.com>

REGRESSION (r235153): [iOS] Can't move selection start grabber when selecting text in a subframe
Expand Down
4 changes: 2 additions & 2 deletions Source/WebKit/Sources.txt
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,8 @@ WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp

WebProcess/InjectedBundle/DOM/InjectedBundleCSSStyleDeclarationHandle.cpp
WebProcess/InjectedBundle/DOM/InjectedBundleFileHandle.cpp
WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp
WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp
WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp @no-unify
WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp @no-unify

WebProcess/MediaStream/MediaDeviceSandboxExtensions.cpp
WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp
Expand Down

0 comments on commit dd57fca

Please sign in to comment.