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.

Sign up for GitHub

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

Jump to bottom

src: add include guard for trace_event_common.h #26883

Merged
merged 1 commit into from
Mar 26, 2019
Merged

src: add include guard for trace_event_common.h #26883

merged 1 commit into from
Mar 26, 2019

Conversation

gengjiawen
Copy link
Member

@gengjiawen gengjiawen commented Mar 24, 2019 •
edited by refack
Loading

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

node/deps/v8/base/trace_event/common/trace_event_common.h

Lines 197 to 199 in 7b48713

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

The original file has include guard

node/deps/v8/base/trace_event/common/trace_event_common.h

Lines 1 to 6 in 7b48713

// 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

CI: https://ci.nodejs.org/job/node-test-pull-request/21921/

@gengjiawen @refack
src: add include guard for trace_event_common.h
975bc89 
PR-URL: nodejs#26883
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@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
@gengjiawen @targos
src: add include guard for trace_event_common.h
7bc260f 
PR-URL: nodejs#26883
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Refael Ackermann <refack@gmail.com>
targos pushed a commit that referenced this pull request Mar 27, 2019
@gengjiawen @targos
src: add include guard for trace_event_common.h
3d9839b 
PR-URL: #26883
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@targos targos mentioned this pull request Mar 27, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@addaleax addaleax addaleax approved these changes

@refack refack refack approved these changes

@jasnell jasnell Awaiting requested review from jasnell

Assignees
No one assigned
Labels
c++ Issues and PRs that require attention from people who are familiar with C++.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@gengjiawen @addaleax @nodejs-github-bot @refack