Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(393)

Side by Side Diff: base/location.cc

Issue 9703098: Remove "base/values.h" import from "base/location.h", fix up downstream files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix one more file on ChromiumOS Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/location.h ('k') | chrome/browser/chrome_to_mobile_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(COMPILER_MSVC) 7 #if defined(COMPILER_MSVC)
8 // MSDN says to #include <intrin.h>, but that breaks the VS2005 build. 8 // MSDN says to #include <intrin.h>, but that breaks the VS2005 build.
9 extern "C" { 9 extern "C" {
10 void* _ReturnAddress(); 10 void* _ReturnAddress();
11 } 11 }
12 #endif 12 #endif
13 13
14 #include "base/location.h" 14 #include "base/location.h"
15 #include "base/string_number_conversions.h" 15 #include "base/string_number_conversions.h"
16 #include "base/stringprintf.h" 16 #include "base/stringprintf.h"
17 #include "base/values.h"
17 18
18 namespace tracked_objects { 19 namespace tracked_objects {
19 20
20 Location::Location(const char* function_name, 21 Location::Location(const char* function_name,
21 const char* file_name, 22 const char* file_name,
22 int line_number, 23 int line_number,
23 const void* program_counter) 24 const void* program_counter)
24 : function_name_(function_name), 25 : function_name_(function_name),
25 file_name_(file_name), 26 file_name_(file_name),
26 line_number_(line_number), 27 line_number_(line_number),
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 #if defined(COMPILER_MSVC) 91 #if defined(COMPILER_MSVC)
91 return _ReturnAddress(); 92 return _ReturnAddress();
92 #elif defined(COMPILER_GCC) 93 #elif defined(COMPILER_GCC)
93 return __builtin_extract_return_addr(__builtin_return_address(0)); 94 return __builtin_extract_return_addr(__builtin_return_address(0));
94 #endif // COMPILER_GCC 95 #endif // COMPILER_GCC
95 96
96 return NULL; 97 return NULL;
97 } 98 }
98 99
99 } // namespace tracked_objects 100 } // namespace tracked_objects
OLDNEW
« no previous file with comments | « base/location.h ('k') | chrome/browser/chrome_to_mobile_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698