Add type casts and adjust format strings in searchcore module.

2 files changed, 4 insertions, 2 deletions

diff --git a/searchcore/src/apps/proton/proton.cpp b/searchcore/src/apps/proton/proton.cpp
index 70cd8d8a7ad..7d63d8910ba 100644
--- a/searchcore/src/apps/proton/proton.cpp
+++ b/searchcore/src/apps/proton/proton.cpp
@@ -74,7 +74,7 @@ App::parseParams()
     parser.addOption("identity", params.identity, "Node identity and config id");
     std::string empty("");
     parser.addOption("serviceidentity", params.serviceidentity, empty, "Service node identity and config id");
-    parser.addOption("subscribeTimeout", params.subscribeTimeout, 600000UL, "Initial config subscribe timeout");
+    parser.addOption("subscribeTimeout", params.subscribeTimeout, UINT64_C(600000), "Initial config subscribe timeout");
     try {
         parser.parse();
     } catch (vespalib::InvalidCommandLineArgumentsException &e) {
diff --git a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
index 7af7951abba..f5aa74d85e1 100644
--- a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
+++ b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
@@ -76,7 +76,9 @@ ConfigFile::deserialize(vespalib::nbostream &stream)
 {
     stream >> _name;
     assert(strchr(_name.c_str(), '/') == NULL);
-    stream >> _modTime;
+    int64_t modTime;
+    stream >> modTime;
+    _modTime = modTime;
     uint32_t sz;
     stream >> sz;
     _content.resize(sz);