From e8cecf68833a3909b2657729fb9689f052f8f049 Mon Sep 17 00:00:00 2001 From: Peter Soetens Date: Fri, 30 Jan 2009 07:59:20 +0100 Subject: [PATCH 1/2] Fix minor compilation/build system errors after omniorb-port. --- config/FindTAO.cmake | 2 +- src/corba/corba.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/FindTAO.cmake b/config/FindTAO.cmake index 3143cf8..e647730 100644 --- a/config/FindTAO.cmake +++ b/config/FindTAO.cmake @@ -84,7 +84,7 @@ IF (ACE_CONFIG AND TAO_ORB AND TAO_ORBSVCS ) LIST(APPEND CORBA_CFLAGS "-I${ACE_DIR}/include") LIST(APPEND CORBA_LINK_DIRECTORIES "${ACE_DIR}/lib") LIST(APPEND CORBA_LDFLAGS "-L${ACE_DIR}/lib") - ENDIF( NOT ${ACE_DIR} STREQUAL /usr/include ) + ENDIF( NOT ${ACE_DIR} STREQUAL /usr ) IF( NOT ${TAO_DIR} STREQUAL /usr AND NOT ${TAO_DIR} STREQUAL ${ACE_DIR}) LIST(APPEND CORBA_INCLUDES ${TAO_DIR}/include) LIST(APPEND CORBA_CFLAGS "-I${TAO_DIR}/include") diff --git a/src/corba/corba.h b/src/corba/corba.h index ad7b91c..4074b74 100644 --- a/src/corba/corba.h +++ b/src/corba/corba.h @@ -4,7 +4,7 @@ #if CORBA_IS_TAO #include #define CORBA_SERVANT(f) f ## "S.h" -#define CORBA_EXCEPTION_INFO(x) x._info.c_str() +#define CORBA_EXCEPTION_INFO(x) x._info().c_str() #else #include namespace CORBA { -- 1.6.1.2