summaryrefslogtreecommitdiffstats
path: root/Source/kwsys/SystemInformation.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-05-11 15:34:27 (GMT)
committerBrad King <brad.king@kitware.com>2018-05-11 15:34:27 (GMT)
commit05d67d2545e3b3f9659dc615c72cc20e6d4781b7 (patch)
treef4dd44527b51e1d4968b28eb6c212474772a6f41 /Source/kwsys/SystemInformation.cxx
parentc9e995c9efdaa462ac2649f1c1ff4e511db7fcf5 (diff)
parent55efd14733a8ad6bfeebcd661f85d312eeaa409d (diff)
downloadCMake-05d67d2545e3b3f9659dc615c72cc20e6d4781b7.zip
CMake-05d67d2545e3b3f9659dc615c72cc20e6d4781b7.tar.gz
CMake-05d67d2545e3b3f9659dc615c72cc20e6d4781b7.tar.bz2
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys: KWSys 2018-05-11 (46da6b14)
Diffstat (limited to 'Source/kwsys/SystemInformation.cxx')
-rw-r--r--Source/kwsys/SystemInformation.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
index 7426816..37dec13 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -1270,7 +1270,7 @@ public:
long GetLineNumber() const { return this->LineNumber; }
// Description:
- // Set the address where the biinary image is mapped
+ // Set the address where the binary image is mapped
// into memory.
void SetBinaryBaseAddress(void* address)
{
@@ -4061,7 +4061,7 @@ bool SystemInformationImplementation::QueryLinuxMemory()
if (linuxMajor >= 3 || ((linuxMajor >= 2) && (linuxMinor >= 6))) {
// new /proc/meminfo format since kernel 2.6.x
- // Rigorously, this test should check from the developping version 2.5.x
+ // Rigorously, this test should check from the developing version 2.5.x
// that introduced the new format...
enum