[Libtorrent-commits] SF.net SVN: libtorrent:[10148] trunk
Brought to you by:
arvidn
Menu
▾
▴
[Libtorrent-commits] SF.net SVN: libtorrent:[10148] trunk
|
From: <ar...@us...> - 2014-07-22 01:22:56
|
Revision: 10148
http://sourceforge.net/p/libtorrent/code/10148
Author: arvidn
Date: 2014-07-22 01:22:46 +0000 (Tue, 22 Jul 2014)
Log Message:
-----------
merged change from RC_1_0
Modified Paths:
--------------
trunk/include/libtorrent/Makefile.am
trunk/include/libtorrent/config.hpp
trunk/include/libtorrent/ed25519.hpp
Added Paths:
-----------
trunk/include/libtorrent/export.hpp
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2014-07-22 01:21:17 UTC (rev 10147)
+++ trunk 2014-07-22 01:22:46 UTC (rev 10148)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/branches/RC_0_16:6640,6657,6662,6665,6669,6673-6675,6678,6684,6686,6688,6690,6692,6694-6695,6698,6700,6715,6936,6938,6946,6951,6956,6971,6974,6976,6979,7166,7200,7206,7258,7311,7314,7323,7333,7339,7348,7358,7371,7373,7375,7379,7395,7422,7433,7458,7461,7464,7466,7469,7471,7473,7480,7482,7487,7489,7492-7493,7497,7500,7507,7511,7514,7529,7536,7542,7546,7548-7549,7551,7553,7555,7560-7561,7564,7572,7577,7579,7587,7593-7594,7598-7599,7609,7611,7623-7624,7627,7633,7642,7644,7651,7667,7671,7675,7677,7681,7683,7685,7694,7699,7701,7704-7706,7711,7719,7729,7739,7752,7758,7760,7762,7765,7767,7771,7773,7784,7786,7788,7809,7814,7826,7828,7834,7838,7840,7847,7851,7853,7863-7864,7868,7870,7875,7884,7886,7890,7902,7905-7906,7909,7912,7914-7915,7925,7928,7930,7932,7934,7941,7947,7951,7955,7962,7964,7966,7971,7973,7984,7986,7988,7999,8002-8003,8005,8010,8012,8015,8017,8019,8021,8025,8041,8050,8066,8080,8082,8087,8091,8111,8130,8144,8171,8216,8221,8229,8235,8251,8288,8303,8331,8333,8340,8342,8345,8348,8357,8359-8361,8363,8371,8375,8382,8391,8393,8397,8399-8401,8416,8423,8426,8429,8431,8433,8436,8439,8445,8448,8452,8460,8462,8464,8466,8536,8564,8577,8580,8584,8587,8591,8605-8606,8612,8615,8619,8682,8693-8694,8696,8698,8700,8702,8704,8730,8732-8734,8760,8776-8777,8786,8797,8800,8815,8824,8826,8869,8884,8887,8917,8921-8922,8934,8936,8938,8943,8966,8971,8981-8982,8992,8994,8997,9000,9032-9033,9037,9046,9122,9127,9132,9154,9197,9204,9224,9232,9235,9237,9240,9253-9254,9260,9266-9267,9273,9285,9291,9294-9295,9297,9300,9333,9341,9343,9345,9347,9377,9408,9410,9414,9453,9480,9482,9487,9514,9520,9526,9530,9540,9543,9584,9616,9620,9627,9635,9652,9654,9661,9664,9684,9686,9691,9710,9716,9722,9729,9731,9738,9744,9752,9762,9766-9767,9772,9776,9779,9799,9805,9822,9826,9870,9872,9882,9889,9892,9894,9897,9947,9955,9994,10012,10017,10025,10134
-/branches/RC_1_0:10069-10144
+/branches/RC_1_0:10069-10147
/branches/libtorrent_aio:4468-10083
/branches/libtorrent_aio_arc:6324-6529
/branches/libtorrent_aio_ghost_torrents:6532-7262
\ No newline at end of property
Modified: trunk/include/libtorrent/Makefile.am
===================================================================
--- trunk/include/libtorrent/Makefile.am 2014-07-22 01:21:17 UTC (rev 10147)
+++ trunk/include/libtorrent/Makefile.am 2014-07-22 01:22:46 UTC (rev 10148)
@@ -53,6 +53,7 @@
error.hpp \
error_code.hpp \
escape_string.hpp \
+ export.hpp \
extensions.hpp \
file.hpp \
file_pool.hpp \
Modified: trunk/include/libtorrent/config.hpp
===================================================================
--- trunk/include/libtorrent/config.hpp 2014-07-22 01:21:17 UTC (rev 10147)
+++ trunk/include/libtorrent/config.hpp 2014-07-22 01:22:46 UTC (rev 10148)
@@ -100,40 +100,6 @@
#endif
#endif
-// backwards compatibility with older versions of boost
-#if !defined BOOST_SYMBOL_EXPORT && !defined BOOST_SYMBOL_IMPORT
-# if defined _MSC_VER || defined __MINGW32__
-# define BOOST_SYMBOL_EXPORT __declspec(dllexport)
-# define BOOST_SYMBOL_IMPORT __declspec(dllimport)
-# elif __GNU__ >= 4
-# define BOOST_SYMBOL_EXPORT __attribute__((visibility("default")))
-# define BOOST_SYMBOL_IMPORT __attribute__((visibility("default")))
-# else
-# define BOOST_SYMBOL_EXPORT
-# define BOOST_SYMBOL_IMPORT
-# endif
-#endif
-
-#if defined TORRENT_BUILDING_SHARED
-# define TORRENT_EXPORT BOOST_SYMBOL_EXPORT
-#elif defined TORRENT_LINKING_SHARED
-# define TORRENT_EXPORT BOOST_SYMBOL_IMPORT
-#endif
-
-// when this is specified, export a bunch of extra
-// symbols, mostly for the unit tests to reach
-#if TORRENT_EXPORT_EXTRA
-# if defined TORRENT_BUILDING_SHARED
-# define TORRENT_EXTRA_EXPORT BOOST_SYMBOL_EXPORT
-# elif defined TORRENT_LINKING_SHARED
-# define TORRENT_EXTRA_EXPORT BOOST_SYMBOL_IMPORT
-# endif
-#endif
-
-#ifndef TORRENT_EXTRA_EXPORT
-# define TORRENT_EXTRA_EXPORT
-#endif
-
// ======= GCC =========
#if defined __GNUC__
@@ -499,10 +465,6 @@
#define TORRENT_HAS_FALLOCATE 1
#endif
-#ifndef TORRENT_EXPORT
-# define TORRENT_EXPORT
-#endif
-
#ifndef TORRENT_DEPRECATED_PREFIX
#define TORRENT_DEPRECATED_PREFIX
#endif
Modified: trunk/include/libtorrent/ed25519.hpp
===================================================================
--- trunk/include/libtorrent/ed25519.hpp 2014-07-22 01:21:17 UTC (rev 10147)
+++ trunk/include/libtorrent/ed25519.hpp 2014-07-22 01:22:46 UTC (rev 10148)
@@ -1,7 +1,7 @@
#ifndef ED25519_HPP
#define ED25519_HPP
-#include "libtorrent/config.hpp" // for TORRENT_EXPORT
+#include "libtorrent/export.hpp" // for TORRENT_EXPORT
enum
{
Copied: trunk/include/libtorrent/export.hpp (from rev 10147, branches/RC_1_0/include/libtorrent/export.hpp)
===================================================================
--- trunk/include/libtorrent/export.hpp (rev 0)
+++ trunk/include/libtorrent/export.hpp 2014-07-22 01:22:46 UTC (rev 10148)
@@ -0,0 +1,77 @@
+/*
+
+Copyright (c) 2005-2014, Arvid Norberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the distribution.
+ * Neither the name of the author nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef TORRENT_EXPORT_HPP_INCLUDED
+#define TORRENT_EXPORT_HPP_INCLUDED
+
+#include <boost/config.hpp>
+
+// backwards compatibility with older versions of boost
+#if !defined BOOST_SYMBOL_EXPORT && !defined BOOST_SYMBOL_IMPORT
+# if defined _MSC_VER || defined __MINGW32__
+# define BOOST_SYMBOL_EXPORT __declspec(dllexport)
+# define BOOST_SYMBOL_IMPORT __declspec(dllimport)
+# elif __GNU__ >= 4
+# define BOOST_SYMBOL_EXPORT __attribute__((visibility("default")))
+# define BOOST_SYMBOL_IMPORT __attribute__((visibility("default")))
+# else
+# define BOOST_SYMBOL_EXPORT
+# define BOOST_SYMBOL_IMPORT
+# endif
+#endif
+
+#if defined TORRENT_BUILDING_SHARED
+# define TORRENT_EXPORT BOOST_SYMBOL_EXPORT
+#elif defined TORRENT_LINKING_SHARED
+# define TORRENT_EXPORT BOOST_SYMBOL_IMPORT
+#endif
+
+// when this is specified, export a bunch of extra
+// symbols, mostly for the unit tests to reach
+#if TORRENT_EXPORT_EXTRA
+# if defined TORRENT_BUILDING_SHARED
+# define TORRENT_EXTRA_EXPORT BOOST_SYMBOL_EXPORT
+# elif defined TORRENT_LINKING_SHARED
+# define TORRENT_EXTRA_EXPORT BOOST_SYMBOL_IMPORT
+# endif
+#endif
+
+#ifndef TORRENT_EXPORT
+# define TORRENT_EXPORT
+#endif
+
+#ifndef TORRENT_EXTRA_EXPORT
+# define TORRENT_EXTRA_EXPORT
+#endif
+
+#endif
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|