Bug 1039216: Fix build break when building JB 4.2 (under bluetooth2/), r=btian
authorThomas Zimmermann <tdz@users.sourceforge.net>
Wed, 02 Jul 2014 17:42:21 +0800
changeset 216534 5c83d0b682ac8f09809b5ebf4786d880d29273bc
parent 216533 5ed8045dab5057bc97c915934806b1606f6a3188
child 216535 ed8b4a50ffe64048ad8f7506ea1150b139066297
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbtian
bugs1039216
milestone33.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 1039216: Fix build break when building JB 4.2 (under bluetooth2/), r=btian
dom/bluetooth2/bluedroid/BluetoothInterface.h
--- a/dom/bluetooth2/bluedroid/BluetoothInterface.h
+++ b/dom/bluetooth2/bluedroid/BluetoothInterface.h
@@ -41,17 +41,17 @@ public:
                        int aConnectionState) { }
   virtual void Accept(int aSockFd, const nsAString& aBdAddress,
                       int aConnectionState) { }
 };
 
 class BluetoothSocketInterface
 {
 public:
-  friend BluetoothInterface;
+  friend class BluetoothInterface;
 
   // Init and Cleanup is handled by BluetoothInterface
 
   void Listen(btsock_type_t aType,
               const char* aServiceName, const uint8_t* aServiceUuid,
               int aChannel, int aFlags, BluetoothSocketResultHandler* aRes);
 
   void Connect(const bt_bdaddr_t* aBdAddr, btsock_type_t aType,
@@ -70,17 +70,17 @@ private:
 
 //
 // Handsfree Interface
 //
 
 class BluetoothHandsfreeInterface
 {
 public:
-  friend BluetoothInterface;
+  friend class BluetoothInterface;
 
   bt_status_t Init(bthf_callbacks_t* aCallbacks);
   void        Cleanup();
 
   /* Connect / Disconnect */
 
   bt_status_t Connect(bt_bdaddr_t* aBdAddr);
   bt_status_t Disconnect(bt_bdaddr_t* aBdAddr);
@@ -132,17 +132,17 @@ private:
 
 //
 // Bluetooth Advanced Audio Interface
 //
 
 class BluetoothA2dpInterface
 {
 public:
-  friend BluetoothInterface;
+  friend class BluetoothInterface;
 
   bt_status_t Init(btav_callbacks_t *aCallbacks);
   void        Cleanup();
 
   bt_status_t Connect(bt_bdaddr_t *aBdAddr);
   bt_status_t Disconnect(bt_bdaddr_t *aBdAddr);
 
 protected:
@@ -156,17 +156,17 @@ private:
 //
 // Bluetooth AVRCP Interface
 //
 
 class BluetoothAvrcpInterface
 {
 #if ANDROID_VERSION >= 18
 public:
-  friend BluetoothInterface;
+  friend class BluetoothInterface;
 
   bt_status_t Init(btrc_callbacks_t* aCallbacks);
   void        Cleanup();
 
   bt_status_t GetPlayStatusRsp(btrc_play_status_t aPlayStatus,
                                uint32_t aSongLen, uint32_t aSongPos);
 
   bt_status_t ListPlayerAppAttrRsp(int aNumAttr, btrc_player_attr_t* aPAttrs);