Merge lp:~marcustomlinson/unity-scopes-api/fix-clang-warnings into lp:unity-scopes-api/devel

[Marcus Tomlinson]

Fixed Clang compiler warnings such as: missing "override" specifier, unused variables and functions, and other small bits of suspicious logic.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:646
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1583/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-amd64-ci/192
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-armhf-ci/192
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-armhf-ci/192/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-i386-ci/192
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1583/rebuild

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

+1, thanks for that!

It's amazing how line 150 of the diff slipped through. My left arm for a language with a sane type system… :-(

Line 191 of the diff needs to read:

make_directories(dir, 0700);

We want to create the directories for the entire path, not just the top-level dir.

Unfortunately, it appears that all of this is a lost labour of love now, at least on Wily. I just tried compiling with clang 3.6.2 on Wily. It came up with a bunch more warnings, which I started to fix. Unfortunately, our code no longer links due to unresolved references to symbols in libjson and libunity-api. It looks like the inlining algorithms for gcc and clang have gone out of sync. gcc inlines things that clang doesn't and then the clang-compiled client code looks for a external symbols in these libraries that don't exist :-(

Still, building with clang is still useful on Vivid (while it lasts).

I'me also attaching a diff that fixes a bunch more warnings from clang 3.6.0 on Vivid+overlay. Could you apply that diff too please?

It's awfully easy to miss warnings with ccache enabled because a warning is emitted only once when a file is first compiled. If the file has no errors, all future builds are warning-free because the object file is taken from the cache…

review: Needs Fixing

[Michi Henning (michihenning)]

Hmmm... Looks like it's impossible to add an attachment to an MR. I've uploaded the diff here:

https://www.dropbox.com/s/s1ia48983mlnqon/diff-for-clang?dl=0

[Michi Henning (michihenning)]

Actually, it's not inlining, it's the abi tags in gcc. See here: https://llvm.org/bugs/show_bug.cgi?id=23529

The name mangling differs between clang and gcc, so the symbols are in the library, but with a different mangled name :(

[lp:~marcustomlinson/unity-scopes-api/fix-clang-warnings]

647. By Marcus Tomlinson on 2015-11-26

Applied patch with further warning fixes

648. By Marcus Tomlinson on 2015-11-26

make_directories(cache_dir_ -> make_directories(dir

[Marcus Tomlinson (marcustomlinson)]

> +1, thanks for that!
>
> It's amazing how line 150 of the diff slipped through. My left arm for a
> language with a sane type system… :-(
>
> Line 191 of the diff needs to read:
>
> make_directories(dir, 0700);

done (line 251)

>
> We want to create the directories for the entire path, not just the top-level
> dir.
>
> Unfortunately, it appears that all of this is a lost labour of love now, at
> least on Wily. I just tried compiling with clang 3.6.2 on Wily. It came up
> with a bunch more warnings, which I started to fix. Unfortunately, our code no
> longer links due to unresolved references to symbols in libjson and libunity-
> api. It looks like the inlining algorithms for gcc and clang have gone out of
> sync. gcc inlines things that clang doesn't and then the clang-compiled client
> code looks for a external symbols in these libraries that don't exist :-(
>
> Still, building with clang is still useful on Vivid (while it lasts).
>
> I'me also attaching a diff that fixes a bunch more warnings from clang 3.6.0
> on Vivid+overlay. Could you apply that diff too please?

done.

>
> It's awfully easy to miss warnings with ccache enabled because a warning is
> emitted only once when a file is first compiled. If the file has no errors,
> all future builds are warning-free because the object file is taken from the
> cache…

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:648
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1584/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-amd64-ci/193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-armhf-ci/193
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-armhf-ci/193/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-i386-ci/193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1584/rebuild

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

Looks good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:648
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1586/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-amd64-ci/195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-armhf-ci/195
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-armhf-ci/195/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-i386-ci/195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1586/rebuild

review: Approve (continuous-integration)

=== modified file 'include/unity/scopes/internal/ScopeImpl.h'
--- include/unity/scopes/internal/ScopeImpl.h	2015-05-29 10:17:42 +0000
+++ include/unity/scopes/internal/ScopeImpl.h	2015-11-26 05:49:23 +0000
@@ -103,7 +103,7 @@
     virtual QueryCtrlProxy activate_result_action(Result const& result,
                                                   ActionMetadata const& metadata,
                                                   std::string const& action_id,
-                                                  ActivationListenerBase::SPtr const& reply);
+                                                  ActivationListenerBase::SPtr const& reply) override;
 
     virtual ChildScopeList child_scopes() override;
     virtual bool set_child_scopes(ChildScopeList const& child_scopes) override;

=== modified file 'include/unity/scopes/internal/SettingsDB.h'
--- include/unity/scopes/internal/SettingsDB.h	2015-07-13 14:28:15 +0000
+++ include/unity/scopes/internal/SettingsDB.h	2015-11-26 05:49:23 +0000
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include <unity/scopes/internal/Logger.h>
 #include <unity/scopes/internal/SettingsSchema.h>
 #include <unity/scopes/Variant.h>
 #include <unity/util/DefinesPtrs.h>
@@ -47,15 +46,9 @@
     NONCOPYABLE(SettingsDB);
     UNITY_DEFINES_PTRS(SettingsDB);
 
-    static UPtr create_from_ini_file(std::string const& db_path,
-                                     std::string const& ini_file_path,
-                                     boost::log::sources::severity_channel_logger_mt<>& logger);
-    static UPtr create_from_json_string(std::string const& db_path,
-                                        std::string const& json_string,
-                                        boost::log::sources::severity_channel_logger_mt<>& logger);
-    static UPtr create_from_schema(std::string const& db_path,
-                                   unity::scopes::internal::SettingsSchema const& schema,
-                                   boost::log::sources::severity_channel_logger_mt<>& logger);
+    static UPtr create_from_ini_file(std::string const& db_path, std::string const& ini_file_path);
+    static UPtr create_from_json_string(std::string const& db_path, std::string const& json_string);
+    static UPtr create_from_schema(std::string const& db_path, unity::scopes::internal::SettingsSchema const& schema);
 
     ~SettingsDB() = default;
 
@@ -65,9 +58,7 @@
     VariantMap settings();  // Returns the current settings (checking the DB each time).
 
 private:
-    SettingsDB(std::string const& db_path,
-               unity::scopes::internal::SettingsSchema const& schema,
-               boost::log::sources::severity_channel_logger_mt<>& logger);
+    SettingsDB(std::string const& db_path, unity::scopes::internal::SettingsSchema const& schema);
 
     void process_doc_(std::string const& id, unity::util::IniParser const& parer);
     void process_all_docs();
@@ -80,7 +71,6 @@
     VariantArray definitions_;                       // Returned by SettingsSchema
     std::map<std::string, Variant> def_map_;  // Allows fast access to the Variants in definitions_
     unity::scopes::VariantMap values_;
-    boost::log::sources::severity_channel_logger_mt<>& logger_;
 };
 
 }  // namespace internal

=== modified file 'src/scopes/internal/CannedQueryImpl.cpp'
--- src/scopes/internal/CannedQueryImpl.cpp	2015-02-26 12:47:37 +0000
+++ src/scopes/internal/CannedQueryImpl.cpp	2015-11-26 05:49:23 +0000
@@ -232,7 +232,7 @@
     {
         return from_percent_encoding(value);
     }
-    catch (InvalidArgumentException const& e)
+    catch (InvalidArgumentException const&)
     {
         std::stringstream err;
         err << "Failed to decode key '" << key_name << "' of uri '" << uri << "'";

=== modified file 'src/scopes/internal/Executor.cpp'
--- src/scopes/internal/Executor.cpp	2014-08-08 08:35:09 +0000
+++ src/scopes/internal/Executor.cpp	2015-11-26 05:49:23 +0000
@@ -49,10 +49,8 @@
                     case ENOENT:
                     case EACCES:
                         throw std::runtime_error("AppArmor profile does not exist");
-                        break;
                     case EINVAL:
                         throw std::runtime_error("AppArmor interface not available");
-                        break;
                     default:
                         throw std::runtime_error("Unknown AppArmor error");
                 }

=== modified file 'src/scopes/internal/IniSettingsSchema.cpp'
--- src/scopes/internal/IniSettingsSchema.cpp	2015-03-02 03:59:01 +0000
+++ src/scopes/internal/IniSettingsSchema.cpp	2015-11-26 05:49:23 +0000
@@ -56,8 +56,6 @@
             Variant const& default_value);
     ~Setting() = default;
 
-    string id() const;
-
     enum Type { BooleanT, ListT, NumberT, StringT };
 
     Variant to_schema_definition();
@@ -240,7 +238,7 @@
             }
         }
     }
