diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-01-30 14:10:15 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-30 14:10:15 +0100 |
| commit | e28d7844b0c9d206bf5b7737a44c22f29e761ec1 (patch) | |
| tree | b66d0fee4d20c6d8ddebd7a3267fd64ff0a01a41 | |
| parent | 5bbcbaa397d596025c2a1d9db40c683b191a751b (diff) | |
| parent | b821635dcbe16c37d9d21a51f8b2330d6e483fdf (diff) | |
| download | uhd-e28d7844b0c9d206bf5b7737a44c22f29e761ec1.tar.gz uhd-e28d7844b0c9d206bf5b7737a44c22f29e761ec1.tar.bz2 uhd-e28d7844b0c9d206bf5b7737a44c22f29e761ec1.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/include/uhd/types/metadata.hpp | 7 | ||||
| -rw-r--r-- | host/lib/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/host/include/uhd/types/metadata.hpp b/host/include/uhd/types/metadata.hpp index 51a2b7c43..c4fe00271 100644 --- a/host/include/uhd/types/metadata.hpp +++ b/host/include/uhd/types/metadata.hpp @@ -21,6 +21,7 @@ #include <uhd/config.hpp> #include <uhd/types/time_spec.hpp> #include <boost/cstdint.hpp> +#include <string> namespace uhd{ @@ -120,8 +121,8 @@ namespace uhd{ /*! * Convert a rx_metadata_t into a pretty print string. - * - * \param compact Set to false for a more verbose output. + * + * \param compact Set to false for a more verbose output. * \return a printable string representing the metadata. */ std::string to_pp_string(bool compact=true) const; @@ -130,7 +131,7 @@ namespace uhd{ * Similar to C's strerror() function, creates a std::string describing the error code. * \return a printable string representing the error. */ - std::string strerror(void) const; + std::string strerror(void) const; }; /*! diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index 321278db5..d8c6fad70 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -99,7 +99,7 @@ LIBUHD_APPEND_SOURCES( # Add DLL resource file to Windows build ######################################################################## IF(MSVC) - SET(RC_TRIMMED_VERSION_PATCH TRIMMED_VERSION_PATCH) + SET(RC_TRIMMED_VERSION_PATCH ${TRIMMED_VERSION_PATCH}) IF(UHD_VERSION_DEVEL) SET(RC_TRIMMED_VERSION_PATCH "999") ENDIF(UHD_VERSION_DEVEL) |