projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch Bits.h to just use the popcount builtins directly
[folly.git]
/
folly
/
Unicode.h
diff --git
a/folly/Unicode.h
b/folly/Unicode.h
index 1ed351332f805a1016a98d1683db9dc80a26e51c..c16d87d241d30696484f1e4c4d93538698313bb5 100644
(file)
--- a/
folly/Unicode.h
+++ b/
folly/Unicode.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
4
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.
*/
-fbstring 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