diff --git a/pom.xml b/pom.xml index bc1f229512a60f4323af51f6709fd1cc102c625c..95e997ce48193c00cea7008ba042b50285e03556 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ <groupId>fr.soleil.device</groupId> <artifactId>RetrigAO-${aol}-${mode}</artifactId> - <version>1.0.8</version> + <version>1.0.9</version> <packaging>nar</packaging> <name>RetrigAO</name> @@ -81,4 +81,4 @@ <timezone>1</timezone> </developer> </developers> -</project> +</project> \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index abf853cb619eccb9430c974e7a88ce09a2fdf418..c9e0a34c1a22989d8dc93cf69a1856431f5a9495 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/main.cpp,v 1.2 2010-03-11 11:10:25 anoureddine Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/main.cpp,v 1.3 2010-10-06 21:39:24 vince_soleil Exp $"; //+============================================================================= // // file : main.cpp @@ -10,11 +10,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD // // project : TANGO Device Server // -// $Author: anoureddine $ +// $Author: vince_soleil $ // -// $Revision: 1.2 $ $ +// $Revision: 1.3 $ $ // // $Log: not supported by cvs2svn $ +// Revision 1.2 2010/03/11 11:10:25 anoureddine +// deplace #include <tango.h> due to conflict between tang7/ACE +// // Revision 1.1.1.1 2004/12/06 10:23:37 syldup // initial import // @@ -33,12 +36,21 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD #include <tango.h> #include <ace\ACE.h> +#if defined(ENABLE_CRASH_REPORT) +# include <crashreporting/crash_report.h> +#else +# define DECLARE_CRASH_HANDLER +# define INSTALL_CRASH_HANDLER +#endif +DECLARE_CRASH_HANDLER; -int main(int argc,char *argv[]) +int main(int argc, char *argv[]) { + INSTALL_CRASH_HANDLER; + - Tango::Util *tg; + Tango::Util *tg = 0; try { // Initialise the device server