Skip to content

Commit e3b91c7

Browse files
deanberrisdeanberris
committed
Merging changes from origin/master
2 parents e7b7d2a + d0c4957 commit e3b91c7

27 files changed

+168
-175
lines changed

‎boost/network/version.hpp

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,22 @@
22
#define BOOST_NETWORK_VERSION_HPP_20091214
33

44
// Copyright Dean Michael Berris 2009.
5+
// Copyright Glyn Matthews 2010.
56
// Distributed under the Boost Software License, Version 1.0.
67
// (See accompanying file LICENSE_1_0.txt or copy at
78
// http://www.boost.org/LICENSE_1_0.txt)
89

10+
#include <boost/config.hpp>
11+
12+
#define BOOST_NETLIB_VERSION_MAJOR 0
13+
#define BOOST_NETLIB_VERSION_MINOR 7
14+
#define BOOST_NETLIB_VERSION_INCREMENT 1
15+
916
#ifndef BOOST_NETLIB_VERSION
10-
# define BOOST_NETLIB_VERSION "0.6"
11-
#endif
17+
# define BOOST_NETLIB_VERSION \
18+
BOOST_STRINGIZE(BOOST_NETLIB_VERSION_MAJOR) "." \
19+
BOOST_STRINGIZE(BOOST_NETLIB_VERSION_MINOR) "." \
20+
BOOST_STRINGIZE(BOOST_NETLIB_VERSION_INCREMENT)
21+
#endif // BOOST_NETLIB_VERSION
1222

1323
#endif // BOOST_NETWORK_VERSION_HPP_20091214
14-

‎libs/network/doc/getting_started.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ http://svn.github.com/mikhailberis/cpp-netlib.git.
5757
.. _msysGit: http://code.google.com/p/msysgit/downloads/list
5858
.. _Subversion: http://subversion.tigris.org/
5959

60-
.. note:: The :mod:`cpp-netlib` project is hosted on GitHub_ and follows the
60+
.. note:: The :mod:`cpp-netlib` project is hosted on GitHub_ and follows the
6161
prescribed development model for GitHub_ based projects. This means in case
6262
you want to submit patches, you will have to create a fork of the project
6363
(read up on forking_) and then submit a pull request (read up on submitting
@@ -70,7 +70,7 @@ Getting Boost
7070
=============
7171

7272
:mod:`cpp-netlib` depends on Boost_. It should work for any version
73-
of Boost above 1.41.0. If Boost is not installed on your system, the
73+
of Boost above 1.43.0. If Boost is not installed on your system, the
7474
latest package can be found on the `Boost web-site`_. The environment
7575
variable ``BOOST_ROOT`` must be defined, which must be the full path
7676
name of the top directory of the Boost distribution. Although Boost
@@ -164,7 +164,7 @@ join the discussion) you have a few options to choose from.
164164

165165
For reporting bugs, feature requests, and asking questions about the
166166
implementation and/or the documentation, you can go to the GitHub issues page
167-
for the project at http://github.com/mikhailberis/cpp-netlib/issues.
167+
for the project at http://github.com/cpp-netlib/cpp-netlib/issues.
168168

169169
You can also opt to join the developers mailing list for a more personal
170170
interaction with the developers of the project. You can join the mailing list
@@ -173,4 +173,4 @@ through https://lists.sourceforge.net/lists/listinfo/cpp-netlib-devel.
173173
You may also choose to get commercial support from:
174174

175175
Dean Michael Berris - <me@deanberris.com>
176-
176+

‎libs/network/doc/html/_sources/getting_started.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ http://svn.github.com/mikhailberis/cpp-netlib.git.
5757
.. _msysGit: http://code.google.com/p/msysgit/downloads/list
5858
.. _Subversion: http://subversion.tigris.org/
5959

60-
.. note:: The :mod:`cpp-netlib` project is hosted on GitHub_ and follows the
60+
.. note:: The :mod:`cpp-netlib` project is hosted on GitHub_ and follows the
6161
prescribed development model for GitHub_ based projects. This means in case
6262
you want to submit patches, you will have to create a fork of the project
6363
(read up on forking_) and then submit a pull request (read up on submitting
@@ -70,7 +70,7 @@ Getting Boost
7070
=============
7171

7272
:mod:`cpp-netlib` depends on Boost_. It should work for any version
73-
of Boost above 1.41.0. If Boost is not installed on your system, the
73+
of Boost above 1.43.0. If Boost is not installed on your system, the
7474
latest package can be found on the `Boost web-site`_. The environment
7575
variable ``BOOST_ROOT`` must be defined, which must be the full path
7676
name of the top directory of the Boost distribution. Although Boost
@@ -164,7 +164,7 @@ join the discussion) you have a few options to choose from.
164164

