summaryrefslogtreecommitdiffstats
path: root/Source/cmDefinitions.h
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2016-05-16 14:34:04 (GMT)
committerBrad King <brad.king@kitware.com>2016-05-16 20:05:19 (GMT)
commitd9fd2f5402eeaa345691313658e02b51038f570b (patch)
treedca71b9a7e267f4c6300da3eb770415381726785 /Source/cmDefinitions.h
parent82df6deaafb36cbbfd450202bb20b320f637751a (diff)
downloadCMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip
CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz
CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update all our C++ code to a new style defined by `.clang-format`. Use `clang-format` version 3.8. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
Diffstat (limited to 'Source/cmDefinitions.h')
-rw-r--r--Source/cmDefinitions.h51
1 files changed, 33 insertions, 18 deletions
diff --git a/Source/cmDefinitions.h b/Source/cmDefinitions.h
index 411867c..7be0098 100644
--- a/Source/cmDefinitions.h
+++ b/Source/cmDefinitions.h
@@ -36,41 +36,56 @@
class cmDefinitions
{
typedef cmLinkedTree<cmDefinitions>::iterator StackIter;
+
public:
- static const char* Get(const std::string& key,
- StackIter begin, StackIter end);
+ static const char* Get(const std::string& key, StackIter begin,
+ StackIter end);
- static void Raise(const std::string& key,
- StackIter begin, StackIter end);
+ static void Raise(const std::string& key, StackIter begin, StackIter end);
- static bool HasKey(const std::string& key,
- StackIter begin, StackIter end);
+ static bool HasKey(const std::string& key, StackIter begin, StackIter end);
/** Set (or unset if null) a value associated with a key. */
void Set(const std::string& key, const char* value);
std::vector<std::string> UnusedKeys() const;
- static std::vector<std::string> ClosureKeys(StackIter begin,
- StackIter end);
+ static std::vector<std::string> ClosureKeys(StackIter begin, StackIter end);
static cmDefinitions MakeClosure(StackIter begin, StackIter end);
private:
// String with existence boolean.
- struct Def: public std::string
+ struct Def : public std::string
{
private:
typedef std::string std_string;
+
public:
- Def(): std_string(), Exists(false), Used(false) {}
+ Def()
+ : std_string()
+ , Exists(false)
+ , Used(false)
+ {
+ }
Def(const char* v)
- : std_string(v ? v : ""),
- Exists(v ? true : false),
- Used(false)
- {}
- Def(const std_string& v): std_string(v), Exists(true), Used(false) {}
- Def(Def const& d): std_string(d), Exists(d.Exists), Used(d.Used) {}
+ : std_string(v ? v : "")
+ , Exists(v ? true : false)
+ , Used(false)
+ {
+ }
+ Def(const std_string& v)
+ : std_string(v)
+ , Exists(true)
+ , Used(false)
+ {
+ }
+ Def(Def const& d)
+ : std_string(d)
+ , Exists(d.Exists)
+ , Used(d.Used)
+ {
+ }
bool Exists;
bool Used;
};
@@ -87,8 +102,8 @@ private:
#endif
MapType Map;
- static Def const& GetInternal(const std::string& key,
- StackIter begin, StackIter end, bool raise);
+ static Def const& GetInternal(const std::string& key, StackIter begin,
+ StackIter end, bool raise);
};
#endif