diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-27 13:01:59 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-27 13:02:02 (GMT) |
| commit | 0ff8f127fbbc6bd1fac84bd6f5118ad1efd0e786 (patch) | |
| tree | 5c0a8f39eb0621976636d9f660a1d48bb6c5a9cf /Source | |
| parent | bb27f72d676f0e24c97891a9fd4c0ade9b2140f9 (diff) | |
| parent | ea2a91a43279616a602b641d827e07912ac9c0b9 (diff) | |
| download | CMake-0ff8f127fbbc6bd1fac84bd6f5118ad1efd0e786.zip CMake-0ff8f127fbbc6bd1fac84bd6f5118ad1efd0e786.tar.gz CMake-0ff8f127fbbc6bd1fac84bd6f5118ad1efd0e786.tar.bz2 | |
Merge topic 'update-kwsys'
ea2a91a4 Merge branch 'upstream-KWSys' into update-kwsys
fda80fde KWSys 2017-03-24 (7e9f7b7b)
64490637 update-kwsys: Disable custom gitattributes during import
f1a55839 update-third-party: Add helper to disable custom gitattributes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !624
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/kwsys/.gitattributes | 19 | ||||
| -rw-r--r-- | Source/kwsys/ConsoleBuf.hxx.in | 3 | ||||
| -rw-r--r-- | Source/kwsys/Encoding.hxx.in | 2 | ||||
| -rw-r--r-- | Source/kwsys/FStream.hxx.in | 2 |
4 files changed, 14 insertions, 12 deletions
diff --git a/Source/kwsys/.gitattributes b/Source/kwsys/.gitattributes index a121ad1..3583f39 100644 --- a/Source/kwsys/.gitattributes +++ b/Source/kwsys/.gitattributes @@ -1,12 +1,15 @@ .git* export-ignore -*.c whitespace=tab-in-indent,no-lf-at-eof -*.h whitespace=tab-in-indent,no-lf-at-eof -*.h.in whitespace=tab-in-indent,no-lf-at-eof -*.cxx whitespace=tab-in-indent,no-lf-at-eof -*.hxx whitespace=tab-in-indent,no-lf-at-eof -*.hxx.in whitespace=tab-in-indent,no-lf-at-eof -*.txt whitespace=tab-in-indent,no-lf-at-eof -*.cmake whitespace=tab-in-indent,no-lf-at-eof +*.c our-c-style +*.c.in our-c-style +*.cxx our-c-style +*.h our-c-style +*.h.in our-c-style +*.hxx our-c-style +*.hxx.in our-c-style +*.cmake whitespace=tab-in-indent *.rst whitespace=tab-in-indent conflict-marker-size=79 +*.txt whitespace=tab-in-indent + +* -format.clang-format diff --git a/Source/kwsys/ConsoleBuf.hxx.in b/Source/kwsys/ConsoleBuf.hxx.in index cb58865..32e680c 100644 --- a/Source/kwsys/ConsoleBuf.hxx.in +++ b/Source/kwsys/ConsoleBuf.hxx.in @@ -25,8 +25,7 @@ namespace @KWSYS_NAMESPACE@ { #if defined(_WIN32) template <class CharT, class Traits = std::char_traits<CharT> > -class @KWSYS_NAMESPACE@_EXPORT BasicConsoleBuf - : public std::basic_streambuf<CharT, Traits> +class BasicConsoleBuf : public std::basic_streambuf<CharT, Traits> { public: typedef typename Traits::int_type int_type; diff --git a/Source/kwsys/Encoding.hxx.in b/Source/kwsys/Encoding.hxx.in index 6639efd..bf93f50 100644 --- a/Source/kwsys/Encoding.hxx.in +++ b/Source/kwsys/Encoding.hxx.in @@ -13,7 +13,7 @@ class @KWSYS_NAMESPACE@_EXPORT Encoding { public: // Container class for argc/argv. - class CommandLineArguments + class @KWSYS_NAMESPACE@_EXPORT CommandLineArguments { public: // On Windows, get the program command line arguments 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); } } |