From 2e769b15e5c0d0f433d2ab6d52ae10a13bf731d6 Mon Sep 17 00:00:00 2001 From: Vincent Hardion <vincent.hardion@synchrotron-soleil.fr> Date: Wed, 6 Oct 2010 20:28:53 +0000 Subject: [PATCH] Breakpad Migration --- pom.xml | 4 ++-- src/main.cpp | 21 +++++++++++++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 965548f..72391f4 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ </parent> <groupId>fr.soleil.device</groupId> <artifactId>ContinuousAO-${aol}-${mode}</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> <packaging>nar</packaging> <name>ContinuousAO</name> <description>ContinuousAO device</description> @@ -75,4 +75,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 200bbca..12ef034 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/ContinuousAO/src/main.cpp,v 1.3 2010-03-10 16:25:54 vince_soleil Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/ContinuousAO/src/main.cpp,v 1.4 2010-10-06 20:27:45 vince_soleil Exp $"; //+============================================================================= // // file : main.cpp @@ -12,9 +12,12 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD // // $Author: vince_soleil $ // -// $Revision: 1.3 $ $ +// $Revision: 1.4 $ $ // // $Log: not supported by cvs2svn $ +// Revision 1.3 2010/03/10 16:25:54 vince_soleil +// fix Tango7 migration +// // Revision 1.2 2005/02/09 08:47:43 abeilleg // changes to compil with gcc. // @@ -36,11 +39,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 -- GitLab