diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-08-05 13:03:23 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-08-05 13:03:23 -0700 |
| commit | c3c9513b9b5f67afe4233659222fdfc5bbb2511c (patch) | |
| tree | e1abdf0468bea5f4e4b8a7c5507d75e4ad013dd5 /host/include | |
| parent | abc08d914c5ce9b9f3ccc80de0dd26b061c22a41 (diff) | |
| parent | 3dbced2df2942fd8ec4dffead8345a9b9ce7faf0 (diff) | |
| download | uhd-c3c9513b9b5f67afe4233659222fdfc5bbb2511c.tar.gz uhd-c3c9513b9b5f67afe4233659222fdfc5bbb2511c.tar.bz2 uhd-c3c9513b9b5f67afe4233659222fdfc5bbb2511c.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/transport/nirio/nirio_fifo.h | 4 | ||||
| -rw-r--r-- | host/include/uhd/utils/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/include/uhd/utils/math.hpp | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/host/include/uhd/transport/nirio/nirio_fifo.h b/host/include/uhd/transport/nirio/nirio_fifo.h index 5a2e29631..a0cd7149f 100644 --- a/host/include/uhd/transport/nirio/nirio_fifo.h +++ b/host/include/uhd/transport/nirio/nirio_fifo.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 @@ -114,7 +114,7 @@ private: //Members static const uint32_t FIFO_LOCK_TIMEOUT_IN_MS = 5000; }; -#include "nirio_fifo.ipp" +#include <uhd/transport/nirio/nirio_fifo.ipp> }} diff --git a/host/include/uhd/utils/CMakeLists.txt b/host/include/uhd/utils/CMakeLists.txt index 05f6892d2..6b3d5a581 100644 --- a/host/include/uhd/utils/CMakeLists.txt +++ b/host/include/uhd/utils/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2010-2012 Ettus Research LLC +# Copyright 2010-2012,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 @@ -24,6 +24,8 @@ UHD_INSTALL(FILES byteswap.ipp cast.hpp csv.hpp + fp_compare_delta.ipp + fp_compare_epsilon.ipp gain_group.hpp log.hpp math.hpp diff --git a/host/include/uhd/utils/math.hpp b/host/include/uhd/utils/math.hpp index 46a1cf7e4..ef7bfb6b7 100644 --- a/host/include/uhd/utils/math.hpp +++ b/host/include/uhd/utils/math.hpp @@ -1,5 +1,5 @@ // -// Copyright 2014 Ettus Research LLC +// Copyright 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 @@ -250,7 +250,7 @@ namespace fp_compare { } // namespace math } // namespace uhd -#include "fp_compare_epsilon.ipp" -#include "fp_compare_delta.ipp" +#include <uhd/utils/fp_compare_epsilon.ipp> +#include <uhd/utils/fp_compare_delta.ipp> #endif /* INCLUDED_UHD_UTILS_MATH_HPP */ |