Skip to content

Conversation

gengjiawen
Copy link
Member

@gengjiawen gengjiawen commented Mar 24, 2019

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines

@nodejs-github-bot nodejs-github-bot added the c++ Issues and PRs that require attention from people who are familiar with C++. label Mar 24, 2019
@BridgeAR BridgeAR requested review from jasnell and addaleax March 25, 2019 16:28
@gengjiawen
Copy link
Member Author

@addaleax @jasnell @refack Can you review this ? Thanks.

@addaleax
Copy link
Member

This seems like it was intentional, according to the comment/error around line 200?

@gengjiawen
Copy link
Member Author

This file looks like copy from v8

#if defined(TRACE_EVENT0)
#error "Another copy of this file has already been included."
#endif

The original file has include guard

// Copyright 2015 The Chromium 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 BASE_TRACE_EVENT_COMMON_TRACE_EVENT_COMMON_H_
#define BASE_TRACE_EVENT_COMMON_TRACE_EVENT_COMMON_H_

@gengjiawen gengjiawen force-pushed the ensure_include_once branch from cf8edcf to 40bf4f7 Compare March 26, 2019 14:31
@nodejs-github-bot
Copy link
Collaborator

PR-URL: nodejs#26883
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Refael Ackermann <[email protected]>
@refack refack force-pushed the ensure_include_once branch from 40bf4f7 to 975bc89 Compare March 26, 2019 21:54
@refack refack merged commit 975bc89 into nodejs:master Mar 26, 2019
targos pushed a commit to targos/node that referenced this pull request Mar 27, 2019
PR-URL: nodejs#26883
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Refael Ackermann <[email protected]>
targos pushed a commit that referenced this pull request Mar 27, 2019
PR-URL: #26883
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Refael Ackermann <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c++ Issues and PRs that require attention from people who are familiar with C++.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants