Commit fda80fde authored by Kitware Robot's avatar Kitware Robot Committed by Brad King

KWSys 2017-03-24 (7e9f7b7b)

Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 7e9f7b7bdc8ac54006a40a775867022c4d678b06 (master).

Upstream Shortlog
-----------------

Brad King (3):
      0af48083 Drop custom Git whitespace check attribute
      6365886c Define a custom Git attribute to mark sources using our C style
      d22c2743 clang-format.bash: Use Git attributes to mark files for formatting

Egor Pugin (3):
      ce44c58a FStream: Export ReadBOM() from shared library
      04e24b2b ConsoleBuf: Remove export macro from BasicConsoleBuf template
      858d5edd Encoding: Export CommandLineArguments from shared library
parent 8ba8b553
......@@ -2,18 +2,22 @@
.gitattributes -export-ignore
.hooks* export-ignore
# Custom attribute to mark sources as using our C code style.
#[attr]our-c-style whitespace=tab-in-indent format.clang-format
/GitSetup export-ignore
/*.sh export-ignore eol=lf
/*.bash export-ignore eol=lf
/.clang-format 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
......@@ -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;
......
......@@ -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
......
......@@ -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);
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment