Revert D6745720: [folly][compression] Log (de)compression bytes

[folly.git] / folly / Uri-inl.h

diff --git a/folly/Uri-inl.h b/folly/Uri-inl.h
index 86a63a0cd95d08adb11132e88c2157774907df6f..b5b741ed69e45438f6cb75858813b84c8215555d 100644 (file)
--- a/folly/Uri-inl.h
+++ b/folly/Uri-inl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Facebook, Inc.
+ * Copyright 2013-present Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,21 +22,21 @@
 #include <tuple>
 
 #include <folly/Conv.h>
-#include <folly/Hash.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 
 namespace uri_detail {
 
 using UriTuple = std::tuple<
-    const fbstring&,
-    const fbstring&,
-    const fbstring&,
-    const fbstring&,
+    const std::string&,
+    const std::string&,
+    const std::string&,
+    const std::string&,
     uint16_t,
-    const fbstring&,
-    const fbstring&,
-    const fbstring&>;
+    const std::string&,
+    const std::string&,
+    const std::string&>;
 
 inline UriTuple as_tuple(const folly::Uri& k) {
   return UriTuple(