Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
172 changes: 86 additions & 86 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,96 +1,96 @@
* text=auto !eol svneol=native#text/plain
*.gitattributes text svneol=native#text/plain
* text=auto
*.gitattributes text

# Scriptish formats
*.bat text svneol=native#text/plain
*.bsh text svneol=native#text/x-beanshell
*.cgi text svneol=native#text/plain
*.cmd text svneol=native#text/plain
*.js text svneol=native#text/javascript
*.php text svneol=native#text/x-php
*.pl text svneol=native#text/x-perl
*.pm text svneol=native#text/x-perl
*.py text svneol=native#text/x-python
*.sh eol=lf svneol=LF#text/x-sh
configure eol=lf svneol=LF#text/x-sh
*.bat text
*.bsh text
*.cgi text
*.cmd text
*.js text
*.php text
*.pl text
*.pm text
*.py text
*.sh eol=lf
configure eol=lf

# Image formats
*.bmp binary svneol=unset#image/bmp
*.gif binary svneol=unset#image/gif
*.ico binary svneol=unset#image/ico
*.jpeg binary svneol=unset#image/jpeg
*.jpg binary svneol=unset#image/jpeg
*.png binary svneol=unset#image/png
*.tif binary svneol=unset#image/tiff
*.tiff binary svneol=unset#image/tiff
*.svg text svneol=native#image/svg%2Bxml
*.bmp binary
*.gif binary
*.ico binary
*.jpeg binary
*.jpg binary
*.png binary
*.tif binary
*.tiff binary
*.svg text

# Data formats
*.pdf binary svneol=unset#application/pdf
*.avi binary svneol=unset#video/avi
*.doc binary svneol=unset#application/msword
*.dsp text svneol=crlf#text/plain
*.dsw text svneol=crlf#text/plain
*.eps binary svneol=unset#application/postscript
*.gz binary svneol=unset#application/gzip
*.mov binary svneol=unset#video/quicktime
*.mp3 binary svneol=unset#audio/mpeg
*.ppt binary svneol=unset#application/vnd.ms-powerpoint
*.ps binary svneol=unset#application/postscript
*.psd binary svneol=unset#application/photoshop
*.rdf binary svneol=unset#text/rdf
*.rss text svneol=unset#text/xml
*.rtf binary svneol=unset#text/rtf
*.sln text svneol=native#text/plain
*.swf binary svneol=unset#application/x-shockwave-flash
*.tgz binary svneol=unset#application/gzip
*.vcproj text svneol=native#text/xml
*.vcxproj text svneol=native#text/xml
*.vsprops text svneol=native#text/xml
*.wav binary svneol=unset#audio/wav
*.xls binary svneol=unset#application/vnd.ms-excel
*.zip binary svneol=unset#application/zip
*.pdf binary
*.avi binary
*.doc binary
*.dsp text eol=crlf
*.dsw text eol=crlf
*.eps binary
*.gz binary
*.mov binary
*.mp3 binary
*.ppt binary
*.ps binary
*.psd binary
*.rdf binary
*.rss text
*.rtf binary
*.sln text
*.swf binary
*.tgz binary
*.vcproj text
*.vcxproj text
*.vsprops text
*.wav binary
*.xls binary
*.zip binary

# Text formats
.htaccess text svneol=native#text/plain
*.bbk text svneol=native#text/xml
*.cmake text svneol=native#text/plain
*.css text svneol=native#text/css
*.dtd text svneol=native#text/xml
*.htm text svneol=native#text/html
*.html text svneol=native#text/html
*.ini text svneol=native#text/plain
*.log text svneol=native#text/plain
*.mak text svneol=native#text/plain
*.qbk text svneol=native#text/plain
*.rst text svneol=native#text/plain
*.sql text svneol=native#text/x-sql
*.txt text svneol=native#text/plain
*.xhtml text svneol=native#text/xhtml%2Bxml
*.xml text svneol=native#text/xml
*.xsd text svneol=native#text/xml
*.xsl text svneol=native#text/xml
*.xslt text svneol=native#text/xml
*.xul text svneol=native#text/xul
*.yml text svneol=native#text/plain
boost-no-inspect text svneol=native#text/plain
CHANGES text svneol=native#text/plain
COPYING text svneol=native#text/plain
INSTALL text svneol=native#text/plain
Jamfile text svneol=native#text/plain
Jamroot text svneol=native#text/plain
Jamfile.v2 text svneol=native#text/plain
Jamrules text svneol=native#text/plain
Makefile* text svneol=native#text/plain
README text svneol=native#text/plain
TODO text svneol=native#text/plain
.htaccess text
*.bbk text
*.cmake text
*.css text
*.dtd text
*.htm text
*.html text
*.ini text
*.log text
*.mak text
*.qbk text
*.rst text
*.sql text
*.txt text
*.xhtml text
*.xml text
*.xsd text
*.xsl text
*.xslt text
*.xul text
*.yml text
boost-no-inspect text
CHANGES text
COPYING text
INSTALL text
Jamfile text
Jamroot text
Jamfile.v2 text
Jamrules text
Makefile* text
README text
TODO text

# Code formats
*.c text svneol=native#text/plain
*.cpp text svneol=native#text/plain
*.h text svneol=native#text/plain
*.hpp text svneol=native#text/plain
*.ipp text svneol=native#text/plain
*.tpp text svneol=native#text/plain
*.jam text svneol=native#text/plain
*.java text svneol=native#text/plain
*.c text
*.cpp text
*.h text
*.hpp text
*.ipp text
*.tpp text
*.jam text
*.java text
4 changes: 2 additions & 2 deletions include/boost/container/allocator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ class allocator
void allocate_many(size_type elem_size, std::size_t n_elements, multiallocation_chain &chain)
{
BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
dlmalloc::memchain ch;
dlmalloc::memchain ch;
if(!dlmalloc_heap().multialloc_nodes(n_elements, elem_size*sizeof(T), dlmalloc::default_contiguous, &ch)){
boost::container::throw_bad_alloc();
}
Expand All @@ -309,7 +309,7 @@ class allocator
void allocate_many(const size_type *elem_sizes, size_type n_elements, multiallocation_chain &chain)
{
BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
dlmalloc::memchain ch;
dlmalloc::memchain ch;
if(!dlmalloc_heap().multialloc_arrays(n_elements, elem_sizes, sizeof(T), dlmalloc::default_contiguous, &ch)){
boost::container::throw_bad_alloc();
}
Expand Down
4 changes: 2 additions & 2 deletions include/boost/container/node_allocator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ class node_allocator
void allocate_many(size_type elem_size, std::size_t n_elements, multiallocation_chain &chain)
{
BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
dlmalloc::memchain ch;
dlmalloc::memchain ch;
if(BOOST_UNLIKELY(!dlmalloc_heap().multialloc_nodes(n_elements, elem_size*sizeof(T), dlmalloc::default_contiguous, &ch))){
boost::container::throw_bad_alloc();
}
Expand All @@ -286,7 +286,7 @@ class node_allocator
void allocate_many(const size_type *elem_sizes, size_type n_elements, multiallocation_chain &chain)
{
BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
dlmalloc::memchain ch;
dlmalloc::memchain ch;
dlmalloc_heap().multialloc_arrays(n_elements, elem_sizes, sizeof(T), dlmalloc::default_contiguous, &ch);
if(BOOST_UNLIKELY(ch.empty())){
boost::container::throw_bad_alloc();
Expand Down
Loading