aboutsummaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2014-05-12 07:18:56 -0700
committerNicholas Corgan <nick.corgan@ettus.com>2014-05-12 07:18:56 -0700
commit10dd0ce7061ad6ff29025d6458d7ed01dcee00be (patch)
tree003f79d2771b02262bb05bcfafaa387509912ad5 /host
parent9ed3becc1b02628a24eb07e6d8cd70b42638c5f3 (diff)
parent468e7f35afc358c8e151cbc2ecef05505f3275c5 (diff)
downloaduhd-10dd0ce7061ad6ff29025d6458d7ed01dcee00be.tar.gz
uhd-10dd0ce7061ad6ff29025d6458d7ed01dcee00be.tar.bz2
uhd-10dd0ce7061ad6ff29025d6458d7ed01dcee00be.zip
Merge branch 'maint'
Diffstat (limited to 'host')
-rw-r--r--host/lib/utils/log.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/utils/log.cpp b/host/lib/utils/log.cpp
index d6d1786c7..31ee0c991 100644
--- a/host/lib/utils/log.cpp
+++ b/host/lib/utils/log.cpp
@@ -1,5 +1,5 @@
//
-// Copyright 2012 Ettus Research LLC
+// Copyright 2012,2014 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
@@ -117,11 +117,11 @@ UHD_SINGLETON_FCN(log_resource_type, log_rs);
**********************************************************************/
//! get the relative file path from the host directory
static std::string get_rel_file_path(const fs::path &file){
- fs::path abs_path = file.branch_path();
+ fs::path abs_path = file.parent_path();
fs::path rel_path = file.leaf();
while (not abs_path.empty() and abs_path.leaf() != "host"){
rel_path = abs_path.leaf() / rel_path;
- abs_path = abs_path.branch_path();
+ abs_path = abs_path.parent_path();
}
return rel_path.string();
}