diff options
| author | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-08-29 15:09:34 +0000 |
|---|---|---|
| committer | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-08-29 15:09:34 +0000 |
| commit | 9b6dc1a5856229a0dfe1fb5838c1a1e2ea02cb6d (patch) | |
| tree | 4a112ed17bc16dfc6509ff26b4f0783d386647a4 /src/pugixpath.cpp | |
| parent | 608d5bbd79b120602a3a5272fa73ca3d5916aeb1 (diff) | |
Added workarounds for all instances of DMC overfetch bug
git-svn-id: http://pugixml.googlecode.com/svn/trunk@640 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'src/pugixpath.cpp')
| -rw-r--r-- | src/pugixpath.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/pugixpath.cpp b/src/pugixpath.cpp index c4134ed..e0ab730 100644 --- a/src/pugixpath.cpp +++ b/src/pugixpath.cpp @@ -2357,7 +2357,15 @@ namespace pugi if (!r.empty() && r[r.size() - 1] != ' ') r += ' '; } - else r += *it; + else + { + #ifdef __DMC__ + volatile // explicitly store to local to work around DMC bug (it loads 4 bytes from &*it otherwise) + #endif + char_t ch = *it; + + r += ch; + } } string_t::size_type pos = r.find_last_not_of(' '); @@ -2375,7 +2383,10 @@ namespace pugi for (string_t::iterator it = s.begin(); it != s.end(); ) { - char_t ch = *it; // explicitly store to local to work around DMC bug (it loads 4 bytes from &*it otherwise) + #ifdef __DMC__ + volatile // explicitly store to local to work around DMC bug (it loads 4 bytes from &*it otherwise) + #endif + char_t ch = *it; string_t::size_type pos = from.find(ch); |