Fixed minor warnings

4 files changed, 7 insertions, 5 deletions

diff --git a/host/examples/test_clock_synch.cpp b/host/examples/test_clock_synch.cpp
index 9d1883665..2d438c5ca 100644
--- a/host/examples/test_clock_synch.cpp
+++ b/host/examples/test_clock_synch.cpp
@@ -124,7 +124,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
 
     //Get GPS time to initially set USRP devices
     std::cout << std::endl << "Querying Clock for time and setting USRP times..." << std::endl << std::endl;
-    boost::uint32_t clock_time = clock->get_time();
+    time_t clock_time = clock->get_time();
     usrp->set_time_unknown_pps(uhd::time_spec_t(double(clock_time+2)));
 
     //Wait for next PPS to start polling
diff --git a/host/include/uhd/types/dict.hpp b/host/include/uhd/types/dict.hpp
index 51e3e1814..90559ff5f 100644
--- a/host/include/uhd/types/dict.hpp
+++ b/host/include/uhd/types/dict.hpp
@@ -128,7 +128,7 @@ namespace uhd{
          * With the exception of \p fail_on_conflict, this behaves analogously
          * to Python's dict.update() method.
          *
-         * \param new_args The arguments to copy.
+         * \param new_dict The arguments to copy.
          * \param fail_on_conflict If true, throws.
          * \throws uhd::value_error
          */
diff --git a/host/lib/transport/nirio/rpc/rpc_client.cpp b/host/lib/transport/nirio/rpc/rpc_client.cpp
index 48f47cfae..bbaf9f235 100644
--- a/host/lib/transport/nirio/rpc/rpc_client.cpp
+++ b/host/lib/transport/nirio/rpc/rpc_client.cpp
@@ -52,7 +52,7 @@ rpc_client::rpc_client (
         //- address_configured: Only return addresses if a non-loopback address is configured for the system.
         //- numeric_host: No name resolution should be attempted for host
         //- numeric_service: No name resolution should be attempted for service
-        tcp::resolver::query::flags query_flags = tcp::resolver::query::passive;
+        tcp::resolver::query::flags query_flags(tcp::resolver::query::passive);
         tcp::resolver::query query(tcp::v4(), server, port, query_flags);
         tcp::resolver::iterator iterator = resolver.resolve(query);
 
diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp
index a9c9965c8..ac4a010a7 100644
--- a/host/lib/utils/paths.cpp
+++ b/host/lib/utils/paths.cpp
@@ -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
@@ -111,6 +111,7 @@ static std::vector<std::string> get_env_paths(const std::string &var_name){
     return paths;
 }
 
+#ifndef UHD_PLATFORM_WIN32
 /*! Expand a tilde character to the $HOME path.
  *
  * The path passed to this function must start with the tilde character in order
@@ -132,6 +133,7 @@ static std::string expand_home_directory(std::string path) {
 
     return path;
 }
+#endif
 
 /***********************************************************************
  * Implement the functions in paths.hpp
@@ -239,7 +241,7 @@ std::string _get_images_path_from_registry(const std::string& registry_key_path)
 
     //Get a handle to the key location
     HKEY hkey_location;
-    if (RegOpenKeyExA(hkey_parent, reg_path.c_str(), NULL, KEY_QUERY_VALUE, &hkey_location) != ERROR_SUCCESS)
+    if (RegOpenKeyExA(hkey_parent, reg_path.c_str(), 0, KEY_QUERY_VALUE, &hkey_location) != ERROR_SUCCESS)
         return std::string();
 
     //Query key value