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

Unified Diff: tools/gn/value.h

Issue 1280123005: tools/gn: Remove includes of basictypes.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« tools/gn/args.h ('K') | « tools/gn/trace.h ('k') | tools/gn/value.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/value.h
diff --git a/tools/gn/value.h b/tools/gn/value.h
index 00e1f7abf4ec0822e80810fadf4b2b553ce93842..44fba4adb2af16a450eda4608a767ed178a2bb1e 100644
--- a/tools/gn/value.h
+++ b/tools/gn/value.h
@@ -5,12 +5,12 @@
#ifndef TOOLS_GN_VALUE_H_
#define TOOLS_GN_VALUE_H_
+#include <stdint.h>
#include <map>
-#include "base/basictypes.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
-#include "base/strings/string_piece.h"
#include "tools/gn/err.h"
class ParseNode;
@@ -31,7 +31,7 @@ class Value {
Value();
Value(const ParseNode* origin, Type t);
Value(const ParseNode* origin, bool bool_val);
- Value(const ParseNode* origin, int64 int_val);
+ Value(const ParseNode* origin, int64_t int_val);
Value(const ParseNode* origin, std::string str_val);
Value(const ParseNode* origin, const char* str_val);
// Values "shouldn't" have null scopes when type == Scope, so be sure to
@@ -64,11 +64,11 @@ class Value {
return boolean_value_;
}
- int64& int_value() {
+ int64_t& int_value() {
DCHECK(type_ == INTEGER);
return int_value_;
}
- const int64& int_value() const {
+ const int64_t& int_value() const {
DCHECK(type_ == INTEGER);
return int_value_;
}
@@ -122,7 +122,7 @@ class Value {
Type type_;
std::string string_value_;
bool boolean_value_;
- int64 int_value_;
+ int64_t int_value_;
std::vector<Value> list_value_;
scoped_ptr<Scope> scope_value_;
« tools/gn/args.h ('K') | « tools/gn/trace.h ('k') | tools/gn/value.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698