From: Axel R. <ro...@us...> - 2011-03-28 23:03:20
|
Update of /cvsroot/sdif/Easdif/matlab In directory vz-cvs-3.sog:/tmp/cvs-serv14170/matlab Modified Files: Fsdif_write_handler.cpp Fsdif_read_handler.cpp CMakeLists.txt Log Message: Fixed visibility warnings. Index: Fsdif_read_handler.cpp =================================================================== RCS file: /cvsroot/sdif/Easdif/matlab/Fsdif_read_handler.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Fsdif_read_handler.cpp 2 Nov 2009 20:14:39 -0000 1.14 --- Fsdif_read_handler.cpp 28 Mar 2011 23:03:18 -0000 1.15 *************** *** 427,431 **** } ! void mexFunction (int nlhs, mxArray *plhs [], int nrhs, const mxArray *prhs []) --- 427,433 ---- } ! #ifdef GCC_HAS_VISIBILITY ! __attribute__ ((visibility("default"))) ! #endif void mexFunction (int nlhs, mxArray *plhs [], int nrhs, const mxArray *prhs []) Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/Easdif/matlab/CMakeLists.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CMakeLists.txt 2 Nov 2009 20:14:39 -0000 1.9 --- CMakeLists.txt 28 Mar 2011 23:03:18 -0000 1.10 *************** *** 70,75 **** ENDIF(${CMAKE_BUILD_TYPE} MATCHES "debug") - SET(ADDFLAGS -DSIZEOF_VOID_P=${CMAKE_SIZEOF_VOID_P}) - STRING(REGEX REPLACE ".*[^L][^D]${MEXFLAGBUILDTYPE}[ \t]*=[ \t]*\([^\n\r]*\).*" "\\1" MEXORIFLAGS ${out}) STRING(REGEX REPLACE ".*[^L][^D]LDFLAGS[ \t]*=[ \t]*\([^\n\r]*\).*" "\\1" MEXORILDFLAGS ${out}) --- 70,73 ---- *************** *** 88,94 **** ! SET(ADDCFLAGS "-DEASDIF_MATLAB_VERSION=${EASDIF_MATLAB_VERSION_MAJ}.${EASDIF_MATLAB_VERSION_MIN}.${EASDIF_MATLAB_VERSION_REL}") - ADD_CUSTOM_TARGET(mex) SET(INSTALL_MEX_FILES ) --- 86,95 ---- ! SET(ADDCFLAGS "-DEASDIF_MATLAB_VERSION=${EASDIF_MATLAB_VERSION_MAJ}.${EASDIF_MATLAB_VERSION_MIN}.${EASDIF_MATLAB_VERSION_REL} -DEASDIF_IS_STATIC") ! ! IF(GCC_HAS_VISIBILITY) ! SET(ADDCFLAGS "${ADDCFLAGS} -DGCC_HAS_VISIBILITY -fvisibility=hidden") ! ENDIF(GCC_HAS_VISIBILITY) ADD_CUSTOM_TARGET(mex) SET(INSTALL_MEX_FILES ) Index: Fsdif_write_handler.cpp =================================================================== RCS file: /cvsroot/sdif/Easdif/matlab/Fsdif_write_handler.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Fsdif_write_handler.cpp 14 Dec 2010 17:36:24 -0000 1.7 --- Fsdif_write_handler.cpp 28 Mar 2011 23:03:18 -0000 1.8 *************** *** 335,339 **** } ! void mexFunction (int nlhs, mxArray *plhs [], int nrhs, const mxArray *prhs []) --- 335,341 ---- } ! #ifdef GCC_HAS_VISIBILITY ! __attribute__ ((visibility("default"))) ! #endif void mexFunction (int nlhs, mxArray *plhs [], int nrhs, const mxArray *prhs []) |