summaryrefslogtreecommitdiff
path: root/Source/cmIDEOptions.h
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2016-05-16 10:34:04 -0400
committerBrad King <brad.king@kitware.com>2016-05-16 16:05:19 -0400
commitd9fd2f5402eeaa345691313658e02b51038f570b (patch)
treedca71b9a7e267f4c6300da3eb770415381726785 /Source/cmIDEOptions.h
parent82df6deaafb36cbbfd450202bb20b320f637751a (diff)
downloadcmake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz
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/cmIDEOptions.h')
-rw-r--r--Source/cmIDEOptions.h20
1 files changed, 12 insertions, 8 deletions
diff --git a/Source/cmIDEOptions.h b/Source/cmIDEOptions.h
index 8c985c78b1..fac7d4e828 100644
--- a/Source/cmIDEOptions.h
+++ b/Source/cmIDEOptions.h
@@ -28,7 +28,7 @@ public:
// Store definitions and flags.
void AddDefine(const std::string& define);
void AddDefines(const char* defines);
- void AddDefines(const std::vector<std::string> &defines);
+ void AddDefines(const std::vector<std::string>& defines);
void AddFlag(const char* flag, const char* value);
void AddFlag(const char* flag, std::vector<std::string> const& value);
void AppendFlag(std::string const& flag, std::string const& value);
@@ -46,23 +46,24 @@ protected:
// Then parse the command line flags specified in CMAKE_CXX_FLAGS
// and CMAKE_C_FLAGS
// and overwrite or add new values to this map
- class FlagValue: public std::vector<std::string>
+ class FlagValue : public std::vector<std::string>
{
typedef std::vector<std::string> derived;
+
public:
FlagValue& operator=(std::string const& r)
- {
+ {
this->resize(1);
this->operator[](0) = r;
return *this;
- }
+ }
FlagValue& operator=(std::vector<std::string> const& r)
- {
+ {
this->derived::operator=(r);
return *this;
- }
+ }
};
- std::map<std::string, FlagValue > FlagMap;
+ std::map<std::string, FlagValue> FlagMap;
// Preprocessor definitions.
std::vector<std::string> Defines;
@@ -74,7 +75,10 @@ protected:
bool AllowDefine;
bool AllowSlash;
cmIDEFlagTable const* DoingFollowing;
- enum { FlagTableCount = 16 };
+ enum
+ {
+ FlagTableCount = 16
+ };
cmIDEFlagTable const* FlagTable[FlagTableCount];
void HandleFlag(const char* flag);
bool CheckFlagTable(cmIDEFlagTable const* table, const char* flag,