X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FUnicode.h;h=c16d87d241d30696484f1e4c4d93538698313bb5;hb=c1a1a5e6039c13c55597fa942ce1c01ecfe2f6a3;hp=d88aa71473f61425ea88ad1a976f7b783130e943;hpb=5c77fedbef46995a71ffa268c9fcaf49efddd01b;p=folly.git

diff --git a/folly/Unicode.h b/folly/Unicode.h
index d88aa714..c16d87d2 100644
--- a/folly/Unicode.h
+++ b/folly/Unicode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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