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 /testHashSTL.cxx | |
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 'testHashSTL.cxx')
-rw-r--r-- | testHashSTL.cxx | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/testHashSTL.cxx b/testHashSTL.cxx index ae66ceb..0444874 100644 --- a/testHashSTL.cxx +++ b/testHashSTL.cxx @@ -1,14 +1,5 @@ -/*============================================================================ - 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. */ #include "kwsysPrivate.h" #include KWSYS_HEADER(hash_map.hxx) #include KWSYS_HEADER(hash_set.hxx) @@ -16,18 +7,18 @@ // Work-around CMake dependency scanning limitation. This must // duplicate the above list of headers. #if 0 -# include "hash_map.hxx.in" -# include "hash_set.hxx.in" +#include "hash_map.hxx.in" +#include "hash_set.hxx.in" #endif #include <iostream> #if defined(_MSC_VER) -# pragma warning (disable:4786) +#pragma warning(disable : 4786) #endif #if defined(__sgi) && !defined(__GNUC__) -# pragma set woff 1468 /* inline function cannot be explicitly instantiated */ +#pragma set woff 1468 /* inline function cannot be explicitly instantiated */ #endif template class kwsys::hash_map<const char*, int>; @@ -37,16 +28,15 @@ static bool test_hash_map() { typedef kwsys::hash_map<const char*, int> mtype; mtype m; - const char* keys[] = {"hello", "world"}; + const char* keys[] = { "hello", "world" }; m[keys[0]] = 1; m.insert(mtype::value_type(keys[1], 2)); int sum = 0; - for(mtype::iterator mi = m.begin(); mi != m.end(); ++mi) - { + for (mtype::iterator mi = m.begin(); mi != m.end(); ++mi) { std::cout << "Found entry [" << mi->first << "," << mi->second << "]" << std::endl; sum += mi->second; - } + } return sum == 3; } @@ -57,18 +47,17 @@ static bool test_hash_set() s.insert(1); s.insert(2); int sum = 0; - for(stype::iterator si = s.begin(); si != s.end(); ++si) - { + for (stype::iterator si = s.begin(); si != s.end(); ++si) { std::cout << "Found entry [" << *si << "]" << std::endl; sum += *si; - } + } return sum == 3; } -int testHashSTL(int, char*[]) +int testHashSTL(int, char* []) { bool result = true; result = test_hash_map() && result; result = test_hash_set() && result; - return result? 0:1; + return result ? 0 : 1; } |