* Fixed duplicate pkg_config_generate() call (leading to a malformed

  pkg-config file)
* Renamed assert() methods to avoid conflicts by assert macro inclusions

Author: kralf

changelog

@@ -1,3 +1,11 @@
+libseekthermal (0.1-6) unstable; urgency=low
+
+  * Fixed duplicate pkg_config_generate() call (leading to a malformed
+    pkg-config file)
+  * Renamed assert() methods to avoid conflicts by assert macro inclusions
+
+ -- Ralf Kaestner <[email protected]>  Mon, 09 Mar 2015 09:25:00 +0100
+ 
 libseekthermal (0.1-5) unstable; urgency=low
 
   * Fixed includes in seekthermal.h

src/CMakeLists.txt

@@ -16,4 +16,3 @@ remake_include(
 )
 
 remake_add_directories(lib bin)
-remake_pkg_config_generate()

src/lib/seekthermal/base/request.h

@@ -45,7 +45,7 @@ namespace SeekThermal {
 
       /** \brief Seek Thermal request parameter range error assertion
         */
-      template <typename T, typename U, typename V> static void assert(
+      template <typename T, typename U, typename V> static void assertValue(
         const T& value, const U& minValue, const V& maxValue);
     };
 

src/lib/seekthermal/base/request.tpp

@@ -40,7 +40,7 @@ template <typename T, typename U, typename V>
 /*****************************************************************************/
 
 template <typename T, typename U, typename V>
-    void SeekThermal::Request::ParameterRangeError::assert(const T& value,
+    void SeekThermal::Request::ParameterRangeError::assertValue(const T& value,
     const U& minValue, const V& maxValue) {
   if ((value < minValue) || (value > maxValue))
     throw ParameterRangeError(value, minValue, maxValue);

src/lib/seekthermal/usb/context.cpp

@@ -53,14 +53,14 @@ SeekThermal::Usb::Context::DebugLevels::DebugLevels() {
 SeekThermal::Usb::Context::Context(DebugLevel debugLevel) :
   debugLevel(debugLevel),
   context(0) {
-  Error::assert(libusb_init(&context));
+  Error::assertSuccess(libusb_init(&context));
   libusb_set_debug(context, this->debugLevel);
 }
 
 SeekThermal::Usb::Context::Context(const Context& src) :
   debugLevel(src.debugLevel),
   context(0) {
-  Error::assert(libusb_init(&context));
+  Error::assertSuccess(libusb_init(&context));
   libusb_set_debug(context, debugLevel);
 }
 

src/lib/seekthermal/usb/error.cpp

@@ -114,7 +114,7 @@ bool SeekThermal::Usb::Error::operator!=(Code code) const {
   return (code != this->code);
 }
 
-int SeekThermal::Usb::Error::assert(int error) {
+int SeekThermal::Usb::Error::assertSuccess(int error) {
   if (error < LIBUSB_SUCCESS)
     throw Error(error);
   else

src/lib/seekthermal/usb/error.h

@@ -96,7 +96,7 @@ namespace SeekThermal {
 
       /** \brief Seek Thermal USB error assertion
         */
-      static int assert(int error);
+      static int assertSuccess(int error);
     protected:
       Code code;
     };

src/lib/seekthermal/usb/interface.cpp

@@ -53,7 +53,7 @@ SeekThermal::Usb::Interface::Interface(libusb_device* device) :
     libusb_ref_device(this->device);
 
     descriptor = new libusb_device_descriptor();
-    SeekThermal::Usb::Error::assert(
+    SeekThermal::Usb::Error::assertSuccess(
       libusb_get_device_descriptor(this->device, descriptor));
 
     std::ostringstream stream;
@@ -144,8 +144,8 @@ std::string SeekThermal::Usb::Interface::getDeviceSerialNumber() const {
     unsigned char data[256];
     size_t length;
 
-    length = Error::assert(libusb_get_string_descriptor_ascii(handle,
-      descriptor->iSerialNumber, data, sizeof(data)));
+    length = Error::assertSuccess(libusb_get_string_descriptor_ascii(
+      handle, descriptor->iSerialNumber, data, sizeof(data)));
 
     return std::string(reinterpret_cast<char*>(data), length);
   }
@@ -190,9 +190,9 @@ SeekThermal::Usb::Interface& SeekThermal::Usb::Interface::operator=(const
 
 void SeekThermal::Usb::Interface::open() {
   if (!handle) {
-    Error::assert(libusb_open(device, &handle));
-    if (Error::assert(libusb_kernel_driver_active(handle, 0)))
-      Error::assert(libusb_detach_kernel_driver(handle, 0));
+    Error::assertSuccess(libusb_open(device, &handle));
+    if (Error::assertSuccess(libusb_kernel_driver_active(handle, 0)))
+      Error::assertSuccess(libusb_detach_kernel_driver(handle, 0));
   }
 }
 
@@ -205,27 +205,27 @@ void SeekThermal::Usb::Interface::close() {
 
 void SeekThermal::Usb::Interface::transfer(Request& request) {
   if (handle) {
-    Error::assert(libusb_claim_interface(handle, 0));
+    Error::assertSuccess(libusb_claim_interface(handle, 0));
     request.transfer(handle, request.data, timeout);
-    Error::assert(libusb_release_interface(handle, 0));
+    Error::assertSuccess(libusb_release_interface(handle, 0));
   }
   else
     throw OperationError();
 }
 
 void SeekThermal::Usb::Interface::read(std::vector<unsigned char>& data) {
   if (handle) {
-    Error::assert(libusb_claim_interface(handle, 0));
+    Error::assertSuccess(libusb_claim_interface(handle, 0));
 
     size_t numRead = 0;
     while (numRead < data.size()) {
       int transferred = 0;
-      Error::assert(libusb_bulk_transfer(handle, 0x81, &data[numRead],
+      Error::assertSuccess(libusb_bulk_transfer(handle, 0x81, &data[numRead],
         data.size()-numRead, &transferred, timeout*1e3));      
       numRead += transferred;
     }
 
-    Error::assert(libusb_release_interface(handle, 0));
+    Error::assertSuccess(libusb_release_interface(handle, 0));
   }
   else
     throw OperationError();

src/lib/seekthermal/usb/request.cpp

@@ -197,6 +197,6 @@ void SeekThermal::Usb::Request::transfer(libusb_device_handle* handle,
 
   if (requestLength)
     requestData = &data[0];
-  Error::assert(libusb_control_transfer(handle, requestType, request,
-    value, index, requestData, requestLength, timeout*1e3));
+  Error::assertSuccess(libusb_control_transfer(handle, requestType,
+    request, value, index, requestData, requestLength, timeout*1e3));
 }