-    catch (LogicException const& e)
+    catch (LogicException const&)
     {
         throw ResourceException(string("IniSettingsSchema(): invalid value type for \"") + dflt_val_key + "\" definition, "
                                 "setting = \"" + id_ + "\"");
@@ -276,7 +274,7 @@
             definitions_.push_back(s.to_schema_definition());
         }
     }
-    catch (std::exception const& e)
+    catch (std::exception const&)
     {
         throw ResourceException("IniSettingsSchema(): cannot parse settings file \"" + ini_file + "\"");
     }

=== modified file 'src/scopes/internal/OnlineAccountClientImpl.cpp'
--- src/scopes/internal/OnlineAccountClientImpl.cpp	2015-01-26 06:02:10 +0000
+++ src/scopes/internal/OnlineAccountClientImpl.cpp	2015-11-26 05:49:23 +0000
@@ -653,7 +653,7 @@
         g_main_loop_run(main_loop_.get());
     }
     // LCOV_EXCL_START
-    catch (std::exception const& e)
+    catch (std::exception const&)
     {
         std::lock_guard<std::mutex> lock(mutex_);
         thread_exception_ = std::current_exception();

=== modified file 'src/scopes/internal/PreviewReplyImpl.cpp'
--- src/scopes/internal/PreviewReplyImpl.cpp	2015-01-09 03:16:51 +0000
+++ src/scopes/internal/PreviewReplyImpl.cpp	2015-11-26 05:49:23 +0000
@@ -52,7 +52,7 @@
     {
         ColumnLayoutImpl::validate_layouts(layouts);
     }
-    catch (unity::LogicException const &e)
+    catch (unity::LogicException const&)
     {
         throw unity::LogicException("PreviewReplyImpl::register_layout(): Failed to validate layouts");
     }

=== modified file 'src/scopes/internal/PreviewReplyObject.cpp'
--- src/scopes/internal/PreviewReplyObject.cpp	2014-11-18 07:04:04 +0000
+++ src/scopes/internal/PreviewReplyObject.cpp	2015-11-26 05:49:23 +0000
@@ -67,7 +67,7 @@
         {
             ColumnLayoutImpl::validate_layouts(list);
         }
-        catch (unity::LogicException const &e)
+        catch (unity::LogicException const&)
         {
             throw unity::LogicException("PreviewReplyObject::process_data(): Failed to validate layouts");
         }

=== modified file 'src/scopes/internal/ReplyImpl.cpp'
--- src/scopes/internal/ReplyImpl.cpp	2015-02-04 06:07:15 +0000
+++ src/scopes/internal/ReplyImpl.cpp	2015-11-26 05:49:23 +0000
@@ -127,7 +127,7 @@
     {
         fwd()->finished(CompletionDetails(CompletionDetails::Error, error_message));  // Oneway, can't block
     }
-    catch (std::exception const& e)
+    catch (std::exception const&)
     {
         BOOST_LOG(mw_proxy_->mw_base()->runtime()->logger())
             << "ReplyImpl::error(): exception from finished(): " << error_message;

=== modified file 'src/scopes/internal/RuntimeConfig.cpp'
--- src/scopes/internal/RuntimeConfig.cpp	2015-06-11 07:17:56 +0000
+++ src/scopes/internal/RuntimeConfig.cpp	2015-11-26 05:49:23 +0000
@@ -108,7 +108,7 @@
             {
                 cache_directory_ = default_cache_directory();
             }
-            catch (ResourceException const& e)
+            catch (ResourceException const&)
             {
                 throw_ex("No " + cache_dir_key + " configured and failed to get default");
             }
@@ -121,7 +121,7 @@
             {
                 app_directory_ = default_app_directory();
             }
-            catch (ResourceException const& e)
+            catch (ResourceException const&)
             {
                 throw_ex("No " + app_dir_key + " configured and failed to get default");
             }
@@ -129,7 +129,7 @@
 
         // UNITY_SCOPES_CONFIG_DIR env var can be used to override the value of ConfigDir key of Runtime.ini
         char const* scopes_cfg_dir_override = getenv("UNITY_SCOPES_CONFIG_DIR");
-        config_directory_ = (scopes_cfg_dir_override != nullptr && scopes_cfg_dir_override != '\0') ?
+        config_directory_ = (scopes_cfg_dir_override != nullptr && *scopes_cfg_dir_override != '\0') ?
             string(scopes_cfg_dir_override) : get_optional_string(runtime_config_group, config_dir_key);
         if (config_directory_.empty())
         {
@@ -137,7 +137,7 @@
             {
                 config_directory_ = default_config_directory();
             }
-            catch (ResourceException const& e)
+            catch (ResourceException const&)
             {
                 throw_ex("No " + config_dir_key + " configured and failed to get default");
             }
@@ -155,7 +155,7 @@
             {
                 log_directory_ = default_log_directory();
             }
-            catch (ResourceException const& e)
+            catch (ResourceException const&)
             {
                 throw_ex("No " + log_dir_key + " configured and failed to get default");
             }

=== modified file 'src/scopes/internal/RuntimeImpl.cpp'
--- src/scopes/internal/RuntimeImpl.cpp	2015-11-23 07:29:31 +0000
+++ src/scopes/internal/RuntimeImpl.cpp	2015-11-26 05:49:23 +0000
@@ -136,7 +136,7 @@
         app_dir_ = config.app_directory();
         config_dir_ = config.config_directory();
     }
-    catch (unity::Exception const& e)
+    catch (unity::Exception const&)
     {
         destroy();
         string msg = "Cannot instantiate run time for " + (scope_id.empty() ? "client" : scope_id) +
@@ -382,7 +382,7 @@
         boost::system::error_code ec;
         if (boost::filesystem::exists(settings_schema, ec))
         {
-            shared_ptr<SettingsDB> db(SettingsDB::create_from_ini_file(settings_db, settings_schema, logger()));
+            shared_ptr<SettingsDB> db(SettingsDB::create_from_ini_file(settings_db, settings_schema));
             scope_base->p->set_settings_db(db);
         }
         else
@@ -594,8 +594,7 @@
     string dir = cache_dir_ + "/" + confinement_type();
     if (!confined())  // Avoid apparmor noise
     {
-        string dir = cache_dir_ + "/" + confinement_type();
-        make_directories(cache_dir_, 0700);
+        make_directories(dir, 0700);
     }
     // A confined scope is allowed to create this dir.
     dir += "/" + demangled_id(scope_id_);

=== modified file 'src/scopes/internal/SearchMetadataImpl.cpp'
--- src/scopes/internal/SearchMetadataImpl.cpp	2015-04-09 15:59:17 +0000
+++ src/scopes/internal/SearchMetadataImpl.cpp	2015-11-26 05:49:23 +0000
@@ -56,7 +56,7 @@
         it = find_or_throw("SearchMetadataImpl()", var, "location");
         location_ = Location(it->second.get_dict());
     }
-    catch (std::exception &e)
+    catch (std::exception const&)
     {
     }
 
@@ -71,7 +71,7 @@
         }
         aggregated_keywords_ = keywords_s;
     }
