From aecba65241ae837759472f1104442d299b42d571 Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Fri, 21 Apr 2017 21:33:22 +0200 Subject: cmCLocaleEnvironmentScope: make noncopyable --- Source/cmCLocaleEnvironmentScope.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/cmCLocaleEnvironmentScope.h b/Source/cmCLocaleEnvironmentScope.h index c4065e1..1e7c42a 100644 --- a/Source/cmCLocaleEnvironmentScope.h +++ b/Source/cmCLocaleEnvironmentScope.h @@ -15,6 +15,9 @@ public: ~cmCLocaleEnvironmentScope(); private: + cmCLocaleEnvironmentScope(cmCLocaleEnvironmentScope const&); + cmCLocaleEnvironmentScope& operator=(cmCLocaleEnvironmentScope const&); + std::string GetEnv(std::string const& key); void SetEnv(std::string const& key, std::string const& value); -- cgit v0.12 From 7d6090aec41770414c4f8b9fd78823f1322381d8 Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Fri, 21 Apr 2017 21:36:32 +0200 Subject: cmSystemTools::SaveRestoreEnvironment: make noncopyable Also, make the destructor non-virtual. --- Source/cmSystemTools.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index a8a9995..3ba2c22 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -381,9 +381,12 @@ public: { public: SaveRestoreEnvironment(); - virtual ~SaveRestoreEnvironment(); + ~SaveRestoreEnvironment(); private: + SaveRestoreEnvironment(SaveRestoreEnvironment const&); + SaveRestoreEnvironment& operator=(SaveRestoreEnvironment const&); + std::vector Env; }; #endif -- cgit v0.12 From b799ca42b8a2fdf7d92a75c0edc3292934a3926a Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Fri, 21 Apr 2017 21:40:54 +0200 Subject: cmAlgorithms: pass std::string by const ref --- Source/cmAlgorithms.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h index 70581ad..4adfe23 100644 --- a/Source/cmAlgorithms.h +++ b/Source/cmAlgorithms.h @@ -360,7 +360,8 @@ std::string cmWrap(std::string const& prefix, Range const& r, } template -std::string cmWrap(char prefix, Range const& r, char suffix, std::string sep) +std::string cmWrap(char prefix, Range const& r, char suffix, + std::string const& sep) { return cmWrap(std::string(1, prefix), r, std::string(1, suffix), sep); } -- cgit v0.12 From 3f677f207653b33ff55d82e4d03653e146df3910 Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Fri, 21 Apr 2017 21:42:45 +0200 Subject: cmGraphEdge: remove custom copy ctor Also, merge the other ctors using default args. --- Source/cmGraphAdjacencyList.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/Source/cmGraphAdjacencyList.h b/Source/cmGraphAdjacencyList.h index 527db16..46cf878 100644 --- a/Source/cmGraphAdjacencyList.h +++ b/Source/cmGraphAdjacencyList.h @@ -15,26 +15,11 @@ class cmGraphEdge { public: - cmGraphEdge() - : Dest(0) - , Strong(true) - { - } - cmGraphEdge(int n) - : Dest(n) - , Strong(true) - { - } - cmGraphEdge(int n, bool s) + cmGraphEdge(int n = 0, bool s = true) : Dest(n) , Strong(s) { } - cmGraphEdge(cmGraphEdge const& r) - : Dest(r.Dest) - , Strong(r.Strong) - { - } operator int() const { return this->Dest; } bool IsStrong() const { return this->Strong; } -- cgit v0.12 From 44963b509b08b59081bbe3f0a55e806fa2c3152b Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Fri, 21 Apr 2017 21:46:58 +0200 Subject: cmLocaleRAII: make noncopyable --- Source/cmLocale.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/cmLocale.h b/Source/cmLocale.h index b98009f..086f448 100644 --- a/Source/cmLocale.h +++ b/Source/cmLocale.h @@ -10,8 +10,6 @@ class cmLocaleRAII { - std::string OldLocale; - public: cmLocaleRAII() : OldLocale(setlocale(LC_CTYPE, CM_NULLPTR)) @@ -19,6 +17,12 @@ public: setlocale(LC_CTYPE, ""); } ~cmLocaleRAII() { setlocale(LC_CTYPE, this->OldLocale.c_str()); } + +private: + cmLocaleRAII(cmLocaleRAII const&); + cmLocaleRAII& operator=(cmLocaleRAII const&); + + std::string OldLocale; }; #endif -- cgit v0.12 From 0d0995b7f8bc3ca6b88e8794ab03b0c7a1c2a8ca Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Fri, 21 Apr 2017 21:50:45 +0200 Subject: cmListFileArgument: remove custom copy ctor --- Source/cmListFileCache.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Source/cmListFileCache.h b/Source/cmListFileCache.h index bda4ea3..aa11ba7 100644 --- a/Source/cmListFileCache.h +++ b/Source/cmListFileCache.h @@ -45,12 +45,6 @@ struct cmListFileArgument , Line(0) { } - cmListFileArgument(const cmListFileArgument& r) - : Value(r.Value) - , Delim(r.Delim) - , Line(r.Line) - { - } cmListFileArgument(const std::string& v, Delimiter d, long line) : Value(v) , Delim(d) -- cgit v0.12 From 765822add7896f256078006191b2629bcf778849 Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Fri, 21 Apr 2017 21:55:04 +0200 Subject: cmake: pass cmStateSnapshot by const ref --- Source/cmake.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmake.h b/Source/cmake.h index 4c292f0..6a6beb4 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -409,7 +409,7 @@ public: void WatchUnusedCli(const std::string& var); cmState* GetState() const { return this->State; } - void SetCurrentSnapshot(cmStateSnapshot snapshot) + void SetCurrentSnapshot(cmStateSnapshot const& snapshot) { this->CurrentSnapshot = snapshot; } -- cgit v0.12 From a28894e4d412000a4b9850fe9f41c7b1c1499a8d Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Fri, 21 Apr 2017 22:00:09 +0200 Subject: cmCommandArgumentParserHelper: make noncopyable --- Source/cmCommandArgumentParserHelper.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/cmCommandArgumentParserHelper.h b/Source/cmCommandArgumentParserHelper.h index 2b65a5a..c0c1cd9 100644 --- a/Source/cmCommandArgumentParserHelper.h +++ b/Source/cmCommandArgumentParserHelper.h @@ -60,6 +60,10 @@ public: char BSLASHVariable[3]; private: + cmCommandArgumentParserHelper(cmCommandArgumentParserHelper const&); + cmCommandArgumentParserHelper& operator=( + cmCommandArgumentParserHelper const&); + std::string::size_type InputBufferPos; std::string InputBuffer; std::vector OutputBuffer; -- cgit v0.12