diff mbox

[Branch,~glcompbench-dev/glcompbench/trunk] Rev 50: Use a specific union member when passing a union as an argument to a varargs function.

Message ID 20110719151317.7684.71183.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

alexandros.frantzis@linaro.org July 19, 2011, 3:13 p.m. UTC 
------------------------------------------------------------
revno: 50
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
branch nick: trunk
timestamp: Tue 2011-07-19 18:08:44 +0300
message:
  Use a specific union member when passing a union as an argument to a varargs function.
  
  Older compilers can't handle passing union (non-POD) types to varargs functions.
modified:
  src/composite-test-simple-brick.cc
  src/composite-test-simple-default.cc


--
lp:glcompbench
https://code.launchpad.net/~glcompbench-dev/glcompbench/trunk

You are subscribed to branch lp:glcompbench.
To unsubscribe from this branch go to https://code.launchpad.net/~glcompbench-dev/glcompbench/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'src/composite-test-simple-brick.cc'
--- src/composite-test-simple-brick.cc	2011-07-15 08:16:54 +0000
+++ src/composite-test-simple-brick.cc	2011-07-19 15:08:44 +0000
@@ -87,7 +87,7 @@ 
                                        model_view_matrix_name_);
 
             Log::debug("Drawing Win: 0x%x Tex: 0x%x\n",
-                       comp_win->get_xwindow(), comp_win->get_texture());
+                       comp_win->get_xwindow(), comp_win->get_texture().i);
 
             glBindTexture(GL_TEXTURE_2D, tex);
             vboData_.draw();

=== modified file 'src/composite-test-simple-default.cc'
--- src/composite-test-simple-default.cc	2011-07-15 08:16:54 +0000
+++ src/composite-test-simple-default.cc	2011-07-19 15:08:44 +0000
@@ -68,7 +68,7 @@ 
                                        model_view_matrix_name_);
 
             Log::debug("Drawing Win: 0x%x Tex: 0x%x\n",
-                       comp_win->get_xwindow(), comp_win->get_texture());
+                       comp_win->get_xwindow(), comp_win->get_texture().i);
 
             glBindTexture(GL_TEXTURE_2D, tex);
             vboData_.draw();