Skip to content

Commit 257aefe

Browse files
committed
Merge pull request cpp-netlib#254 from deanberris/0.9-devel
This is a PR that brings 0.9-devel into 0.10.0 release readiness.
2 parents fef3b8e + b86879e commit 257aefe

File tree

81 files changed

+1716
-2900
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1716
-2900
lines changed

boost/network/protocol/http/client/connection/async_normal.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ namespace boost { namespace network { namespace http { namespace impl {
172172
} else {
173173
set_errors(ec ? ec : boost::asio::error::host_not_found);
174174
boost::iterator_range<const char*> range;
175-
callback(range,ec);
175+
if (callback) callback(range,ec);
176176
}
177177
}
178178
}

boost/network/version.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#include <boost/config.hpp>
1111

1212
#define BOOST_NETLIB_VERSION_MAJOR 0
13-
#define BOOST_NETLIB_VERSION_MINOR 9
14-
#define BOOST_NETLIB_VERSION_INCREMENT 5
13+
#define BOOST_NETLIB_VERSION_MINOR 10
14+
#define BOOST_NETLIB_VERSION_INCREMENT 0
1515

1616
#ifndef BOOST_NETLIB_VERSION
1717
# define BOOST_NETLIB_VERSION \

libs/network/doc/_templates/genindex.html

Lines changed: 0 additions & 4 deletions
This file was deleted.

libs/network/doc/_templates/layout.html

Lines changed: 0 additions & 109 deletions
This file was deleted.

libs/network/doc/_templates/modindex.html

Lines changed: 0 additions & 3 deletions
This file was deleted.

libs/network/doc/_templates/search.html

Lines changed: 0 additions & 3 deletions
This file was deleted.

libs/network/doc/conf.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
todo_include_todos = True
3333

3434
# Add any paths that contain templates here, relative to this directory.
35-
templates_path = ['_templates']
35+
# templates_path = ['_templates']
3636

3737
# The suffix of source filenames.
3838
source_suffix = '.rst'
@@ -52,9 +52,9 @@
5252
# built documents.
5353
#
5454
# The short X.Y version.
55-
version = '0.9'
55+
version = '0.10'
5656
# The full version, including alpha/beta/rc tags.
57-
release = '0.9.5'
57+
release = '0.10.0'
5858

5959
# The language for content autogenerated by Sphinx. Refer to documentation
6060
# for a list of supported languages.
@@ -73,22 +73,22 @@
7373
exclude_trees = ['build', 'doxyxml', 'ext']
7474

7575
# If true, '()' will be appended to :func: etc. cross-reference text.
76-
#add_function_parentheses = True
76+
# add_function_parentheses = True
7777

7878
# If true, the current module name will be prepended to all description
7979
# unit titles (such as .. function::).
8080
add_module_names = True
8181

8282
# If true, sectionauthor and moduleauthor directives will be shown in the
8383
# output. They are ignored by default.
84-
#show_authors = False
84+
# show_authors = False
8585

8686
# The name of the Pygments (syntax highlighting) style to use.
8787
# pygments_style = 'sphinx'
88-
pygments_style = 'bw'
88+
pygments_style = 'sphinx'
8989

9090
# A list of ignored prefixes for module index sorting.
91-
#modindex_common_prefix = []
91+
# modindex_common_prefix = []
9292

9393

9494
# -- Options for HTML output ---------------------------------------------------
@@ -99,20 +99,19 @@
9999

100100
# The name for this set of Sphinx documents. If None, it defaults to
101101
# "<project> v<release> documentation".
102-
html_title = 'cpp-netlib v0.9.5'
102+
html_title = 'cpp-netlib v0.10.0'
103103

104104
# A shorter title for the navigation bar. Default is the same as html_title.
105-
#html_short_title = 'cpp-netlib'
105+
# html_short_title = 'cpp-netlib'
106106

107107
# Use an HTML index.
108108
html_use_index = False
109109

110110
# Add any paths that contain custom static files (such as style sheets) here,
111111
# relative to this directory. They are copied after the builtin static files,
112112
# so a file named "default.css" will overwrite the builtin "default.css".
113-
html_style = 'cpp-netlib.css'
114-
html_static_path = ['_static']
115-
113+
# html_style = 'cpp-netlib.css'
114+
# html_static_path = ['_static']
116115
# html_translator_class = "adjusts.CppNetlibHTMLTranslator"
117116

118117
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
@@ -124,4 +123,4 @@
124123
html_use_smartypants = True
125124

126125
# Output file base name for HTML help builder.
127-
htmlhelp_basename = 'cpp-netlibdoc'
126+
# htmlhelp_basename = 'cpp-netlibdoc'

libs/network/doc/html/.buildinfo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: 08239cf2918f3b576f229180a785211f
4-
tags: fbb0d17656682115ca4d033fb2f83ba1
3+
config:
4+
tags:
50 Bytes
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy