From b81be9341155a658bf6a3dac0d84742c3d35e76a Mon Sep 17 00:00:00 2001
From: Jon Trulson <jtrulson@ics.com>
Date: Fri, 7 Aug 2015 16:02:07 -0600
Subject: [PATCH] lsm9ds0: include stdexcept, remove extraneoous error output

Signed-off-by: Jon Trulson <jtrulson@ics.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
---
 src/lsm9ds0/lsm9ds0.cxx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/lsm9ds0/lsm9ds0.cxx b/src/lsm9ds0/lsm9ds0.cxx
index c215ccb9..79579dbd 100644
--- a/src/lsm9ds0/lsm9ds0.cxx
+++ b/src/lsm9ds0/lsm9ds0.cxx
@@ -24,7 +24,7 @@
 
 #include <unistd.h>
 #include <iostream>
-#include <exception>
+#include <stdexcept>
 #include <string.h>
 
 #include "lsm9ds0.h"
@@ -61,9 +61,6 @@ LSM9DS0::LSM9DS0(int bus, uint8_t gAddress, uint8_t xmAddress) :
   mraa_result_t rv;
   if ( (rv = m_i2cG.address(m_gAddr)) != MRAA_SUCCESS)
     {
-      cerr << __FUNCTION__ << ": Could not initialize Gyro i2c address." 
-           << endl;
-      mraa_result_print(rv);
       throw std::runtime_error(string(__FUNCTION__) +
                                ": Could not initialize Gyro i2c address");
       return;
@@ -71,8 +68,6 @@ LSM9DS0::LSM9DS0(int bus, uint8_t gAddress, uint8_t xmAddress) :
 
   if ( (rv = m_i2cXM.address(m_xmAddr)) != MRAA_SUCCESS)
     {
-      cerr << __FUNCTION__ << ": Could not initialize XM i2c address. " << endl;
-      mraa_result_print(rv);
       throw std::runtime_error(string(__FUNCTION__) + 
                                ": Could not initialize XM i2c address");
       return;
@@ -745,7 +740,7 @@ mraa::Gpio*& LSM9DS0::getPin(INTERRUPT_PINS_T intr)
       return m_gpioXM_GEN2;
       break;
     default:
-      throw std::logic_error(string(__FUNCTION__) +
-                             ": Invalid interrupt enum passed");
+      throw std::out_of_range(string(__FUNCTION__) +
+                              ": Invalid interrupt enum passed");
     }
 }