diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-09-08 11:30:48 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-09-08 12:02:28 +0200 |
| commit | c2f31f16dc9e38ce8f2e8de9c0e5b6904a955d4b (patch) | |
| tree | 018de896384b465fe8c8fffbc9a934cf97d27dfe /src/plugins/cpptools/cppmodelmanager.cpp | |
| parent | c10fe02d12af78db8c73458d9a51eb40deb8dd0f (diff) | |
| download | qt-creator-c2f31f16dc9e38ce8f2e8de9c0e5b6904a955d4b.tar.gz | |
Added support for Microsoft-specific inline keywords
__inline is equivalent to inline.
__forceinline is used to override the cost/benefit analysis.
Change-Id: Ifc7c94c1798f98c553ffa979a722ede9df11b3f0
Merge-request: 2206
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-on: http://codereview.qt-project.org/4416
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index aae798491e..66c05057f8 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -168,7 +168,9 @@ static const char pp_configuration[] = "#define STDMETHOD(method) virtual HRESULT STDMETHODCALLTYPE method\n" "#define __try try\n" "#define __except catch\n" - "#define __finally\n"; + "#define __finally\n" + "#define __inline inline\n" + "#define __forceinline inline\n"; #ifndef ICHECK_BUILD CppPreprocessor::CppPreprocessor(QPointer<CppModelManager> modelManager) |