165165
For reporting bugs, feature requests, and asking questions about the
166166
implementation and/or the documentation, you can go to the GitHub issues page
167-
for the project at http://github.com/mikhailberis/cpp-netlib/issues.
167+
for the project at http://github.com/cpp-netlib/cpp-netlib/issues.
168168

169169
You can also opt to join the developers mailing list for a more personal
170170
interaction with the developers of the project. You can join the mailing list
@@ -173,4 +173,4 @@ through https://lists.sourceforge.net/lists/listinfo/cpp-netlib-devel.
173173
You may also choose to get commercial support from:
174174

175175
Dean Michael Berris - <me@deanberris.com>
176-
176+

‎libs/network/doc/html/_sources/index.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
.. :Authors: Glyn Matthews <glyn.matthews@gmail.com>
1414
.. Dean Michael Berris <mikhailberis@gmail.com>
1515
.. :Date: Oct 9, 2010
16-
.. :Version: 0.7
16+
.. :Version: 0.7.1
1717
.. :Description: Complete user documentation, with examples, for the :mod:`cpp-netlib`.
1818
.. :Copyright: Copyright Glyn Matthews, Dean Michael Berris 2008-2010.
1919
.. Distributed under the Boost Software License, Version
@@ -33,11 +33,11 @@ some point in the future be submitted for review into Boost. A
3333
presentation about :mod:`cpp-netlib` was given at `BoostCon 2010`_,
3434
for which the `slides`_ and the `paper`_ can be found on-line.
3535

36-
Sneak Peak
36+
Sneak Peek
3737
----------
3838

3939
The :mod:`cpp-netlib` allows you to write semantically consistent code for
40-
making different kinds of higher level network applications.
40+
making different kinds of higher level network applications.
4141

4242
The library allows for writing simple code for simple C++ HTTP client
4343
applications like:
@@ -60,7 +60,7 @@ Download
6060

6161
You can download the latest releases of the library at:
6262

63-
http://github.com/mikhailberis/cpp-netlib/downloads
63+
http://github.com/cpp-netlib/cpp-netlib/downloads
6464

6565
You can also get the latest developments from the Git_ repository at:
6666

@@ -69,7 +69,7 @@ You can also get the latest developments from the Git_ repository at:
6969
You can find more information about the progress of the development by checking
7070
the GitHub_ project page at:
7171

72-
http://github.com/mikhailberis/cpp-netlib
72+
http://github.com/cpp-netlib/cpp-netlib
7373

7474
Support
7575
-------
@@ -81,7 +81,7 @@ mailing list by joining via:
8181

8282
You may also file issues on the Github_ issue tracker at:
8383

84-
http://github.com/mikhailberis/cpp-netlib/issues
84+
http://github.com/cpp-netlib/cpp-netlib/issues
8585

8686
Contents
8787
--------
@@ -95,7 +95,6 @@ Contents
9595
in_depth.rst
9696
techniques.rst
9797
history.rst
98-
install.rst
9998
references.rst
10099

101100
.. _Boost: http://www.boost.org/

‎libs/network/doc/html/directives.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<head>
88
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
99