-    catch (std::exception &e)
+    catch (std::exception const&)
     {
     }
 }

=== modified file 'src/scopes/internal/SearchReplyImpl.cpp'
--- src/scopes/internal/SearchReplyImpl.cpp	2015-07-27 10:45:03 +0000
+++ src/scopes/internal/SearchReplyImpl.cpp	2015-11-26 05:49:23 +0000
@@ -72,7 +72,7 @@
     {
         DepartmentImpl::validate_departments(parent, current_department_);
     }
-    catch (unity::LogicException const &e)
+    catch (unity::LogicException const&)
     {
         throw unity::LogicException("SearchReplyImpl::register_departments(): Failed to validate departments");
     }
@@ -172,7 +172,7 @@
     {
         internal::FilterBaseImpl::validate_filters(filters);
     }
-    catch (unity::LogicException const &e)
+    catch (unity::LogicException const&)
     {
         throw unity::LogicException("SearchReplyImpl::push(): Failed to validate filters");
     }

=== modified file 'src/scopes/internal/SettingsDB.cpp'
--- src/scopes/internal/SettingsDB.cpp	2015-07-13 14:28:15 +0000
+++ src/scopes/internal/SettingsDB.cpp	2015-11-26 05:49:23 +0000
@@ -82,53 +82,44 @@
 
 }  // namespace
 
