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
This commit is contained in:
KWSys Upstream authored and Brad King committed 2017-03-24 15:16:56 -04:00
1 parent 8ba8b5537c
commit fda80fde76
4 files changed
+15 -12

No files matched your search

+12 -8
View File
@@ -2,18 +2,22 @@
.gitattributes -export-ignore .gitattributes -export-ignore
.hooks* 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 /GitSetup export-ignore
/*.sh export-ignore eol=lf /*.sh export-ignore eol=lf
/*.bash export-ignore eol=lf /*.bash export-ignore eol=lf
/.clang-format export-ignore /.clang-format export-ignore
*.c whitespace=tab-in-indent,no-lf-at-eof *.c our-c-style
*.h whitespace=tab-in-indent,no-lf-at-eof *.c.in our-c-style
*.h.in whitespace=tab-in-indent,no-lf-at-eof *.cxx our-c-style
*.cxx whitespace=tab-in-indent,no-lf-at-eof *.h our-c-style
*.hxx whitespace=tab-in-indent,no-lf-at-eof *.h.in our-c-style
*.hxx.in whitespace=tab-in-indent,no-lf-at-eof *.hxx our-c-style
*.txt whitespace=tab-in-indent,no-lf-at-eof *.hxx.in our-c-style
*.cmake whitespace=tab-in-indent,no-lf-at-eof
*.cmake whitespace=tab-in-indent
*.rst whitespace=tab-in-indent conflict-marker-size=79 *.rst whitespace=tab-in-indent conflict-marker-size=79
*.txt whitespace=tab-in-indent
+1 -2
View File
@@ -25,8 +25,7 @@ namespace @KWSYS_NAMESPACE@ {
#if defined(_WIN32) #if defined(_WIN32)
template <class CharT, class Traits = std::char_traits<CharT> > template <class CharT, class Traits = std::char_traits<CharT> >
class @KWSYS_NAMESPACE@_EXPORT BasicConsoleBuf class BasicConsoleBuf : public std::basic_streambuf<CharT, Traits>
: public std::basic_streambuf<CharT, Traits>
{ {
public: public:
typedef typename Traits::int_type int_type; typedef typename Traits::int_type int_type;
+1 -1
View File
@@ -13,7 +13,7 @@ class @KWSYS_NAMESPACE@_EXPORT Encoding
{ {
public: public:
// Container class for argc/argv. // Container class for argc/argv.
class CommandLineArguments class @KWSYS_NAMESPACE@_EXPORT CommandLineArguments
{ {
public: public:
// On Windows, get the program command line arguments // On Windows, get the program command line arguments
+1 -1
View File
@@ -269,7 +269,7 @@ enum BOM
// If a BOM exists, the stream is advanced to after the BOM. // If a BOM exists, the stream is advanced to after the BOM.
// This function requires a seekable stream (but not a relative // This function requires a seekable stream (but not a relative
// seekable stream). // seekable stream).
BOM ReadBOM(std::istream& in); @KWSYS_NAMESPACE@_EXPORT BOM ReadBOM(std::istream& in);
} }
} }