diff options
author | KWSys Upstream <kwrobot@kitware.com> | 2016-11-09 14:12:29 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-11-09 14:22:56 (GMT) |
commit | 773b36e5d4af3ac040625e0ea16bcfd30fcdeb6d (patch) | |
tree | bd409d3f09f6714981a444e896e1bc08e22ee184 /String.hxx.in | |
parent | 53862f04a0002894c0ef5aeb23d52495e5abe60d (diff) | |
download | CMake-773b36e5d4af3ac040625e0ea16bcfd30fcdeb6d.zip CMake-773b36e5d4af3ac040625e0ea16bcfd30fcdeb6d.tar.gz CMake-773b36e5d4af3ac040625e0ea16bcfd30fcdeb6d.tar.bz2 |
KWSys 2016-11-09 (18c65411)
Code extracted from:
http://public.kitware.com/KWSys.git
at commit 18c654114de3aa65429542f95308720bc68f9231 (master).
Upstream Shortlog
-----------------
Brad King (14):
37306a1c FStream: Quiet unused argument warning
15e90a3c Sort includes to stabilize include order w.r.t. clang-format
26509227 Copyright.txt: Add notice of copyright by contributors
fc42d3f2 Add temporary script to filter license notices
c41c1bc4 Simplify KWSys per-source license notices
1d4c0b4a Remove temporary script that filtered license notices
a4f5ef79 SystemInformation: Remove stray comment
8649a886 kwsysPrivate: Protect KWSYS_HEADER macro from clang-format
89b98af5 Configure clang-format for KWSys source tree
547dacad Add a script to run clang-format on the entire source tree
aa94be0c CONTRIBUTING: Add a section on coding style
6604c4b6 Empty commit at end of history preceding clang-format style transition
2b3e2b1c Tell Git to not export 'clang-format' infrastructure
18c65411 FStream: Include Configure.hxx before other headers
Kitware Robot (1):
6c973b46 Revise C++ coding style using clang-format
Diffstat (limited to 'String.hxx.in')
-rw-r--r-- | String.hxx.in | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/String.hxx.in b/String.hxx.in index 2e9aedb..db1cf22 100644 --- a/String.hxx.in +++ b/String.hxx.in @@ -1,21 +1,11 @@ -/*============================================================================ - KWSys - Kitware System Library - Copyright 2000-2009 Kitware, Inc., Insight Software Consortium - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing#kwsys for details. */ #ifndef @KWSYS_NAMESPACE@_String_hxx #define @KWSYS_NAMESPACE@_String_hxx #include <string> -namespace @KWSYS_NAMESPACE@ -{ +namespace @KWSYS_NAMESPACE@ { /** \class String * \brief Short-name version of the STL basic_string class template. @@ -25,39 +15,49 @@ namespace @KWSYS_NAMESPACE@ * simply a subclass of this type with the same interface so that the * name is shorter in debugging symbols and error messages. */ -class String: public std::string +class String : public std::string { /** The original string type. */ typedef std::string stl_string; public: - /** String member types. */ - typedef stl_string::value_type value_type; - typedef stl_string::pointer pointer; - typedef stl_string::reference reference; - typedef stl_string::const_reference const_reference; - typedef stl_string::size_type size_type; - typedef stl_string::difference_type difference_type; - typedef stl_string::iterator iterator; - typedef stl_string::const_iterator const_iterator; - typedef stl_string::reverse_iterator reverse_iterator; + typedef stl_string::value_type value_type; + typedef stl_string::pointer pointer; + typedef stl_string::reference reference; + typedef stl_string::const_reference const_reference; + typedef stl_string::size_type size_type; + typedef stl_string::difference_type difference_type; + typedef stl_string::iterator iterator; + typedef stl_string::const_iterator const_iterator; + typedef stl_string::reverse_iterator reverse_iterator; typedef stl_string::const_reverse_iterator const_reverse_iterator; /** String constructors. */ - String(): stl_string() {} - String(const value_type* s): stl_string(s) {} - String(const value_type* s, size_type n): stl_string(s, n) {} - String(const stl_string& s, size_type pos=0, size_type n=npos): - stl_string(s, pos, n) {} + String() + : stl_string() + { + } + String(const value_type* s) + : stl_string(s) + { + } + String(const value_type* s, size_type n) + : stl_string(s, n) + { + } + String(const stl_string& s, size_type pos = 0, size_type n = npos) + : stl_string(s, pos, n) + { + } }; // End Class: String #if defined(__WATCOMC__) inline bool operator<(String const& l, String const& r) - { +{ return (static_cast<std::string const&>(l) < static_cast<std::string const&>(r)); - } +} #endif } // namespace @KWSYS_NAMESPACE@ |