Bug 1260653 (follow-up) - Use |MOZ_CONSTEXPR| instead of |constexpr| to unbreak builds with VS 2013. r=birtles.
authorNicholas Nethercote <nnethercote@mozilla.com>
Fri, 01 Apr 2016 13:51:18 +1100
changeset 291181 456df967efef1a9c621c9ededd6bf5530baedd7f
parent 291180 3dbb54c784bf9bbaaa6769604c1de746763006fe
child 291182 1ec5f90ead463d460c46523e1719695418ea8183
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbirtles
bugs1260653
milestone48.0a1
Bug 1260653 (follow-up) - Use |MOZ_CONSTEXPR| instead of |constexpr| to unbreak builds with VS 2013. r=birtles.
dom/bindings/DOMJSClass.h
--- a/dom/bindings/DOMJSClass.h
+++ b/dom/bindings/DOMJSClass.h
@@ -4,16 +4,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_dom_DOMJSClass_h
 #define mozilla_dom_DOMJSClass_h
 
 #include "jsfriendapi.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/Likely.h"
 
 #include "mozilla/dom/PrototypeList.h" // auto-generated
 
 #include "mozilla/dom/JSSlots.h"
 
 class nsCycleCollectionParticipant;
 
@@ -193,17 +194,17 @@ struct NativePropertiesN {
   struct Trio {
     const /*Prefable<const T>*/ void* const mPrefables;
     const jsid* const mIds;
     const /*T*/ void* const mSpecs;
   };
 
   const int32_t iteratorAliasMethodIndex;
 
-  constexpr const NativePropertiesN<7>* Upcast() const {
+  MOZ_CONSTEXPR const NativePropertiesN<7>* Upcast() const {
     return reinterpret_cast<const NativePropertiesN<7>*>(this);
   }
 
 #define DO(SpecT, FieldName) \
 public: \
   /* The bitfields indicating the trio's presence and (if present) offset. */ \
   const uint32_t mHas##FieldName##s:1; \
   const uint32_t m##FieldName##sOffset:3; \