Update links

This commit is contained in:
Victor Zverovich 2016-04-28 06:54:37 -07:00
parent 56b6c05bf9
commit 59d0efd6d6
4 changed files with 8 additions and 8 deletions

View File

@ -53,9 +53,9 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
aria-expanded="false">{{ version }} <span class="caret"></span></a> aria-expanded="false">{{ version }} <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="http://cppformat.github.io/2.0.0/">2.0.0</a></li> <li><a href="http://fmtlib.net/2.0.0/">2.0.0</a></li>
<li><a href="http://cppformat.github.io/1.1.0/">1.1.0</a></li> <li><a href="http://fmtlib.net/1.1.0/">1.1.0</a></li>
<li><a href="http://cppformat.github.io/1.0.0/">1.0.0</a></li> <li><a href="http://fmtlib.net/1.0.0/">1.0.0</a></li>
</ul> </ul>
</li> </li>
{% for name in ['Contents', 'Usage', 'API', 'Syntax'] %} {% for name in ['Contents', 'Usage', 'API', 'Syntax'] %}

View File

@ -1,7 +1,7 @@
Overview Overview
======== ========
**fmt** (previously cppformat) is an open-source formatting library. **fmt** (formerly cppformat) is an open-source formatting library.
It can be used as a safe alternative to printf or as a fast It can be used as a safe alternative to printf or as a fast
alternative to C++ IOStreams. alternative to C++ IOStreams.
@ -149,7 +149,7 @@ Portability
The library is highly portable. Here is an incomplete list of operating systems and The library is highly portable. Here is an incomplete list of operating systems and
compilers where it has been tested and known to work: compilers where it has been tested and known to work:
* 64-bit (amd64) GNU/Linux with GCC 4.4.3, `4.6.3 <https://travis-ci.org/cppformat/cppformat>`_, * 64-bit (amd64) GNU/Linux with GCC 4.4.3, `4.6.3 <https://travis-ci.org/fmtlib/fmt>`_,
4.7.2, 4.8.1 and Intel C++ Compiler (ICC) 14.0.2 4.7.2, 4.8.1 and Intel C++ Compiler (ICC) 14.0.2
* 32-bit (i386) GNU/Linux with GCC 4.4.3, 4.6.3 * 32-bit (i386) GNU/Linux with GCC 4.4.3, 4.6.3
@ -157,7 +157,7 @@ compilers where it has been tested and known to work:
* Mac OS X with GCC 4.2.1 and Clang 4.2, 5.1.0 * Mac OS X with GCC 4.2.1 and Clang 4.2, 5.1.0
* 64-bit Windows with Visual C++ 2010, 2013 and * 64-bit Windows with Visual C++ 2010, 2013 and
`2015 <https://ci.appveyor.com/project/vitaut/cppformat>`_ `2015 <https://ci.appveyor.com/project/vitaut/fmt>`_
* 32-bit Windows with Visual C++ 2010 * 32-bit Windows with Visual C++ 2010

View File

@ -2118,7 +2118,7 @@ struct ArgArray<N, true/*IsPacked*/> {
static Value make(const T &value) { static Value make(const T &value) {
Value result = MakeValue<Formatter>(value); Value result = MakeValue<Formatter>(value);
// Workaround a bug in Apple LLVM version 4.2 (clang-425.0.28) of clang: // Workaround a bug in Apple LLVM version 4.2 (clang-425.0.28) of clang:
// https://github.com/cppformat/cppformat/issues/276 // https://github.com/fmtlib/fmt/issues/276
(void)result.custom.format; (void)result.custom.format;
return result; return result;
} }

View File

@ -19,7 +19,7 @@ class Git:
dir = tempfile.mkdtemp() dir = tempfile.mkdtemp()
try: try:
git = Git(dir) git = Git(dir)
git('clone', '-b', 'coverity', 'git@github.com:cppformat/cppformat.git', dir) git('clone', '-b', 'coverity', 'git@github.com:fmtlib/fmt.git', dir)
output = git('merge', '-X', 'theirs', '--no-commit', 'origin/master') output = git('merge', '-X', 'theirs', '--no-commit', 'origin/master')
if 'Fast-forward' not in output: if 'Fast-forward' not in output:
git('reset', 'HEAD', '.travis.yml') git('reset', 'HEAD', '.travis.yml')