Bug 928674: Add static_cast to explicitly convert RelationType enum values into integer values, to fix build error. r=surkov
authorDaniel Holbert <dholbert@cs.stanford.edu>
Sun, 20 Oct 2013 05:08:42 +0200
changeset 166228 0502bca5354d17c4249d3569e1b13dab9185424b
parent 166227 d0286101dcd4d9e82f94e5f9eaa44c36a1974be0
child 166229 dbf01bda0a79667646ee07be6c66bceacdff765b
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssurkov
bugs928674
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 928674: Add static_cast to explicitly convert RelationType enum values into integer values, to fix build error. r=surkov
accessible/src/windows/msaa/AccessibleWrap.cpp
--- a/accessible/src/windows/msaa/AccessibleWrap.cpp
+++ b/accessible/src/windows/msaa/AccessibleWrap.cpp
@@ -916,65 +916,65 @@ AccessibleWrap::accNavigate(
     case NAVDIR_DOWN:
     case NAVDIR_LEFT:
     case NAVDIR_RIGHT:
     case NAVDIR_UP:
       return E_NOTIMPL;
 
     // MSAA relationship extensions to accNavigate
     case NAVRELATION_CONTROLLED_BY:
-      xpRelation = RelationType::CONTROLLED_BY;
+      xpRelation = static_cast<int32_t>(RelationType::CONTROLLED_BY);
       break;
     case NAVRELATION_CONTROLLER_FOR:
-      xpRelation = RelationType::CONTROLLER_FOR;
+      xpRelation = static_cast<int32_t>(RelationType::CONTROLLER_FOR);
       break;
     case NAVRELATION_LABEL_FOR:
-      xpRelation = RelationType::LABEL_FOR;
+      xpRelation = static_cast<int32_t>(RelationType::LABEL_FOR);
       break;
     case NAVRELATION_LABELLED_BY:
-      xpRelation = RelationType::LABELLED_BY;
+      xpRelation = static_cast<int32_t>(RelationType::LABELLED_BY);
       break;
     case NAVRELATION_MEMBER_OF:
-      xpRelation = RelationType::MEMBER_OF;
+      xpRelation = static_cast<int32_t>(RelationType::MEMBER_OF);
       break;
     case NAVRELATION_NODE_CHILD_OF:
-      xpRelation = RelationType::NODE_CHILD_OF;
+      xpRelation = static_cast<int32_t>(RelationType::NODE_CHILD_OF);
       break;
     case NAVRELATION_FLOWS_TO:
-      xpRelation = RelationType::FLOWS_TO;
+      xpRelation = static_cast<int32_t>(RelationType::FLOWS_TO);
       break;
     case NAVRELATION_FLOWS_FROM:
-      xpRelation = RelationType::FLOWS_FROM;
+      xpRelation = static_cast<int32_t>(RelationType::FLOWS_FROM);
       break;
     case NAVRELATION_SUBWINDOW_OF:
-      xpRelation = RelationType::SUBWINDOW_OF;
+      xpRelation = static_cast<int32_t>(RelationType::SUBWINDOW_OF);
       break;
     case NAVRELATION_EMBEDS:
-      xpRelation = RelationType::EMBEDS;
+      xpRelation = static_cast<int32_t>(RelationType::EMBEDS);
       break;
     case NAVRELATION_EMBEDDED_BY:
-      xpRelation = RelationType::EMBEDDED_BY;
+      xpRelation = static_cast<int32_t>(RelationType::EMBEDDED_BY);
       break;
     case NAVRELATION_POPUP_FOR:
-      xpRelation = RelationType::POPUP_FOR;
+      xpRelation = static_cast<int32_t>(RelationType::POPUP_FOR);
       break;
     case NAVRELATION_PARENT_WINDOW_OF:
-      xpRelation = RelationType::PARENT_WINDOW_OF;
+      xpRelation = static_cast<int32_t>(RelationType::PARENT_WINDOW_OF);
       break;
     case NAVRELATION_DEFAULT_BUTTON:
-      xpRelation = RelationType::DEFAULT_BUTTON;
+      xpRelation = static_cast<int32_t>(RelationType::DEFAULT_BUTTON);
       break;
     case NAVRELATION_DESCRIBED_BY:
-      xpRelation = RelationType::DESCRIBED_BY;
+      xpRelation = static_cast<int32_t>(RelationType::DESCRIBED_BY);
       break;
     case NAVRELATION_DESCRIPTION_FOR:
-      xpRelation = RelationType::DESCRIPTION_FOR;
+      xpRelation = static_cast<int32_t>(RelationType::DESCRIPTION_FOR);
       break;
     case NAVRELATION_NODE_PARENT_OF:
-      xpRelation = RelationType::NODE_PARENT_OF;
+      xpRelation = static_cast<int32_t>(RelationType::NODE_PARENT_OF);
       break;
 
     default:
       return E_INVALIDARG;
   }
 
   pvarEndUpAt->vt = VT_EMPTY;