10-
<title>Directives &mdash; cpp-netlib v0.7 documentation</title>
10+
<title>Directives &mdash; cpp-netlib v0.7.1 documentation</title>
1111
<link rel="stylesheet" href="_static/cpp-netlib.css" type="text/css" />
1212
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1313
<script type="text/javascript">
1414
var DOCUMENTATION_OPTIONS = {
1515
URL_ROOT: '',
16-
VERSION: '0.7',
16+
VERSION: '0.7.1',
1717
COLLAPSE_INDEX: false,
1818
FILE_SUFFIX: '.html',
1919
HAS_SOURCE: true
@@ -22,7 +22,7 @@
2222
<script type="text/javascript" src="_static/jquery.js"></script>
2323
<script type="text/javascript" src="_static/underscore.js"></script>
2424
<script type="text/javascript" src="_static/doctools.js"></script>
25-
<link rel="top" title="cpp-netlib v0.7 documentation" href="index.html" />
25+
<link rel="top" title="cpp-netlib v0.7.1 documentation" href="index.html" />
2626
<link rel="up" title="Techniques" href="techniques.html" />
2727
<link rel="next" title="Static and dynamic polymorphism" href="polymorphism.html" />
2828
<link rel="prev" title="Tag metafunctions" href="tag_metafunctions.html" />
@@ -32,7 +32,7 @@
3232
<div class="document">
3333
<div id="custom-doc" class="yui-t4">
3434
<div id="hd">
35-
<h1><a href="index.html">cpp-netlib v0.7 documentation</a></h1>
35+
<h1><a href="index.html">cpp-netlib v0.7.1 documentation</a></h1>
3636
<div class="nav">
3737
&laquo; <a href="tag_metafunctions.html" title="Tag metafunctions">previous</a>
3838
|
@@ -153,7 +153,7 @@ <h3>Browse</h3>
153153
<h3>You are here:</h3>
154154
<ul>
155155
<li>
156-
<a href="index.html">cpp-netlib v0.7 documentation</a>
156+
<a href="index.html">cpp-netlib v0.7.1 documentation</a>
157157

158158
<ul><li><a href="techniques.html">Techniques</a>
159159

‎libs/network/doc/html/examples.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<head>
88
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
99

10-
<title>Examples &mdash; cpp-netlib v0.7 documentation</title>
10+
<title>Examples &mdash; cpp-netlib v0.7.1 documentation</title>
1111
<link rel="stylesheet" href="_static/cpp-netlib.css" type="text/css" />
1212
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1313
<script type="text/javascript">
1414
var DOCUMENTATION_OPTIONS = {
1515
URL_ROOT: '',
16-
VERSION: '0.7',
16+
VERSION: '0.7.1',
1717
COLLAPSE_INDEX: false,
1818
FILE_SUFFIX: '.html',
1919
HAS_SOURCE: true
@@ -22,7 +22,7 @@
2222
<script type="text/javascript" src="_static/jquery.js"></script>
2323
<script type="text/javascript" src="_static/underscore.js"></script>
2424
<script type="text/javascript" src="_static/doctools.js"></script>
25-
<link rel="top" title="cpp-netlib v0.7 documentation" href="index.html" />
25+
<link rel="top" title="cpp-netlib v0.7.1 documentation" href="index.html" />
2626
<link rel="next" title="HTTP examples" href="examples_http.html" />
2727
<link rel="prev" title="Getting Started" href="getting_started.html" />
2828
</head>
@@ -31,11 +31,11 @@
3131
<div class="document">
3232
<div id="custom-doc" class="yui-t4">
3333
<div id="hd">
34-
<h1><a href="index.html">cpp-netlib v0.7 documentation</a></h1>
34+
<h1><a href="index.html">cpp-netlib v0.7.1 documentation</a></h1>
3535
<div class="nav">
3636
&laquo; <a href="getting_started.html" title="Getting Started">previous</a>
3737
|
38-
<a title="cpp-netlib v0.7 documentation" href="index.html" accesskey="U">up</a>
38+
<a title="cpp-netlib v0.7.1 documentation" href="index.html" accesskey="U">up</a>
3939
|
4040
<a href="examples_http.html" title="HTTP examples">next</a> &raquo;</div>
4141
</div>
@@ -86,7 +86,7 @@ <h3>Browse</h3>
8686
<h3>You are here:</h3>
8787
<ul>
8888
<li>
89-
<a href="index.html">cpp-netlib v0.7 documentation</a>
89+
<a href="index.html">cpp-netlib v0.7.1 documentation</a>
9090

9191
<ul><li>Examples</li></ul>
9292

@@ -122,7 +122,7 @@ <h3>Quick search</h3>
122122
<div class="nav">
123123
&laquo; <a href="getting_started.html" title="Getting Started">previous</a>
124124
|
125-
<a title="cpp-netlib v0.7 documentation" href="index.html" accesskey="U">up</a>
125+
<a title="cpp-netlib v0.7.1 documentation" href="index.html" accesskey="U">up</a>
126126
|
127127
<a href="examples_http.html" title="HTTP examples">next</a> &raquo;</div>
128128
</div>

‎libs/network/doc/html/examples_http.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<head>
88
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
99

10-
<title>HTTP examples &mdash; cpp-netlib v0.7 documentation</title>
10+
<title>HTTP examples &mdash; cpp-netlib v0.7.1 documentation</title>
1111
<link rel="stylesheet" href="_static/cpp-netlib.css" type="text/css" />
1212
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1313
<script type="text/javascript">
1414
var DOCUMENTATION_OPTIONS = {
1515
URL_ROOT: '',
16-
VERSION: '0.7',
16+
VERSION: '0.7.1',
1717
COLLAPSE_INDEX: false,
1818
FILE_SUFFIX: '.html',
1919
HAS_SOURCE: true
@@ -22,7 +22,7 @@
2222
<script type="text/javascript" src="_static/jquery.js"></script>
2323
<script type="text/javascript" src="_static/underscore.js"></script>
2424
<script type="text/javascript" src="_static/doctools.js"></script>
25-
<link rel="top" title="cpp-netlib v0.7 documentation" href="index.html" />
25+
<link rel="top" title="cpp-netlib v0.7.1 documentation" href="index.html" />
2626
<link rel="up" title="Examples" href="examples.html" />
2727
<link rel="next" title="HTTP client" href="http_client.html" />
2828
<link rel="prev" title="Examples" href="examples.html" />
@@ -32,7 +32,7 @@
3232
<div class="document">
3333
<div id="custom-doc" class="yui-t4">
3434
<div id="hd">
35-
<h1><a href="index.html">cpp-netlib v0.7 documentation</a></h1>
35+
<h1><a href="index.html">cpp-netlib v0.7.1 documentation</a></h1>
3636
<div class="nav">
3737
&laquo; <a href="examples.html" title="Examples">previous</a>
3838
|
@@ -97,7 +97,7 @@ <h3>Browse</h3>
9797
<h3>You are here:</h3>
9898
<ul>
9999
<li>
100-
<a href="index.html">cpp-netlib v0.7 documentation</a>
100+
<a href="index.html">cpp-netlib v0.7.1 documentation</a>
101101

102102
<ul><li><a href="examples.html">Examples</a>
103103

‎libs/network/doc/html/genindex.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<head>
88
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
99

10-
<title>Index &mdash; cpp-netlib v0.7 documentation</title>
10+
<title>Index &mdash; cpp-netlib v0.7.1 documentation</title>
1111
<link rel="stylesheet" href="_static/cpp-netlib.css" type="text/css" />
1212
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1313
<script type="text/javascript">
1414
var DOCUMENTATION_OPTIONS = {
1515
URL_ROOT: '',
16-
VERSION: '0.7',
16+
VERSION: '0.7.1',
1717
COLLAPSE_INDEX: false,
1818
FILE_SUFFIX: '.html',
1919
HAS_SOURCE: true
@@ -22,16 +22,16 @@
2222
<script type="text/javascript" src="_static/jquery.js"></script>
2323
<script type="text/javascript" src="_static/underscore.js"></script>
2424
<script type="text/javascript" src="_static/doctools.js"></script>
25-
<link rel="top" title="cpp-netlib v0.7 documentation" href="index.html" />
25+
<link rel="top" title="cpp-netlib v0.7.1 documentation" href="index.html" />
2626
</head>
2727
<body>
2828

2929
<div class="document">
3030
<div id="custom-doc" class="">
3131
<div id="hd">
32-
<h1><a href="index.html">cpp-netlib v0.7 documentation</a></h1>
32+
<h1><a href="index.html">cpp-netlib v0.7.1 documentation</a></h1>
3333
<div class="nav">
34-
<a title="cpp-netlib v0.7 documentation" href="index.html" accesskey="U">up</a></div>
34+
<a title="cpp-netlib v0.7.1 documentation" href="index.html" accesskey="U">up</a></div>
3535
</div>
3636

3737
<div id="bd">
@@ -55,7 +55,7 @@ <h1 id="index">Index</h1>
5555

5656
<div id="ft">
5757
<div class="nav">
58-
<a title="cpp-netlib v0.7 documentation" href="index.html" accesskey="U">up</a></div>
58+
<a title="cpp-netlib v0.7.1 documentation" href="index.html" accesskey="U">up</a></div>
5959
</div>
6060
</div>
6161

0 commit comments

Comments
 (0)