fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-21 12:10:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

util: fix in-class initialization of static member

Browse source 
Fix a compile error with G++ 4.4

string_buffer_test.cpp:43: error: ISO C++ forbids initialization of
member ‘str1’
string_buffer_test.cpp:43: error: making ‘str1’ static
string_buffer_test.cpp:43: error: invalid in-class initialization of
static data member of non-integral type ‘const char*’

Tested-by: Vinson Lee <vlee at freedesktop.org>

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103002
This commit is contained in:
Thomas Helland 2017-09-27 21:24:06 +02:00
parent a35f25068a
commit ce09364d4e
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/util/tests/string_buffer/string_buffer_test.cpp
View file

@ -40,9 +40,9 @@ class string_buffer : public ::testing::Test {
public:
struct _mesa_string_buffer *buf;
const char *str1 = "test1";
const char *str2 = "test2";
const char *str3 = "test1test2";
const char *str1;
const char *str2;
const char *str3;
char str4[80];
char str5[40];
@ -53,6 +53,9 @@ public:
void
string_buffer::SetUp()
{
str1 = "test1";
str2 = "test2";
str3 = "test1test2";
buf = _mesa_string_buffer_create(NULL, INITIAL_BUF_SIZE);
}