diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2015-03-27 10:55:48 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-03-27 13:36:18 -0700 |
| commit | 715f4dd313656f936e40b6415179b7ab6feda128 (patch) | |
| tree | 113d50bb315666e3374708d75de4d54bf7177f3a /host/include | |
| parent | 88ffeb35dadb3d10593be39c9eae2f90c4d7c008 (diff) | |
| download | uhd-715f4dd313656f936e40b6415179b7ab6feda128.tar.gz uhd-715f4dd313656f936e40b6415179b7ab6feda128.tar.bz2 uhd-715f4dd313656f936e40b6415179b7ab6feda128.zip | |
Fixed master-specific warnings
* MinGW: unused parameter warning, MSVC-specific pragma
* MSVC: bool narrowing
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/config.hpp | 4 | ||||
| -rw-r--r-- | host/include/uhd/transport/nirio/nirio_driver_iface.h | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp index 23eb9cdb2..8939cd773 100644 --- a/host/include/uhd/config.hpp +++ b/host/include/uhd/config.hpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2011,2014 Ettus Research LLC +// Copyright 2010-2011,2014-2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -62,7 +62,7 @@ typedef ptrdiff_t ssize_t; #define UHD_INLINE inline #define UHD_DEPRECATED __declspec(deprecated) #define UHD_ALIGNED(x) __declspec(align(x)) - #define UHD_UNUSED(x) x + #define UHD_UNUSED(x) x __attribute__((unused)) #elif defined(__GNUG__) && __GNUG__ >= 4 #define UHD_EXPORT __attribute__((visibility("default"))) #define UHD_IMPORT __attribute__((visibility("default"))) diff --git a/host/include/uhd/transport/nirio/nirio_driver_iface.h b/host/include/uhd/transport/nirio/nirio_driver_iface.h index 3e0e56a7f..c562f0ca5 100644 --- a/host/include/uhd/transport/nirio/nirio_driver_iface.h +++ b/host/include/uhd/transport/nirio/nirio_driver_iface.h @@ -1,5 +1,5 @@ // -// Copyright 2013-2014 Ettus Research LLC +// Copyright 2013-2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -25,9 +25,13 @@ #include <uhd/config.hpp> #if defined(UHD_PLATFORM_WIN32) #include <windows.h> - #pragma warning(disable:4201) // nonstandard extension used : nameless struct/union + #ifdef _MSC_VER + #pragma warning(disable:4201) // nonstandard extension used : nameless struct/union + #endif #include <winioctl.h> - #pragma warning(default:4201) + #ifdef _MSC_VER + #pragma warning(default:4201) + #endif #elif !defined(UHD_PLATFORM_LINUX) #include <IOKit/IOKitLib.h> #endif |