summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-11-25 15:22:13 -0200
committerHugo Parente Lima <hugo.pl@gmail.com>2010-11-25 15:31:39 -0200
commit907842acf4baa9e520431157bf1b0293476d65c3 (patch)
treeba5c8e06cf02f60c255953918f6f60c068040794 /tests
parent6e11fa52dd2d02bb9e4a5cf6aeb1e25e62770ea3 (diff)
downloadshiboken-907842acf4baa9e520431157bf1b0293476d65c3.tar.gz
shiboken-907842acf4baa9e520431157bf1b0293476d65c3.tar.xz
shiboken-907842acf4baa9e520431157bf1b0293476d65c3.zip
Fix compilation errors on Windows.
Reviewer: Renato Ara├║jo <renato.filho@openbossa.org> Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/libsample/samplenamespace.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/libsample/samplenamespace.h b/tests/libsample/samplenamespace.h
index 7ac1ec19..d31e27ff 100644
--- a/tests/libsample/samplenamespace.h
+++ b/tests/libsample/samplenamespace.h
@@ -99,11 +99,10 @@ public:
class DerivedFromNamespace : public SomeClass::SomeInnerClass::OkThisIsRecursiveEnough
{
public:
-#ifndef _MSC_VER
- //only cause namespace confusion
- enum SampleNamespace {
- };
-#endif
+ // FIXME Uncomment this when the fix for MSVC is available
+ // only to cause namespace confusion
+// enum SampleNamespace {
+// };
virtual OkThisIsRecursiveEnough* someVirtualMethod(OkThisIsRecursiveEnough* arg) { return arg; }
inline OkThisIsRecursiveEnough* methodReturningTypeFromParentScope() { return 0; }
};