From: Orvid King <blah38621@gmail.com>
Date: Wed, 12 Aug 2015 20:37:02 +0000 (-0700)
Subject: Handle some scoping issues in Conv.h under MSVC
X-Git-Tag: v0.54.0~13
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=21f7a3c1134de902169de2f7f09e5bdbaf142127;p=folly.git

Handle some scoping issues in Conv.h under MSVC

Summary: No idea why these are the only two places it complains about, but it does.
This just explicitly scopes them.
Closes #253

Reviewed By: @yfeldblum

Differential Revision: D2282985

Pulled By: @sgolemon
---

diff --git a/folly/Conv.h b/folly/Conv.h
index 05b60779..8dd466ae 100644
--- a/folly/Conv.h
+++ b/folly/Conv.h
@@ -815,7 +815,7 @@ typename std::enable_if<sizeof...(Ts) >= 3
     typename detail::last_element<Ts...>::type
   >::type>::value>::type
 toAppend(const Ts&... vs) {
-  detail::toAppendStrImpl(vs...);
+  ::folly::detail::toAppendStrImpl(vs...);
 }
 
 /**
@@ -834,7 +834,7 @@ typename std::enable_if<
     typename detail::last_element<Ts...>::type
   >::type>::value>::type
 toAppendFit(const Ts&... vs) {
-  detail::reserveInTarget(vs...);
+  ::folly::detail::reserveInTarget(vs...);
   toAppend(vs...);
 }