On Tue, Aug 12, 2014 at 10:18 AM, Emil Velikov <emil.l.veli...@gmail.com> wrote:
> I'm not entirely sure how piglit build with gcc as is, yet VC compiler
> seems very unhappy about this.
>
> Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
> ---
> tests/util/piglit-vbo.cpp | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/util/piglit-vbo.cpp b/tests/util/piglit-vbo.cpp
> index 8a6ef90..19fddde 100644
> --- a/tests/util/piglit-vbo.cpp
> +++ b/tests/util/piglit-vbo.cpp
> @@ -284,7 +284,7 @@ vertex_attrib_description::setup(size_t *offset, size_t
> stride) const
> glVertexAttribPointer(this->index, this->count,
> this->data_type, GL_FALSE, stride,
> (void *) *offset);
> - } else if (piglit_is_gles() and piglit_get_gl_version() < 30) {
> + } else if (piglit_is_gles() && piglit_get_gl_version() < 30) {
Regardless of whether 'and' is available in the language or via some
header, I'm in favor of not using it.
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
