X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=blobdiff_plain;f=folly%2FFBString.h;h=f5b577a777d61cb939ae66e89c9475fe7222fe1e;hp=c10490abeecfe4ce67953a7066516c7783dde2f6;hb=5cef863eee8a03e1b6b137fb283d6fe703f35d2d;hpb=24c892da36fc7d4f8cad6a3c94bdf6f1024d99c4

diff --git a/folly/FBString.h b/folly/FBString.h
index c10490ab..f5b577a7 100644
--- a/folly/FBString.h
+++ b/folly/FBString.h
@@ -1238,11 +1238,14 @@ public:
   // otherwise MSVC 2017 will aggressively pre-resolve value_type to
   // traits_type::char_type, which won't compare as equal when determining
   // which overload the implementation is referring to.
+  // Also note that MSVC 2015 Update 3 requires us to explicitly specify the
+  // namespace in-which to search for basic_fbstring, otherwise it tries to
+  // look for basic_fbstring::basic_fbstring, which is just plain wrong.
   template <typename TP>
   typename std::enable_if<
       std::is_same<
           typename std::decay<TP>::type,
-          typename basic_fbstring<E, T, A, Storage>::value_type>::value,
+          typename folly::basic_fbstring<E, T, A, Storage>::value_type>::value,
       basic_fbstring<E, T, A, Storage>&>::type
   operator=(TP c);