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

Side by Side Diff: tools/gn/source_dir.cc

Issue 1549203002: Switch to standard integer types in tools/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
« no previous file with comments | « tools/gn/source_dir.h ('k') | tools/gn/source_dir_unittest.cc » ('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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "tools/gn/source_dir.h" 5 #include "tools/gn/source_dir.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "build/build_config.h"
8 #include "tools/gn/filesystem_utils.h" 9 #include "tools/gn/filesystem_utils.h"
9 #include "tools/gn/source_file.h" 10 #include "tools/gn/source_file.h"
10 11
11 namespace { 12 namespace {
12 13
13 void AssertValueSourceDirString(const std::string& s) { 14 void AssertValueSourceDirString(const std::string& s) {
14 if (!s.empty()) { 15 if (!s.empty()) {
15 #if defined(OS_WIN) 16 #if defined(OS_WIN)
16 DCHECK(s[0] == '/' || 17 DCHECK(s[0] == '/' ||
17 (s.size() > 2 && s[0] != '/' && s[1] == ':' && IsSlash(s[2]))); 18 (s.size() > 2 && s[0] != '/' && s[1] == ':' && IsSlash(s[2])));
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 // String the double-leading slash for source-relative paths. 211 // String the double-leading slash for source-relative paths.
211 converted.assign(&value_[2], value_.size() - 2); 212 converted.assign(&value_[2], value_.size() - 2);
212 return source_root.Append(UTF8ToFilePath(converted)) 213 return source_root.Append(UTF8ToFilePath(converted))
213 .NormalizePathSeparatorsTo('/'); 214 .NormalizePathSeparatorsTo('/');
214 } 215 }
215 216
216 void SourceDir::SwapValue(std::string* v) { 217 void SourceDir::SwapValue(std::string* v) {
217 value_.swap(*v); 218 value_.swap(*v);
218 AssertValueSourceDirString(value_); 219 AssertValueSourceDirString(value_);
219 } 220 }
OLDNEW
« no previous file with comments | « tools/gn/source_dir.h ('k') | tools/gn/source_dir_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698