From 1d97333a40e0f34e4e2bf52c706c9d637e9d8d79 Mon Sep 17 00:00:00 2001
From: Vincent Hardion <vincent.hardion@synchrotron-soleil.fr>
Date: Wed, 6 Oct 2010 21:50:51 +0000
Subject: [PATCH] Breakpad Migration
---
pom.xml | 4 ++--
src/main.cpp | 22 +++++++++++++++++-----
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index bc1f229..95e997c 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 abf853c..c9e0a34 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
--
GitLab