From a780413e83a7db5432aef8a338b017e7b7ff2218 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 | 23 ++++++++++++++++++-----
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8ce2c0c..262404d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
</parent>
<groupId>fr.soleil.device</groupId>
<artifactId>AcquireWaveformLecroy-${aol}-${mode}</artifactId>
- <version>1.1.8</version>
+ <version>1.1.9</version>
<packaging>nar</packaging>
<name>AcquireWaveformLecroy</name>
<description>AcquireWaveformLecroy device</description>
@@ -65,4 +65,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 410445b..bf9d4d0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/main.cpp,v 1.6 2008-04-24 13:08:44 syldup Exp $";
+static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/main.cpp,v 1.7 2010-10-06 20:23:30 vince_soleil Exp $";
//+=============================================================================
//
// file : main.cpp
@@ -10,11 +10,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
//
// project : TANGO Device Server
//
-// $Author: syldup $
+// $Author: vince_soleil $
//
-// $Revision: 1.6 $ $
+// $Revision: 1.7 $ $
//
// $Log: not supported by cvs2svn $
+// Revision 1.6 2008/04/24 13:08:44 syldup
+// no message
+//
// Revision 1.5 2008/02/28 09:02:05 xavela
// xavier :
// StateMachine file added !! (oups)
@@ -48,11 +51,21 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
#include <tango.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