From f8a182584b14b8b1a79c85256c2533782f3ff42d Mon Sep 17 00:00:00 2001 From: Juan Prieto Date: Tue, 4 Nov 2008 16:56:49 +0000 Subject: [PATCH] *** empty log message *** --- .../ConceptInstantHandler.h | 22 +++++++++---------- lib/kernel_Environment/Instant.cxx | 1 + lib/kernel_Environment/Instant.h | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/lib/kernel_Environment/ConceptInstantHandler.h b/lib/kernel_Environment/ConceptInstantHandler.h index b71baba..47e9f74 100644 --- a/lib/kernel_Environment/ConceptInstantHandler.h +++ b/lib/kernel_Environment/ConceptInstantHandler.h @@ -3,8 +3,8 @@ Program: ConceptInstantHandler Module: $RCSfile: ConceptInstantHandler.h,v $ Language: C++ - Date: $Date: 2008/11/04 16:33:55 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/11/04 16:56:49 $ + Version: $Revision: 1.5 $ Objective: Wrapper fo the concepts that subscribe to the instant handler Authot: Monica Maria Lozano Romero @@ -44,17 +44,15 @@ #ifndef __CONCEPTINSTANTHANDLER_H_INCLUDED__ #define __CONCEPTINSTANTHANDLER_H_INCLUDED__ -#if defined(WIN32) - //If we're using a dynamic library - # ifdef CreaEnvironment_BUILD_SHARED - # define CreaEnvironment_EXPORTS __declspec( dllexport ) - # else - # define CreaEnvironment_EXPORTS //__declspec( dllimport ) - # endif //maracasvisulib_EXPORTS -#else - #ifndef CreaEnvironment_EXPORTS - #define CreaEnvironment_EXPORTS + +#if defined(_WIN32) + #ifdef CreaEnvironment_BUILD_SHARED + #define CreaEnvironment_EXPORTS __declspec( dllexport ) + #else + #define CreaEnvironment_EXPORTS #endif +#else + #define CreaEnvironment_EXPORTS #endif diff --git a/lib/kernel_Environment/Instant.cxx b/lib/kernel_Environment/Instant.cxx index 6629a00..465b791 100644 --- a/lib/kernel_Environment/Instant.cxx +++ b/lib/kernel_Environment/Instant.cxx @@ -8,6 +8,7 @@ #include // LOCAL INCLUDES +#include "ConceptInstantHandler.h" #include "Instant.h" // FORWARD REFERENCES diff --git a/lib/kernel_Environment/Instant.h b/lib/kernel_Environment/Instant.h index 7af2a4d..8a98b23 100644 --- a/lib/kernel_Environment/Instant.h +++ b/lib/kernel_Environment/Instant.h @@ -21,7 +21,7 @@ #ifndef __INSTANT_H_INCLUDED__ #define __INSTANT_H_INCLUDED__ -#include "ConceptInstantHandler.h" +//#include "ConceptInstantHandler.h" class CreaEnvironment_EXPORTS Instant { -- 2.49.0