Deluge
diff options
| author | Andrew Resch <andrewresch@gmail.com> | 2008-12-01 01:13:28 +0000 |
|---|---|---|
| committer | Andrew Resch <andrewresch@gmail.com> | 2008-12-01 01:13:28 +0000 |
| commit | ad252697bc349a45857dcbb8a034d59c5a7ec645 (patch) | |
| tree | fc570eaba488c59a59c39bab912e116184e5351e | |
| parent | e38ce4fb20a3c3edb9d6b66523f6740e4b45a822 (diff) | |
| download | deluge-ad252697bc349a45857dcbb8a034d59c5a7ec645.tar.gz deluge-ad252697bc349a45857dcbb8a034d59c5a7ec645.tar.bz2 deluge-ad252697bc349a45857dcbb8a034d59c5a7ec645.zip | |
lt sync 3006
| -rw-r--r-- | libtorrent/include/libtorrent/assert.hpp | 7 | ||||
| -rw-r--r-- | libtorrent/include/libtorrent/lazy_entry.hpp | 1 | ||||
| -rw-r--r-- | libtorrent/src/gzip.cpp | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/libtorrent/include/libtorrent/assert.hpp b/libtorrent/include/libtorrent/assert.hpp index 71a1aa406..0000b6d53 100644 --- a/libtorrent/include/libtorrent/assert.hpp +++ b/libtorrent/include/libtorrent/assert.hpp @@ -33,6 +33,11 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef TORRENT_ASSERT #include "libtorrent/config.hpp" + +#if !defined TORRENT_DEBUG +#define TORRENT_ASSERT(a) do {} while(false) +#else + #include <string> #ifdef __GNUC__ @@ -51,3 +56,5 @@ TORRENT_EXPORT void assert_fail(const char* expr, int line, char const* file, ch #endif +#endif + diff --git a/libtorrent/include/libtorrent/lazy_entry.hpp b/libtorrent/include/libtorrent/lazy_entry.hpp index 547900c99..01d1ac3ca 100644 --- a/libtorrent/include/libtorrent/lazy_entry.hpp +++ b/libtorrent/include/libtorrent/lazy_entry.hpp @@ -38,6 +38,7 @@ POSSIBILITY OF SUCH DAMAGE. #include "libtorrent/assert.hpp" #include "libtorrent/size_type.hpp" #include <iosfwd> +#include <string> namespace libtorrent { diff --git a/libtorrent/src/gzip.cpp b/libtorrent/src/gzip.cpp index 929816240..cf0c5b196 100644 --- a/libtorrent/src/gzip.cpp +++ b/libtorrent/src/gzip.cpp @@ -35,6 +35,7 @@ POSSIBILITY OF SUCH DAMAGE. #include "zlib.h" #include <vector> +#include <string> namespace { |