diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-09 20:11:47 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-09 20:11:47 (GMT) |
| commit | ebd0c2d3771835a1317c1fd70eafd3ebf2135b01 (patch) | |
| tree | 1dc8f5805b5f3f01933bc0035b3b6cad7b04b73a /Source/cmELF.cxx | |
| parent | f9687e328f7ea64ea6384aae11af36fdd3a12643 (diff) | |
| download | CMake-ebd0c2d3771835a1317c1fd70eafd3ebf2135b01.zip CMake-ebd0c2d3771835a1317c1fd70eafd3ebf2135b01.tar.gz CMake-ebd0c2d3771835a1317c1fd70eafd3ebf2135b01.tar.bz2 | |
Merge in changes for RC 3
Diffstat (limited to 'Source/cmELF.cxx')
| -rw-r--r-- | Source/cmELF.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx index c01e220..763fdd8 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -540,7 +540,7 @@ bool cmELFInternalImpl<Types>::LoadDynamicSection() // Allocate the dynamic section entries. ELF_Shdr const& sec = this->SectionHeaders[this->DynamicSectionIndex]; - int n = sec.sh_size / sec.sh_entsize; + int n = static_cast<int>(sec.sh_size / sec.sh_entsize); this->DynamicSectionEntries.resize(n); // Read each entry. @@ -592,7 +592,7 @@ unsigned long cmELFInternalImpl<Types>::GetDynamicEntryPosition(int j) return 0; } ELF_Shdr const& sec = this->SectionHeaders[this->DynamicSectionIndex]; - return sec.sh_offset + sec.sh_entsize*j; + return static_cast<unsigned long>(sec.sh_offset + sec.sh_entsize*j); } //---------------------------------------------------------------------------- |