folly: changes to make nvcc happy

Summary:
(1) small_vector.h line 1099: wrap the default return in an else statement to
avoid compiler warning of "unreachable statement".
(2) Constexpr.h: need to treat cudacc similarly to msvc.

(Note: this ignores all push blocking failures!)

Reviewed By: dzhulgakov

Differential Revision: D5387061

fbshipit-source-id: f002ab5ec00d4dcd85d86386f87a0327023afa1b

folly/portability/Constexpr.h

@@ -101,7 +101,7 @@ template <>
 constexpr size_t constexpr_strlen(const char* s) {
 #if defined(__clang__)
   return __builtin_strlen(s);
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(__CUDACC__)
   return detail::constexpr_strlen_internal(s, 0);
 #else
   return std::strlen(s);

folly/small_vector.h

@@ -1095,11 +1095,11 @@ private:
     value_type* heap() noexcept {
       if (kHasInlineCapacity || !detail::pointerFlagGet(pdata_.heap_)) {
         return static_cast<value_type*>(pdata_.heap_);
-      }
-      return static_cast<value_type*>(
-        detail::shiftPointer(
+      } else {
+        return static_cast<value_type*>(detail::shiftPointer(
             detail::pointerFlagClear(pdata_.heap_), kHeapifyCapacitySize));
       }
+    }
     value_type const* heap() const noexcept {
       return const_cast<Data*>(this)->heap();
     }