Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(627)

Unified Diff: liboslcomp/oslcomp.cpp

Issue 193074: Fix errors and warnings from g++-4.4.1 Base URL: http://openshadinglanguage.googlecode.com/svn/trunk/
Patch Set: Created 14 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | liboslcomp/osllex.l » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: liboslcomp/oslcomp.cpp
===================================================================
--- liboslcomp/oslcomp.cpp (revision 542)
+++ liboslcomp/oslcomp.cpp (working copy)
@@ -482,7 +482,6 @@
return;
}
- // FIXME -- remove the hard-coded version!
oso ("OpenShadingLanguage %d.%02d\n",
OSO_FILE_VERSION_MAJOR, OSO_FILE_VERSION_MINOR);
oso ("# Compiled by oslc %s\n", OSL_LIBRARY_VERSION_STRING);
@@ -650,7 +649,8 @@
// Now read lines up to and including the file we want.
char buf[10240];
while (m_last_sourceline < line) {
- fgets (buf, sizeof(buf), m_sourcefile);
+ if (!fgets (buf, sizeof(buf), m_sourcefile))
+ ASSERT (0 && "line not found in source file");
++m_last_sourceline;
}
@@ -1014,7 +1014,7 @@
// Loop through all the op's arguments, see if one matches sym
for (int i = 0; i < op.nargs(); ++i)
if (m_opargs[i+op.firstarg()] == sym &&
- (read && op.argread(i)) || (write && op.argwrite(i)))
+ ((read && op.argread(i)) || (write && op.argwrite(i))))
return true;
return false;
}
« no previous file with comments | « no previous file | liboslcomp/osllex.l » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b