-SettingsDB::UPtr SettingsDB::create_from_ini_file(string const& db_path,
-                                                  string const& ini_file_path,
-                                                  boost::log::sources::severity_channel_logger_mt<>& logger)
+SettingsDB::UPtr SettingsDB::create_from_ini_file(string const& db_path, string const& ini_file_path)
 {
     // Parse schema
     try
     {
         SettingsSchema::UPtr schema = IniSettingsSchema::create(ini_file_path);
-        return create_from_schema(db_path, *schema, logger);
+        return create_from_schema(db_path, *schema);
     }
-    catch (exception const& e)
+    catch (exception const&)
     {
         throw ResourceException("SettingsDB::create_from_ini_file(): schema = " + ini_file_path + ", db = " + db_path);
     }
 }
 
-SettingsDB::UPtr SettingsDB::create_from_json_string(string const& db_path,
-                                                     string const& json_string,
-                                                     boost::log::sources::severity_channel_logger_mt<>& logger)
+SettingsDB::UPtr SettingsDB::create_from_json_string(string const& db_path, string const& json_string)
 {
     // Parse schema
     try
     {
         auto schema = JsonSettingsSchema::create(json_string);
-        return create_from_schema(db_path, *schema, logger);
+        return create_from_schema(db_path, *schema);
     }
-    catch (exception const& e)
+    catch (exception const&)
     {
         throw ResourceException("SettingsDB::create_from_json_string(): cannot parse schema, db = " + db_path);
     }
 }
 
