diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-11-25 15:22:13 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:12:07 -0300 |
| commit | 2c2e36a9a58480f7ea0b4f2a7fbc24d0b2e28cdc (patch) | |
| tree | 97703774c7266f2be21b2fccf3eaedf01310875c | |
| parent | d5928178f5e5abd4a0f86f056db5999fa37aefc1 (diff) | |
Fix compilation errors on Windows.
Reviewer: Renato Araújo <renato.filho@openbossa.org>
Luciano Wolf <luciano.wolf@openbossa.org>
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/libsample/samplenamespace.h | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e87f6216..80eb5d384 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,7 @@ endif() if(WIN32 OR AVOID_PROTECTED_HACK) message(STATUS "Avoiding protected hack!") add_definitions("-DAVOID_PROTECTED_HACK") + set(AVOID_PROTECTED_HACK ON) else() message(STATUS "Using protected hack!") endif() diff --git a/tests/libsample/samplenamespace.h b/tests/libsample/samplenamespace.h index 7ac1ec195..d31e27ffe 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; } }; |