X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FUnicode.h;h=eaeb05f4511253a82a1b49f2c8218381f1b9ea7f;hb=d89c342ab6b905d2a6bfba7317eac41d44077d65;hp=d07cf310786bf5111e1849bad651396fba36227d;hpb=321542683a01c3f334047531e9b487f047129775;p=folly.git

diff --git a/folly/Unicode.h b/folly/Unicode.h
index d07cf310..eaeb05f4 100644
--- a/folly/Unicode.h
+++ b/folly/Unicode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * 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.
 
-#ifndef FOLLY_UNICODE_H_
-#define FOLLY_UNICODE_H_
+#pragma once
 
-#include <folly/FBString.h>
+#include <string>
 
 namespace folly {
 
@@ -30,10 +29,16 @@ namespace folly {
  *
  * 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
+} // namespace folly