-SettingsDB::UPtr SettingsDB::create_from_schema(string const& db_path,
-                                                SettingsSchema const& schema,
-                                                boost::log::sources::severity_channel_logger_mt<>& logger)
+SettingsDB::UPtr SettingsDB::create_from_schema(string const& db_path, SettingsSchema const& schema)
 {
-    return UPtr(new SettingsDB(db_path, move(schema), logger));
+    return UPtr(new SettingsDB(db_path, move(schema)));
 }
 
-SettingsDB::SettingsDB(string const& db_path,
-                       SettingsSchema const& schema,
-                       boost::log::sources::severity_channel_logger_mt<>& logger)
+SettingsDB::SettingsDB(string const& db_path, SettingsSchema const& schema)
     : db_path_(db_path)
     , last_write_time_nsec_(-1)
     , last_write_time_sec_(-1)
     , last_write_inode_(0)
-    , logger_(logger)
 {
     // Initialize the def_map_ so we can look things
     // up quickly.
@@ -173,7 +164,7 @@
             {
                 values_[id] = Variant(stod(value));
             }
-            catch (invalid_argument & e)
+            catch (invalid_argument const&)
             {
             }
         }
@@ -182,7 +173,7 @@
             values_[id] = Variant(p.get_string(GROUP_NAME, id));
         }
     }
-    catch (LogicException & e)
+    catch (LogicException const&)
     {
     }
 }
@@ -222,7 +213,7 @@
                     {
                         if (e.error() == EACCES) // very unlikely; only if permissions changed after we acquired the lock
                         {
-                            throw e;
+                            throw;
                         }
                         throw ResourceException(e.what());
                     }
@@ -244,7 +235,7 @@
     {
         if (e.error() == EACCES)
         {
-            throw e;
+            throw;
         }
 
         // Failure in obtaining the lock shouldn't be reported to the scope, it's not fatal;

=== modified file 'src/scopes/internal/Utils.cpp'
--- src/scopes/internal/Utils.cpp	2015-09-15 07:36:09 +0000
+++ src/scopes/internal/Utils.cpp	2015-11-26 05:49:23 +0000
@@ -90,7 +90,7 @@
                         result << static_cast<char>(k);
                         valid = true;
                     }
