diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-03 16:11:46 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-03 16:11:46 +0100 |
| commit | 874ddcb0aede1fb8a3d8077bc11f08203e80b6ba (patch) | |
| tree | 78ec500df7858b45ed4c64d05ef135eaffa400f2 /dep/g3dlite/source/RegistryUtil.cpp | |
| parent | dba602ea1617c42c95fa9703d53f4af0a2b3f35d (diff) | |
| parent | 0db5573d4de436cf14c9f6d113a28800fa278c2c (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
dep/PackageList.txt
src/tools/map_extractor/System.cpp
Diffstat (limited to 'dep/g3dlite/source/RegistryUtil.cpp')
| -rw-r--r-- | dep/g3dlite/source/RegistryUtil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dep/g3dlite/source/RegistryUtil.cpp b/dep/g3dlite/source/RegistryUtil.cpp index fc4cebc2ee5..28ff6955d9b 100644 --- a/dep/g3dlite/source/RegistryUtil.cpp +++ b/dep/g3dlite/source/RegistryUtil.cpp @@ -257,7 +257,7 @@ bool RegistryUtil::writeString(const std::string& key, const std::string& value, // static helpers -static HKEY getRootKeyFromString(const char* str, size_t length) { +static HKEY getRootKeyFromString(const char* str, uint32 length) { debugAssert(str); if (str) { |