Skip to content

Commit f9ea496

Browse files
author
Chris Hellmuth
committed
Address windows -Werror
1 parent c1024f9 commit f9ea496

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

source/MaterialXGenOslNodes/OslNodesShaderGenerator.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ ShaderPtr OslNodesShaderGenerator::generate(const string& name, ElementPtr eleme
5252

5353
// Walk the node graph, emitting shaders and param declarations.
5454
for (auto&& node : graph.getNodes()) {
55-
const string& name = node->getName();
55+
const string& nodeName = node->getName();
5656

5757
for (auto&& input : node->getInputs()) {
5858
if (input->isDefault())
@@ -76,7 +76,7 @@ ShaderPtr OslNodesShaderGenerator::generate(const string& name, ElementPtr eleme
7676
string connName = connection->getName();
7777
_syntax->makeValidName(connName);
7878

79-
string connect = connectString(connection->getNode()->getName(), connName, name, inputName);
79+
string connect = connectString(connection->getNode()->getName(), connName, nodeName, inputName);
8080
// Save connect emits for the end, because they can't come
8181
// before both connected shaders have been declared.
8282
connections.push_back(connect);
@@ -100,8 +100,8 @@ ShaderPtr OslNodesShaderGenerator::generate(const string& name, ElementPtr eleme
100100
string osoPath = impl->getFile();
101101
osoPaths.insert(osoPath);
102102

103-
emitLine("shader " + osoName + " " + name + " ;", stage, false);
104-
lastNodeName = name;
103+
emitLine("shader " + osoName + " " + nodeName + " ;", stage, false);
104+
lastNodeName = nodeName;
105105
}
106106

107107
if (!lastOutput) {

source/MaterialXGenOslNodes/OslNodesSyntax.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class OslNodesVectorTypeSyntax : public AggregateTypeSyntax
2525
{
2626
}
2727

28-
string getValue(const Value& value, bool uniform) const override
28+
string getValue(const Value& value, bool /*uniform*/) const override
2929
{
3030
// param string values are space-separated, not comma-separated
3131
T c = value.asA<T>();
@@ -189,7 +189,7 @@ class OSLFilenameTypeSyntax : public AggregateTypeSyntax
189189
{
190190
}
191191

192-
string getValue(const ShaderPort* port, bool uniform) const override
192+
string getValue(const ShaderPort* port, bool /*uniform*/) const override
193193
{
194194
if (!port)
195195
{
@@ -200,7 +200,7 @@ class OSLFilenameTypeSyntax : public AggregateTypeSyntax
200200
return filename;
201201
}
202202

203-
string getValue(const Value& value, bool uniform) const override
203+
string getValue(const Value& value, bool /*uniform*/) const override
204204
{
205205
return value.getValueString();
206206
}

0 commit comments

Comments
 (0)