-                    catch (logic_error const& e) // covers both invalid_argument and out_of_range
+                    catch (logic_error const&) // covers both invalid_argument and out_of_range
                     {
                         stringstream err;
                         err << "from_percent_encoding(): unsupported conversion of '" << hexnum << "'";

=== modified file 'src/scopes/internal/smartscopes/SSRegistryObject.cpp'
--- src/scopes/internal/smartscopes/SSRegistryObject.cpp	2015-01-20 08:25:39 +0000
+++ src/scopes/internal/smartscopes/SSRegistryObject.cpp	2015-11-26 05:49:23 +0000
@@ -324,9 +324,7 @@
                         // Store both JSON (for internal comparison) and DB (for external use)
                         changed = true;
                         std::string settings_db = RuntimeConfig::default_config_directory() + "/" + scope.id + "/settings.ini";
-                        SettingsDB::SPtr db(SettingsDB::create_from_schema(settings_db,
-                                                                           *schema,
-                                                                           middleware_->runtime()->logger()));
+                        SettingsDB::SPtr db(SettingsDB::create_from_schema(settings_db, *schema));
                         settings_defs_[scope.id] = SSSettingsDef{settings, db, needs_location_data};
                     }
                 }

=== modified file 'src/scopes/internal/smartscopes/SmartScope.cpp'
--- src/scopes/internal/smartscopes/SmartScope.cpp	2015-06-01 10:23:00 +0000
+++ src/scopes/internal/smartscopes/SmartScope.cpp	2015-11-26 05:49:23 +0000
@@ -117,7 +117,7 @@
         {
             reply->register_category(category->id, category->title, category->icon, rdr);
         }
-        catch (std::exception const& e)
+        catch (std::exception const&)
         {
             BOOST_LOG(this->ss_client_->logger())
                 << "SmartScope: failed to register category: \"" << category->id

=== modified file 'src/scopes/internal/smartscopes/SmartScopesClient.cpp'
--- src/scopes/internal/smartscopes/SmartScopesClient.cpp	2015-11-02 05:24:35 +0000
+++ src/scopes/internal/smartscopes/SmartScopesClient.cpp	2015-11-26 05:49:23 +0000
@@ -339,7 +339,7 @@
                         {
                             scope.keywords.emplace(keyword.get_string());
                         }
-                        catch (unity::LogicException const& e)
+                        catch (unity::LogicException const&)
                         {
                             BOOST_LOG(logger_)
                                 << "SmartScopesClient.get_remote_scopes(): Scope: \"" << scope.id
@@ -854,7 +854,7 @@
         query_result->wait();
         query_result->get(); // may throw on error
     }
-    catch (std::exception const& e)
+    catch (std::exception const&)
     {
         BOOST_LOG(logger_)
             << "SmartScopesClient.get_preview_results(): Failed to retrieve preview results for query "

=== modified file 'src/scopes/internal/zmq_middleware/ZmqObject.cpp'
--- src/scopes/internal/zmq_middleware/ZmqObject.cpp	2015-09-08 02:58:39 +0000
+++ src/scopes/internal/zmq_middleware/ZmqObject.cpp	2015-11-26 05:49:23 +0000
@@ -50,8 +50,6 @@
     std::mutex shared_mutex;
 }
 
-#define MONITOR_ENDPOINT "ipc:///tmp/scopes-monitor"
-
 ZmqObjectProxy::ZmqObjectProxy(ZmqMiddleware* mw_base,
                                string const& endpoint,
                                string const& identity,

=== modified file 'test/gtest/scopes/StandAloneScope/SimpleScope.cpp'
--- test/gtest/scopes/StandAloneScope/SimpleScope.cpp	2015-08-05 05:14:14 +0000
+++ test/gtest/scopes/StandAloneScope/SimpleScope.cpp	2015-11-26 05:49:23 +0000
@@ -77,7 +77,6 @@
 PreviewQueryBase::UPtr EchoScope::preview(Result const& /* result */, ActionMetadata const& /* metadata */)
 {
     abort();
-    return nullptr;
 }
 
 extern "C"

=== modified file 'test/gtest/scopes/ThrowingClient/ThrowingClient_test.cpp'
--- test/gtest/scopes/ThrowingClient/ThrowingClient_test.cpp	2015-02-06 06:33:23 +0000
+++ test/gtest/scopes/ThrowingClient/ThrowingClient_test.cpp	2015-11-26 05:49:23 +0000
@@ -100,7 +100,7 @@
         }
     }
 
