diff options
| author | Josh Blum <josh@joshknows.com> | 2011-02-16 17:19:54 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-02-16 17:19:54 -0800 |
| commit | 2af3e5c49d9729339af06ce90a5810b316dc1513 (patch) | |
| tree | cd9a4ef9afd2e40eaaf4752f4546499a43cf7555 /host/include | |
| parent | 8878b35d596e2f4db8b3e0189adfcaee81c8300f (diff) | |
| download | uhd-2af3e5c49d9729339af06ce90a5810b316dc1513.tar.gz uhd-2af3e5c49d9729339af06ce90a5810b316dc1513.tar.bz2 uhd-2af3e5c49d9729339af06ce90a5810b316dc1513.zip | |
uhd: tweaks for windows msvc compiler warnings and errors
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/config.hpp | 2 | ||||
| -rw-r--r-- | host/include/uhd/types/ref_vector.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp index 912fbc204..1a04680e9 100644 --- a/host/include/uhd/config.hpp +++ b/host/include/uhd/config.hpp @@ -27,7 +27,7 @@ //# pragma warning(disable: 4512) // assignment operator can't not be generated //# pragma warning(disable: 4100) // unreferenced formal parameter //# pragma warning(disable: 4996) // <symbol> was declared deprecated -//# pragma warning(disable: 4355) // 'this' : used in base member initializer list +# pragma warning(disable: 4355) // 'this' : used in base member initializer list //# pragma warning(disable: 4706) // assignment within conditional expression # pragma warning(disable: 4251) // class 'A<T>' needs to have dll-interface to be used by clients of class 'B' //# pragma warning(disable: 4127) // conditional expression is constant diff --git a/host/include/uhd/types/ref_vector.hpp b/host/include/uhd/types/ref_vector.hpp index 2928cb150..bbfb5434d 100644 --- a/host/include/uhd/types/ref_vector.hpp +++ b/host/include/uhd/types/ref_vector.hpp @@ -27,7 +27,7 @@ namespace uhd{ * - Provides a std::vector-like interface for an array. * - Statically sized, and does not manage the memory. */ -template <typename T> class ref_vector{ +template <typename T> class UHD_API ref_vector{ public: /*! * Create a reference vector of size 1 from a pointer. |