mirror of
https://github.com/xenia-project/SPIRV-Tools.git
synced 2025-03-03 08:57:10 +00:00
Avoid parameter shadowing in source/diagnostic.h
Change the offending class to more closely follow Google C++ style: - Member names have a trailing underscore. - Use an accessor method for the stream_ member.
This commit is contained in:
parent
969ce4b323
commit
d47f8b3fd8
@ -37,21 +37,22 @@ namespace libspirv {
|
||||
|
||||
class diagnostic_helper {
|
||||
public:
|
||||
diagnostic_helper(spv_position_t& position, spv_diagnostic* pDiagnostic)
|
||||
: position(&position), pDiagnostic(pDiagnostic) {}
|
||||
diagnostic_helper(spv_position_t& position, spv_diagnostic* diagnostic)
|
||||
: position_(&position), diagnostic_(diagnostic) {}
|
||||
|
||||
diagnostic_helper(spv_position position, spv_diagnostic* pDiagnostic)
|
||||
: position(position), pDiagnostic(pDiagnostic) {}
|
||||
diagnostic_helper(spv_position position, spv_diagnostic* diagnostic)
|
||||
: position_(position), diagnostic_(diagnostic) {}
|
||||
|
||||
~diagnostic_helper() {
|
||||
*pDiagnostic = spvDiagnosticCreate(position, stream.str().c_str());
|
||||
*diagnostic_ = spvDiagnosticCreate(position_, stream().str().c_str());
|
||||
}
|
||||
|
||||
std::stringstream stream;
|
||||
std::stringstream& stream() { return stream_; }
|
||||
|
||||
private:
|
||||
spv_position position;
|
||||
spv_diagnostic* pDiagnostic;
|
||||
std::stringstream stream_;
|
||||
spv_position position_;
|
||||
spv_diagnostic* diagnostic_;
|
||||
};
|
||||
|
||||
// A DiagnosticStream remembers the current position of the input and an error
|
||||
@ -99,7 +100,7 @@ class DiagnosticStream {
|
||||
|
||||
#define DIAGNOSTIC \
|
||||
libspirv::diagnostic_helper helper(position, pDiagnostic); \
|
||||
helper.stream
|
||||
helper.stream()
|
||||
|
||||
} // namespace libspirv
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user