From c2f31f16dc9e38ce8f2e8de9c0e5b6904a955d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn@lindeijer.nl>
Date: Thu, 8 Sep 2011 11:30:48 +0200
Subject: [PATCH] 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>
---
src/plugins/cpptools/cppmodelmanager.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index aae798491e7..66c05057f8f 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)
--
GitLab