| Index: src/execution.h
|
| diff --git a/src/execution.h b/src/execution.h
|
| index 592ecbdb62bf34227407b17b5661ea0968bacf60..f328caef4f1a22a6ba8c22a8eb86515dc5980f00 100644
|
| --- a/src/execution.h
|
| +++ b/src/execution.h
|
| @@ -1,39 +1,15 @@
|
| -// Copyright 2011 the V8 project authors. All rights reserved.
|
| -// Redistribution and use in source and binary forms, with or without
|
| -// modification, are permitted provided that the following conditions are
|
| -// met:
|
| -//
|
| -// * Redistributions of source code must retain the above copyright
|
| -// notice, this list of conditions and the following disclaimer.
|
| -// * Redistributions in binary form must reproduce the above
|
| -// copyright notice, this list of conditions and the following
|
| -// disclaimer in the documentation and/or other materials provided
|
| -// with the distribution.
|
| -// * Neither the name of Google Inc. nor the names of its
|
| -// contributors may be used to endorse or promote products derived
|
| -// from this software without specific prior written permission.
|
| -//
|
| -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
| -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
| -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
| -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
| -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
| -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| +// Copyright 2014 the V8 project authors. All rights reserved.
|
| +// Use of this source code is governed by a BSD-style license that can be
|
| +// found in the LICENSE file.
|
|
|
| #ifndef V8_EXECUTION_H_
|
| #define V8_EXECUTION_H_
|
|
|
| -#include "allocation.h"
|
| +#include "handles.h"
|
|
|
| namespace v8 {
|
| namespace internal {
|
|
|
| -
|
| // Flag used to set the interrupt causes.
|
| enum InterruptFlag {
|
| INTERRUPT = 1 << 0,
|
| @@ -49,10 +25,7 @@ enum InterruptFlag {
|
| };
|
|
|
|
|
| -class Isolate;
|
| -
|
| -
|
| -class Execution : public AllStatic {
|
| +class Execution V8_FINAL : public AllStatic {
|
| public:
|
| // Call a function, the caller supplies a receiver and an array
|
| // of arguments. Arguments are Object* type. After function returns,
|
| @@ -185,7 +158,7 @@ class ExecutionAccess;
|
| // StackGuard contains the handling of the limits that are used to limit the
|
| // number of nested invocations of JavaScript and the stack size used in each
|
| // invocation.
|
| -class StackGuard {
|
| +class StackGuard V8_FINAL {
|
| public:
|
| // Pass the address beyond which the stack should not grow. The stack
|
| // is assumed to grow downwards.
|
| @@ -290,7 +263,7 @@ class StackGuard {
|
| static const uintptr_t kIllegalLimit = 0xfffffff8;
|
| #endif
|
|
|
| - class ThreadLocal {
|
| + class ThreadLocal V8_FINAL {
|
| public:
|
| ThreadLocal() { Clear(); }
|
| // You should hold the ExecutionAccess lock when you call Initialize or
|
| @@ -334,7 +307,6 @@ class StackGuard {
|
| DISALLOW_COPY_AND_ASSIGN(StackGuard);
|
| };
|
|
|
| -
|
| } } // namespace v8::internal
|
|
|
| #endif // V8_EXECUTION_H_
|
|
|