[llvm-branch-commits] [compiler-rt-branch] r311584 - Merging r311496:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Aug 23 11:09:02 2017
New Revision: 311584

URL: http://llvm.org/viewvc/llvm-project?rev=311584&view=rev
Log:
Merging r311496:
------------------------------------------------------------------------
r311496 | hans | 2017-08-22 14:54:37 -0700 (Tue, 22 Aug 2017) | 1 line

[profile] Fix warning about C++ style comment in C file
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_50/   (props changed)
    compiler-rt/branches/release_50/lib/profile/InstrProfilingNameVar.c

Propchange: compiler-rt/branches/release_50/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 23 11:09:02 2017
@@ -1 +1 @@
-/compiler-rt/trunk:311495
+/compiler-rt/trunk:311495-311496

Modified: compiler-rt/branches/release_50/lib/profile/InstrProfilingNameVar.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_50/lib/profile/InstrProfilingNameVar.c?rev=311584&r1=311583&r2=311584&view=diff
==============================================================================
--- compiler-rt/branches/release_50/lib/profile/InstrProfilingNameVar.c (original)
+++ compiler-rt/branches/release_50/lib/profile/InstrProfilingNameVar.c Wed Aug 23 11:09:02 2017
@@ -1,11 +1,11 @@
-//===- InstrProfilingNameVar.c - profile name variable setup --------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
+/*===- InstrProfilingNameVar.c - profile name variable setup  -------------===*\
+|*
+|*                     The LLVM Compiler Infrastructure
+|*
+|* This file is distributed under the University of Illinois Open Source
+|* License. See LICENSE.TXT for details.
+|*
+\*===----------------------------------------------------------------------===*/
 
 #include "InstrProfiling.h"