Bug 595277 followup: add "using" annotation to hide build warnings about nsIWidget::GetLayerManager being hidden. r=roc a=blocking-final+
authorDaniel Holbert <dholbert@cs.stanford.edu>
Thu, 09 Dec 2010 00:45:06 -0800
changeset 58952 670e94973cab4940fcf51863ffa148b68da83040
parent 58951 9e3b27acb9efa02ef95a5590d09664fc1b0c1aeb
child 58953 f4eb46861b6456dd691ccbf542dbf3e48e4d9c30
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersroc, blocking-final
bugs595277
milestone2.0b8pre
Bug 595277 followup: add "using" annotation to hide build warnings about nsIWidget::GetLayerManager being hidden. r=roc a=blocking-final+
widget/public/nsIWidget.h
--- a/widget/public/nsIWidget.h
+++ b/widget/public/nsIWidget.h
@@ -1387,13 +1387,17 @@ class nsIWidget_MOZILLA_2_0_BRANCH : pub
     enum LayerManagerPersistence
     {
       LAYER_MANAGER_CURRENT = 0,
       LAYER_MANAGER_PERSISTENT
     };
 
     virtual LayerManager *GetLayerManager(LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
                                           bool* aAllowRetaining = nsnull) = 0;
+
+    // Hide build warnings about nsIWidget::GetLayerManager being hidden by
+    // our GetLayerManager method above.
+    using nsIWidget::GetLayerManager;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIWidget_MOZILLA_2_0_BRANCH, NS_IWIDGET_MOZILLA_2_0_BRANCH_IID)
 
 #endif // nsIWidget_h__