Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-05-23 19:02:26 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-05-23 19:02:26 (GMT) |
| commit | 0c4eba31839a8174a8d7776b0f55fcbd12899d10 (patch) | |
| tree | d12027713968332f98eee44e6671e95f0f5682ca /Swiften/Elements/JinglePayload.h | |
| parent | 182bdd709a57ab4d17f163ae28c5663fb3dd4287 (diff) | |
| parent | 3f72e2c3b7ce5a83287dc136c68b7ef6d2cc66bd (diff) | |
| download | swift-contrib-0c4eba31839a8174a8d7776b0f55fcbd12899d10.zip swift-contrib-0c4eba31839a8174a8d7776b0f55fcbd12899d10.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Fixed const references to vectors.
Conflicts:
Swiften/Elements/JinglePayload.h
Swiften/Jingle/JingleSession.h
Diffstat (limited to 'Swiften/Elements/JinglePayload.h')
| -rw-r--r-- | Swiften/Elements/JinglePayload.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Elements/JinglePayload.h b/Swiften/Elements/JinglePayload.h index be02543..5c766b8 100644 --- a/Swiften/Elements/JinglePayload.h +++ b/Swiften/Elements/JinglePayload.h @@ -102,7 +102,7 @@ namespace Swift { this->contents.push_back(content); } - const std::vector<JingleContentPayload::ref> getContents() const { + const std::vector<JingleContentPayload::ref>& getContents() const { return contents; } |