diff options
author | Martin Braun <martin.braun@ettus.com> | 2014-09-23 16:03:27 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2014-09-23 16:03:27 -0700 |
commit | 5aefa0fdfcf45717c133641b7e4df8070ed025e3 (patch) | |
tree | 7eaf97986d62892368f8d14cd48cfc45dddf7923 /host/include | |
parent | e56809a09aeffa2ccaec4582f6ca2fc0d4b4949e (diff) | |
parent | c431a66df3df4cff82bfa2d2b2c7b16895a7efd6 (diff) | |
download | uhd-5aefa0fdfcf45717c133641b7e4df8070ed025e3.tar.gz uhd-5aefa0fdfcf45717c133641b7e4df8070ed025e3.tar.bz2 uhd-5aefa0fdfcf45717c133641b7e4df8070ed025e3.zip |
Merge branch 'maint'
Diffstat (limited to 'host/include')
-rw-r--r-- | host/include/uhd/property_tree.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/host/include/uhd/property_tree.hpp b/host/include/uhd/property_tree.hpp index b4531698d..a92654ba2 100644 --- a/host/include/uhd/property_tree.hpp +++ b/host/include/uhd/property_tree.hpp @@ -120,6 +120,7 @@ struct fs_path : std::string{ }; UHD_API fs_path operator/(const fs_path &, const fs_path &); +UHD_API fs_path operator/(const fs_path &, size_t); /*! * The property tree provides a file system structure for accessing properties. |