diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-29 04:15:55 (GMT) |
|---|---|---|
| committer | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-29 04:15:55 (GMT) |
| commit | 9cb2cae5d24000871070b3b952f2e833ff3a5f8e (patch) | |
| tree | fecf8809d3269e2322c3917ce8dd4f7015a914f6 /config.tests | |
| parent | 6a90b60d5c794470334e961d724b2f26a082cad7 (diff) | |
| parent | 17388e0ca41bd123003fd3703bad8616491b562c (diff) | |
| download | Qt-9cb2cae5d24000871070b3b952f2e833ff3a5f8e.zip Qt-9cb2cae5d24000871070b3b952f2e833ff3a5f8e.tar.gz Qt-9cb2cae5d24000871070b3b952f2e833ff3a5f8e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/unix/stl/stltest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.tests/unix/stl/stltest.cpp b/config.tests/unix/stl/stltest.cpp index ff9b8f9..382f5cb 100644 --- a/config.tests/unix/stl/stltest.cpp +++ b/config.tests/unix/stl/stltest.cpp @@ -69,7 +69,7 @@ class DummyIterator public: T *i; typedef std::random_access_iterator_tag iterator_category; - typedef ptrdiff_t difference_type; + typedef std::ptrdiff_t difference_type; typedef T value_type; typedef T *pointer; typedef T &reference; |