diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-24 19:17:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-24 19:17:25 (GMT) |
| commit | ea2a91a43279616a602b641d827e07912ac9c0b9 (patch) | |
| tree | 6389b3d04602600e2efb1c6de33d55638a4ac4b0 /Source/kwsys/FStream.hxx.in | |
| parent | 64490637840b05da7f0829aa52cae7f3923b805e (diff) | |
| parent | fda80fde76c230dda8372bf9d7208520c40f3611 (diff) | |
| download | CMake-ea2a91a43279616a602b641d827e07912ac9c0b9.zip CMake-ea2a91a43279616a602b641d827e07912ac9c0b9.tar.gz CMake-ea2a91a43279616a602b641d827e07912ac9c0b9.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2017-03-24 (7e9f7b7b)
Resolve conflicts in `.gitattributes` by integrating changes from both
sides. Keep the `our-c-style` attribute that KWSys uses, but drop their
definition of it in favor of ours (Git only allows custom attributes in
the top level anyway). Then add our own attribute line to unset the
`format.clang-format` attribute for KWSys sources since we do not want
to format third-party code ourselves.
Diffstat (limited to 'Source/kwsys/FStream.hxx.in')
| -rw-r--r-- | Source/kwsys/FStream.hxx.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/kwsys/FStream.hxx.in b/Source/kwsys/FStream.hxx.in index 736214f..cf331a5 100644 --- a/Source/kwsys/FStream.hxx.in +++ b/Source/kwsys/FStream.hxx.in @@ -269,7 +269,7 @@ enum BOM // If a BOM exists, the stream is advanced to after the BOM. // This function requires a seekable stream (but not a relative // seekable stream). -BOM ReadBOM(std::istream& in); +@KWSYS_NAMESPACE@_EXPORT BOM ReadBOM(std::istream& in); } } |