]> git.ipfire.org Git - thirdparty/squid.git/commit
Fix build with GCC 4.7 (and probably other C++11 compilers).
authorDmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Fri, 22 Jun 2012 03:49:38 +0000 (21:49 -0600)
committerAlex Rousskov <rousskov@measurement-factory.com>
Fri, 22 Jun 2012 03:49:38 +0000 (21:49 -0600)
commitc91ca3cec34cae248147cec7d710c3d6f46bdb46
treed488f202b36f8e7da2dab34e44ce0e0c0d5010a1
parent95adbb710300ae9621ca69db40704661c6e61cb7
Fix build with GCC 4.7 (and probably other C++11 compilers).

User-defined literals introduced by C++11 break some previously valid
code, resulting in errors when building with GCC v4.7. For example:

  error: unable to find string literal operator 'operator"" PRIu64'

In particular, whitespace is now needed after a string literal and
before something that could be a valid user-defined literal.  See
"User-defined literals and whitespace" section at [1] for more details.

The patch adds spaces between string literals and macros.

[1] http://gcc.gnu.org/gcc-4.7/porting_to.html
25 files changed:
src/BodyPipe.cc
src/ClientDelayConfig.cc
src/DelaySpec.cc
src/DiskIO/DiskDaemon/diskd.cc
src/HttpHdrContRange.cc
src/HttpHdrRange.cc
src/MemObject.cc
src/MemStore.cc
src/SwapDir.cc
src/cache_cf.cc
src/client_side.cc
src/fde.cc
src/fs/coss/store_dir_coss.cc
src/fs/rock/RockSwapDir.cc
src/fs/ufs/store_dir_ufs.cc
src/ftp.cc
src/log/FormatHttpdCombined.cc
src/log/FormatHttpdCommon.cc
src/log/FormatSquidIcap.cc
src/log/FormatSquidNative.cc
src/stat.cc
src/store_client.cc
src/store_dir.cc
src/store_log.cc
src/tools.cc