diff options
| author | Eike Ziller <[email protected]> | 2013-04-08 13:26:37 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2013-04-08 13:26:37 +0200 |
| commit | 65654e4a50d99c64cddddc328310dbccf67341a4 (patch) | |
| tree | 3728ba58a8604157266fb3436518b6994e124a81 /src/libs | |
| parent | 2d2a89941c9fabbb150fdf4a969a6a66f6099ea5 (diff) | |
| parent | bb13b8d65e8a0748750ba03a04e411c1474cfe91 (diff) | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
src/plugins/android/androidrunner.cpp
src/plugins/clearcase/clearcasesync.cpp
src/plugins/fakevim/fakevimhandler.cpp
tests/auto/ioutils/ioutils.pro
Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/cplusplus/pp-engine.cpp | 1 | ||||
| -rw-r--r-- | src/libs/zeroconf/avahiLib.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 4abe88b4928..6e85fe95a57 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -702,6 +702,7 @@ QByteArray Preprocessor::run(const QString &fileName, m_scratchBuffer.clear(); QByteArray preprocessed, includeGuardMacroName; + preprocessed.reserve(source.size() * 2); // multiply by 2 because we insert #gen lines. preprocess(fileName, source, &preprocessed, &includeGuardMacroName, noLines, markGeneratedTokens, false); if (!includeGuardMacroName.isEmpty()) diff --git a/src/libs/zeroconf/avahiLib.cpp b/src/libs/zeroconf/avahiLib.cpp index 5f79901e474..3d34d35222c 100644 --- a/src/libs/zeroconf/avahiLib.cpp +++ b/src/libs/zeroconf/avahiLib.cpp @@ -334,7 +334,6 @@ public: delete connection; return kDNSServiceErr_Unknown; } - typedef void (*AvahiSimplePollSetFuncPtr)(AvahiSimplePoll *s, AvahiPollFunc func, void *userdata); m_simplePollSetFunc(connection->simple_poll, &cAvahiPollFunction, mainConnection); /* Allocate a new client */ int error; |