diff options
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmAlgorithms.h | 3 | ||||
-rw-r--r-- | Source/cmCLocaleEnvironmentScope.h | 3 | ||||
-rw-r--r-- | Source/cmCommandArgumentParserHelper.h | 4 | ||||
-rw-r--r-- | Source/cmGraphAdjacencyList.h | 17 | ||||
-rw-r--r-- | Source/cmListFileCache.h | 6 | ||||
-rw-r--r-- | Source/cmLocale.h | 8 | ||||
-rw-r--r-- | Source/cmSystemTools.h | 5 | ||||
-rw-r--r-- | Source/cmake.h | 2 |
8 files changed, 21 insertions, 27 deletions
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 <typename Range> -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); } 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); 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<char> OutputBuffer; 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; } 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) 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 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<std::string> Env; }; #endif 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; } |