diff options
Diffstat (limited to 'meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch')
-rw-r--r-- | meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch index 8f8dba054..30fdb8bf1 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 77d50b8d92ef1903cbc50d8f39e05fc828696bb9 Mon Sep 17 00:00:00 2001 | 1 | From 38c5343f84799fc5041575f3ec808f7476b6eea3 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 16 Apr 2018 14:33:35 -0700 | 3 | Date: Mon, 16 Apr 2018 14:33:35 -0700 |
4 | Subject: [PATCH 1/2] Catch std::ifstream::failure by reference | 4 | Subject: [PATCH] Catch std::ifstream::failure by reference |
5 | 5 | ||
6 | Fixes | 6 | Fixes |
7 | error: catching polymorphic type 'class std::ios_base::failure' by value | 7 | error: catching polymorphic type 'class std::ios_base::failure' by value |
@@ -10,6 +10,7 @@ error: catching polymorphic type 'class std::ios_base::failure' by value | |||
10 | ^~~~~~~ | 10 | ^~~~~~~ |
11 | 11 | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | |||
13 | --- | 14 | --- |
14 | src/base/conf.cc | 4 ++-- | 15 | src/base/conf.cc | 4 ++-- |
15 | src/dtm/dtmnd/dtm_main.cc | 2 +- | 16 | src/dtm/dtmnd/dtm_main.cc | 2 +- |
@@ -39,10 +40,10 @@ index d5755a1..4820357 100644 | |||
39 | } | 40 | } |
40 | str.close(); | 41 | str.close(); |
41 | diff --git a/src/dtm/dtmnd/dtm_main.cc b/src/dtm/dtmnd/dtm_main.cc | 42 | diff --git a/src/dtm/dtmnd/dtm_main.cc b/src/dtm/dtmnd/dtm_main.cc |
42 | index 3260a81..a55afac 100644 | 43 | index 585e11e..5cf6ad7 100644 |
43 | --- a/src/dtm/dtmnd/dtm_main.cc | 44 | --- a/src/dtm/dtmnd/dtm_main.cc |
44 | +++ b/src/dtm/dtmnd/dtm_main.cc | 45 | +++ b/src/dtm/dtmnd/dtm_main.cc |
45 | @@ -359,7 +359,7 @@ void UpdateNodeIdFile(DTM_INTERNODE_CB *cb) { | 46 | @@ -367,7 +367,7 @@ void UpdateNodeIdFile(DTM_INTERNODE_CB *cb) { |
46 | try { | 47 | try { |
47 | str.open(PKGLOCALSTATEDIR "/node_id", std::ofstream::out); | 48 | str.open(PKGLOCALSTATEDIR "/node_id", std::ofstream::out); |
48 | str << std::hex << node_id << std::endl; | 49 | str << std::hex << node_id << std::endl; |
@@ -52,10 +53,10 @@ index 3260a81..a55afac 100644 | |||
52 | str.close(); | 53 | str.close(); |
53 | } | 54 | } |
54 | diff --git a/src/dtm/dtmnd/multicast.cc b/src/dtm/dtmnd/multicast.cc | 55 | diff --git a/src/dtm/dtmnd/multicast.cc b/src/dtm/dtmnd/multicast.cc |
55 | index bf67b9c..7232066 100644 | 56 | index cadc002..7c25fea 100644 |
56 | --- a/src/dtm/dtmnd/multicast.cc | 57 | --- a/src/dtm/dtmnd/multicast.cc |
57 | +++ b/src/dtm/dtmnd/multicast.cc | 58 | +++ b/src/dtm/dtmnd/multicast.cc |
58 | @@ -198,7 +198,7 @@ bool Multicast::GetPeersFromFile(const std::string &path_name) { | 59 | @@ -199,7 +199,7 @@ bool Multicast::GetPeersFromFile(const std::string &path_name) { |
59 | } | 60 | } |
60 | } | 61 | } |
61 | } | 62 | } |
@@ -64,6 +65,3 @@ index bf67b9c..7232066 100644 | |||
64 | LOG_ER("Caught std::ifstream::failure when reading file '%s', peers=%zu", | 65 | LOG_ER("Caught std::ifstream::failure when reading file '%s', peers=%zu", |
65 | path_name.c_str(), static_cast<size_t>(peers_.size())); | 66 | path_name.c_str(), static_cast<size_t>(peers_.size())); |
66 | peers_.clear(); | 67 | peers_.clear(); |
67 | -- | ||
68 | 2.17.0 | ||
69 | |||