-    virtual void info(OperationInfo const& /* op_info */)
+    virtual void info(OperationInfo const& /* op_info */) override
     {
         lock_guard<mutex> lock(mutex_);
 

=== modified file 'test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp'
--- test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp	2015-09-09 04:50:11 +0000
+++ test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp	2015-11-26 05:49:23 +0000
@@ -81,15 +81,13 @@
     ::close(fd);
 }
 
-BOOST_LOG_INLINE_GLOBAL_LOGGER_DEFAULT(test_logger, boost::log::sources::severity_channel_logger_mt<>)
-
 TEST(SettingsDB, basic)
 {
     auto schema = TEST_SRC_DIR "/schema.ini";
 
     {
         unlink(db_name.c_str());
-        auto db = SettingsDB::create_from_ini_file(db_name, schema, test_logger::get());
+        auto db = SettingsDB::create_from_ini_file(db_name, schema);
 
         // If db doesn't exist, default values are returned.
         EXPECT_EQ(4, db->settings().size());
@@ -165,7 +163,7 @@
 
         // This schema does not specify a default value for location and unit.
         auto schema = TEST_SRC_DIR "/no_default_schema.ini";
-        auto db = SettingsDB::create_from_ini_file(db_name, schema, test_logger::get());
+        auto db = SettingsDB::create_from_ini_file(db_name, schema);
 
         // Check that we now can see only the other two values. (DB doesn't exist yet.)
         EXPECT_EQ(2, db->settings().size());
@@ -188,7 +186,7 @@
 
         // This schema does not specify a default value for location and unit.
         auto schema = TEST_SRC_DIR "/no_default_schema.ini";
-        auto db = SettingsDB::create_from_ini_file(db_name, schema, test_logger::get());
+        auto db = SettingsDB::create_from_ini_file(db_name, schema);
 
         // Add records to supply the values.
         write_db("db_loctemp.ini");
@@ -218,7 +216,7 @@
 
     {
         unlink(db_name.c_str());
-        auto db = SettingsDB::create_from_ini_file(db_name, schema, test_logger::get());
+        auto db = SettingsDB::create_from_ini_file(db_name, schema);
 
         // If db doesn't exist, default values are returned.
         EXPECT_EQ(1, db->settings().size());
@@ -237,7 +235,7 @@
 
     {
         unlink(db_name.c_str());
-        auto db = SettingsDB::create_from_ini_file(db_name, schema, test_logger::get());
+        auto db = SettingsDB::create_from_ini_file(db_name, schema);
 
         // If db doesn't exist, default values are returned.
         EXPECT_EQ(4, db->settings().size());
@@ -288,7 +286,7 @@
 
     {
         unlink(db_name.c_str());
-        auto db = SettingsDB::create_from_json_string(db_name, ok_schema, test_logger::get());
+        auto db = SettingsDB::create_from_json_string(db_name, ok_schema);
 
         // If db doesn't exist, default values are returned.
         EXPECT_EQ(1, db->settings().size());
@@ -305,7 +303,7 @@
 {
     try
     {
-        auto db = SettingsDB::create_from_ini_file("unused", "no_such_file", test_logger::get());
+        auto db = SettingsDB::create_from_ini_file("unused", "no_such_file");
         FAIL();
     }
     catch (ResourceException const& e)
@@ -318,7 +316,7 @@
 
     try
     {
-        auto db = SettingsDB::create_from_json_string("unused", "syntax error", test_logger::get());
+        auto db = SettingsDB::create_from_json_string("unused", "syntax error");
         FAIL();
     }
     catch (ResourceException const& e)
@@ -334,7 +332,7 @@
         // Open DB that doesn't exist yet.
         unlink(db_name.c_str());
         auto schema = TEST_SRC_DIR "/schema.ini";
-        auto db = SettingsDB::create_from_ini_file(db_name, schema, test_logger::get());
+        auto db = SettingsDB::create_from_ini_file(db_name, schema);
 
         // Add a record, which creates the DB
         write_db("db_location.ini");
@@ -363,7 +361,7 @@
         write_db("db_location_munich.ini");
 
         auto schema = TEST_SRC_DIR "/schema.ini";
-        auto db = SettingsDB::create_from_ini_file(db_name, schema, test_logger::get());
+        auto db = SettingsDB::create_from_ini_file(db_name, schema);
 
         EXPECT_EQ(4, db->settings().size());
         EXPECT_EQ("Munich", db->settings()["locationSetting"].get_string());