Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-07-24 15:42:17 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2015-07-24 15:42:17 (GMT) |
| commit | 744884d4ed76658880a3d25f6e6551ef92700a8f (patch) | |
| tree | 5fd09d05a22a9d2f10ac937e402bd68a23fec4e2 /Swiften/Base/Concat.h | |
| parent | 6ca201d0b48f4273e24dd7bff17c4a46eeaddf39 (diff) | |
| download | swift-744884d4ed76658880a3d25f6e6551ef92700a8f.zip swift-744884d4ed76658880a3d25f6e6551ef92700a8f.tar.bz2 | |
Add missing includes for dependencies in public header files
Added Swiften/Base/Concat.h to the exception list for <algorithm>
include, as Concat.h uses std::copy, defined in <algorithm>.
Added Swiften/FileTransfer/S5BTransportSession.h to the exception
list for <boost/bind.hpp> include, as S5BTransportSession.h
declares a template class using boost::bind.
Test-Information:
Tested that each of Swiften's public header files compiles on its
own.
Change-Id: Iac794b6e0f5959cd8261888a67761813b710fe85
Diffstat (limited to 'Swiften/Base/Concat.h')
| -rw-r--r-- | Swiften/Base/Concat.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Swiften/Base/Concat.h b/Swiften/Base/Concat.h index 97b04f2..1d158d5 100644 --- a/Swiften/Base/Concat.h +++ b/Swiften/Base/Concat.h | |||
| @@ -1,13 +1,15 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2011 Isode Limited. | 2 | * Copyright (c) 2011-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #pragma once | 7 | #pragma once |
| 8 | 8 | ||
| 9 | #include <algorithm> | ||
| 10 | |||
| 9 | namespace Swift { | 11 | namespace Swift { |
| 10 | template<typename C> | 12 | template<typename C> |
| 11 | C concat(const C& c1, const C& c2) { | 13 | C concat(const C& c1, const C& c2) { |
| 12 | C result; | 14 | C result; |
| 13 | result.resize(c1.size() + c2.size()); | 15 | result.resize(c1.size() + c2.size()); |