Skip to content

Commit de8ece7

Browse files
committed
corrected out of place semicolons
1 parent 15f9795 commit de8ece7

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/DataModelBase/Job.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace ToolFramework{
2929
bool m_complete; ///< if the job is complete
3030
bool m_in_progress; ///< if the job is in progress
3131
bool m_failed; ///< if the job has failed
32-
std::string m_id; ///< string to hold id
32+
std::string m_id = ""; ///< string to hold id
3333
JobDeque* out_deque = 0; ///< output deque to place finished job
3434
Pool<Job>* out_pool = 0; ///< output pool to place finished jobs
3535

src/Store/Json.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ bool json_encode(std::ostream& output, const T* data, size_t size) {
4141
};
4242
output << ']';
4343
return true;
44-
};
44+
}
4545

4646
template <typename T, size_t N>
4747
bool json_encode(std::ostream& output, const std::array<T, N>& array) {
4848
return json_encode(output, array.data(), array.size());
49-
};
49+
}
5050

5151
template <typename T>
5252
bool json_encode(std::ostream& output, const std::vector<T>& vector) {
5353
return json_encode(output, vector.data(), vector.size());
54-
};
54+
}
5555

5656
template <typename T>
5757
bool json_encode(std::ostream& output, const std::map<std::string, T>& data) {
@@ -82,7 +82,7 @@ namespace json_internal {
8282

8383
inline bool json_encode_object_slots(std::ostream& output, bool& comma) {
8484
return true;
85-
};
85+
}
8686

8787
template <typename Slot, typename... Rest>
8888
bool json_encode_object_slots(
@@ -97,7 +97,7 @@ namespace json_internal {
9797
output << '"' << name << '"' << ':';
9898
if (!json_encode(output, slot)) return false;
9999
return json_encode_object_slots(output, comma, rest...);
100-
};
100+
}
101101

102102
template <typename Slot, typename... Rest>
103103
bool json_encode_object_slots(
@@ -108,9 +108,9 @@ namespace json_internal {
108108
Rest... rest
109109
) {
110110
return json_encode_object_slots(output, comma, name.c_str(), slot, rest...);
111-
};
111+
}
112112

113-
}; // json_internal
113+
} // json_internal
114114

115115

116116
// A helper function to write fixed-size objects
@@ -126,6 +126,6 @@ bool json_encode_object(std::ostream& output, Args... args) {
126126
return true;
127127
}
128128

129-
}; // ToolFramework
129+
} // ToolFramework
130130

131131
#endif

0 commit comments

Comments
 (0)