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

Side by Side Diff: util/misc/uuid.cc

Issue 1566713002: Use base/macros.h instead of base/basictypes.h (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Windows #incldue → #include Created 4 years, 11 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 | « util/misc/scoped_forbid_return.h ('k') | util/misc/uuid_test.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 2014 The Crashpad Authors. All rights reserved. 1 // Copyright 2014 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 // See the License for the specific language governing permissions and 12 // See the License for the specific language governing permissions and
13 // limitations under the License. 13 // limitations under the License.
14 14
15 #if !defined(__STDC_FORMAT_MACROS) 15 #if !defined(__STDC_FORMAT_MACROS)
16 #define __STDC_FORMAT_MACROS 16 #define __STDC_FORMAT_MACROS
17 #endif 17 #endif
18 18
19 #include "util/misc/uuid.h" 19 #include "util/misc/uuid.h"
20 20
21 #include <inttypes.h> 21 #include <inttypes.h>
22 #include <stdio.h> 22 #include <stdio.h>
23 #include <string.h> 23 #include <string.h>
24 24
25 #include "base/basictypes.h"
26 #include "base/logging.h" 25 #include "base/logging.h"
27 #include "base/strings/stringprintf.h" 26 #include "base/strings/stringprintf.h"
28 #include "base/strings/utf_string_conversions.h" 27 #include "base/strings/utf_string_conversions.h"
29 #include "base/sys_byteorder.h" 28 #include "base/sys_byteorder.h"
30 #include "util/stdlib/cxx.h" 29 #include "util/stdlib/cxx.h"
31 30
32 #if defined(OS_MACOSX) 31 #if defined(OS_MACOSX)
33 #include <uuid/uuid.h> 32 #include <uuid/uuid.h>
34 #endif // OS_MACOSX 33 #endif // OS_MACOSX
35 34
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 data_5[5]); 140 data_5[5]);
142 } 141 }
143 142
144 #if defined(OS_WIN) 143 #if defined(OS_WIN)
145 base::string16 UUID::ToString16() const { 144 base::string16 UUID::ToString16() const {
146 return base::UTF8ToUTF16(ToString()); 145 return base::UTF8ToUTF16(ToString());
147 } 146 }
148 #endif // OS_WIN 147 #endif // OS_WIN
149 148
150 } // namespace crashpad 149 } // namespace crashpad
OLDNEW
« no previous file with comments | « util/misc/scoped_forbid_return.h ('k') | util/misc/uuid_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698