projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix FunctionScheduler::resetFunctionTimer concurrency bug
[folly.git]
/
folly
/
Unicode.h
diff --git
a/folly/Unicode.h
b/folly/Unicode.h
index d07cf310786bf5111e1849bad651396fba36227d..eaeb05f4511253a82a1b49f2c8218381f1b9ea7f 100644
(file)
--- a/
folly/Unicode.h
+++ b/
folly/Unicode.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
6
Facebook, Inc.
+ * Copyright 201
7
Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-16,10
+16,9
@@
// Some utility routines relating to unicode.
// Some utility routines relating to unicode.
-#ifndef FOLLY_UNICODE_H_
-#define FOLLY_UNICODE_H_
+#pragma once
-#include <
folly/FBString.h
>
+#include <
string
>
namespace folly {
namespace folly {
@@
-30,10
+29,16
@@
namespace folly {
*
* Return value is undefined if `cp' is an invalid code point.
*/
*
* Return value is undefined if `cp' is an invalid code point.
*/
-
fb
string codePointToUtf8(char32_t cp);
+
std::
string codePointToUtf8(char32_t cp);
-//////////////////////////////////////////////////////////////////////
+/*
+ * Decode a single unicode code point from UTF-8 byte sequence.
+ */
+char32_t utf8ToCodePoint(
+ const unsigned char*& p,
+ const unsigned char* const e,
+ bool skipOnError);
-}
+//////////////////////////////////////////////////////////////////////
-#endif
+} // namespace folly