generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 82121498-> 82126219

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7896 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-12-15 09:48:07 +00:00
parent dd0601fbcf
commit 032b802a8c
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
talk/app/webrtc/statstypes.cc
View File

@ -53,11 +53,6 @@ StatsReport::StatsReport(const std::string& id)
: id(id), timestamp(0) { : id(id), timestamp(0) {
} }
StatsReport::StatsReport(const std::string& id,
const StatsReport::StatsType& type)
: id(id), type(type), timestamp(0) {
}
StatsReport& StatsReport::operator=(const StatsReport& src) { StatsReport& StatsReport::operator=(const StatsReport& src) {
ASSERT(id == src.id); ASSERT(id == src.id);
type = src.type; type = src.type;

8
talk/app/webrtc/statstypes.h
View File

@ -44,8 +44,9 @@ namespace webrtc {
class StatsReport { class StatsReport {
public: public:
// TODO(tommi): Change this to be an enum. // TODO(tommi): Remove this ctor after removing reliance upon it in Chromium
typedef std::string StatsType; // (mock_peer_connection_impl.cc).
StatsReport() : timestamp(0) {}
// TODO(tommi): Make protected and disallow copy completely once not needed. // TODO(tommi): Make protected and disallow copy completely once not needed.
StatsReport(const StatsReport& src); StatsReport(const StatsReport& src);
@ -53,7 +54,6 @@ class StatsReport {
// Constructor is protected to force use of StatsSet. // Constructor is protected to force use of StatsSet.
// TODO(tommi): Make this ctor protected. // TODO(tommi): Make this ctor protected.
explicit StatsReport(const std::string& id); explicit StatsReport(const std::string& id);
StatsReport(const std::string& id, const StatsType& type);
// TODO(tommi): Make this protected. // TODO(tommi): Make this protected.
StatsReport& operator=(const StatsReport& src); StatsReport& operator=(const StatsReport& src);
@ -70,7 +70,7 @@ class StatsReport {
// so it must never be changed. // so it must never be changed.
// TODO(tommi): Make this member variable const. // TODO(tommi): Make this member variable const.
std::string id; // See below for contents. std::string id; // See below for contents.
StatsType type; // See below for contents. std::string type; // See below for contents.
// StatsValue names. // StatsValue names.
enum StatsValueName { enum StatsValueName {