Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1109130: Give MSVC2012 a hint about what these aggregate initializers mean. r=jesup

Browse Source
This commit is contained in:
Byron Campen [:bwc] 2014-12-09 20:16:28 -08:00
parent 2ce0732625
commit d55e0a2714
3 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
View File

@ -121,11 +121,14 @@ JsepSessionImpl::AddAudioRtpExtension(const std::string& extensionName)
return NS_ERROR_FAILURE;
}
mAudioRtpExtensions.push_back(
SdpExtmapAttributeList::Extmap extmap =
{ static_cast<uint16_t>(mAudioRtpExtensions.size() + 1),
SdpDirectionAttribute::kSendrecv,
false, // don't actually specify direction
extensionName, "" });
extensionName,
"" };
mAudioRtpExtensions.push_back(extmap);
return NS_OK;
}
@ -139,11 +142,13 @@ JsepSessionImpl::AddVideoRtpExtension(const std::string& extensionName)
return NS_ERROR_FAILURE;
}
mVideoRtpExtensions.push_back(
SdpExtmapAttributeList::Extmap extmap =
{ static_cast<uint16_t>(mVideoRtpExtensions.size() + 1),
SdpDirectionAttribute::kSendrecv,
false, // don't actually specify direction
extensionName, "" });
extensionName, "" };
mVideoRtpExtensions.push_back(extmap);
return NS_OK;
}
@ -392,7 +397,7 @@ JsepSessionImpl::AddCommonExtmaps(const SdpMediaSection& remoteMsection,
if (ourExtmap->mExtmaps.back().entry >= 4096) {
ourExtmap->mExtmaps.back().entry = j->entry;
}
}
}
}
}

29
media/webrtc/signaling/src/sdp/SdpAttribute.h
View File

@ -256,8 +256,9 @@ public:
bool direction_specified, const std::string& extensionname,
const std::string& extensionattributes = "")
{
mExtmaps.push_back({ entry, direction, direction_specified, extensionname,
extensionattributes });
Extmap value = { entry, direction, direction_specified, extensionname,
extensionattributes };
mExtmaps.push_back(value);
}
virtual void Serialize(std::ostream& os) const MOZ_OVERRIDE;
@ -343,7 +344,8 @@ public:
void
PushEntry(HashAlgorithm hashFunc, const std::vector<uint8_t>& fingerprint)
{
mFingerprints.push_back({ hashFunc, fingerprint });
Fingerprint value = { hashFunc, fingerprint };
mFingerprints.push_back(value);
}
virtual void Serialize(std::ostream& os) const MOZ_OVERRIDE;
@ -420,7 +422,8 @@ public:
void
PushEntry(Semantics semantics, const std::vector<std::string>& tags)
{
mGroups.push_back({ semantics, tags });
Group value = { semantics, tags };
mGroups.push_back(value);
}
virtual void Serialize(std::ostream& os) const MOZ_OVERRIDE;
@ -600,7 +603,8 @@ public:
void
PushEntry(const std::string& identifier, const std::string& appdata = "")
{
mMsids.push_back({ identifier, appdata });
Msid value = { identifier, appdata };
mMsids.push_back(value);
}
virtual void Serialize(std::ostream& os) const MOZ_OVERRIDE;
@ -721,7 +725,8 @@ public:
PushEntry(const std::string& pt, Type type, const std::string& parameter = "",
const std::string& extra = "")
{
mFeedbacks.push_back({ pt, type, parameter, extra });
Feedback value = { pt, type, parameter, extra };
mFeedbacks.push_back(value);
}
virtual void Serialize(std::ostream& os) const MOZ_OVERRIDE;
@ -792,7 +797,8 @@ public:
PushEntry(const std::string& pt, CodecType codec, const std::string& name,
uint32_t clock, uint32_t channels = 0)
{
mRtpmaps.push_back({ pt, codec, name, clock, channels });
Rtpmap value = { pt, codec, name, clock, channels };
mRtpmaps.push_back(value);
}
virtual void Serialize(std::ostream& os) const MOZ_OVERRIDE;
@ -1068,7 +1074,8 @@ public:
PushEntry(const std::string& pt, const std::string& name,
uint32_t streams = 0)
{
mSctpmaps.push_back({ pt, name, streams });
Sctpmap value = { pt, name, streams };
mSctpmaps.push_back(value);
}
virtual void Serialize(std::ostream& os) const MOZ_OVERRIDE;
@ -1168,7 +1175,8 @@ public:
void
PushEntry(uint32_t ssrc, const std::string& attribute)
{
mSsrcs.push_back({ ssrc, attribute });
Ssrc value = { ssrc, attribute };
mSsrcs.push_back(value);
}
virtual void Serialize(std::ostream& os) const MOZ_OVERRIDE;
@ -1204,7 +1212,8 @@ public:
void
PushEntry(Semantics semantics, const std::vector<uint32_t>& ssrcs)
{
mSsrcGroups.push_back({ semantics, ssrcs });
SsrcGroup value = { semantics, ssrcs };
mSsrcGroups.push_back(value);
}
virtual void Serialize(std::ostream& os) const MOZ_OVERRIDE;

3
media/webrtc/signaling/test/signaling_unittests.cpp
View File

@ -1246,7 +1246,8 @@ class SignalingAgent {
if (getRemoteDescription().empty()) {
// Not time to add this, because the unit-test code hasn't set the
// description yet.
deferredCandidates_.push_back({candidate, mid, level, true});
DeferredCandidate candidateStruct = {candidate, mid, level, true};
deferredCandidates_.push_back(candidateStruct);
} else {
AddIceCandidate(candidate, mid, level, true);
}