X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fenum.c;h=f096d5b6dc4081626087094598bc1f59f2cbb1d9;hp=6fcbe683a9ab12a9c11042e5c2c809332dd3cca8;hb=64fa3fec6c28f1d077812b4bfa06ae73b0f5999d;hpb=bcdf4cf28bb5517137c074801b949fc641141e6c

diff --git a/types/enum.c b/types/enum.c
index 6fcbe683..f096d5b6 100644
--- a/types/enum.c
+++ b/types/enum.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - Enumeration Type
  *
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -125,18 +127,18 @@ GArray *enum_uint_to_quark_set(const struct declaration_enum *enum_declaration,
 			if (qs)
 				qs_len = qs->len;
 			ranges = g_array_sized_new(FALSE, TRUE,
-					sizeof(struct enum_range),
+					sizeof(GQuark),
 					qs_len + 1);
 			g_array_set_size(ranges, qs_len + 1);
 			if (qs)
 				memcpy(ranges->data, qs->data,
-				       sizeof(struct enum_range) * qs_len);
-			g_array_index(ranges, struct enum_range, qs_len) = iter->range;
+				       sizeof(GQuark) * qs_len);
+			g_array_index(ranges, GQuark, qs_len) = iter->quark;
 		} else {
 			size_t qs_len = ranges->len;
 
 			g_array_set_size(ranges, qs_len + 1);
-			g_array_index(ranges, struct enum_range, qs_len) = iter->range;
+			g_array_index(ranges, GQuark, qs_len) = iter->quark;
 		}
 	}
 	if (!ranges) {
@@ -172,18 +174,18 @@ GArray *enum_int_to_quark_set(const struct declaration_enum *enum_declaration,
 			if (qs)
 				qs_len = qs->len;
 			ranges = g_array_sized_new(FALSE, TRUE,
-					sizeof(struct enum_range),
+					sizeof(GQuark),
 					qs_len + 1);
 			g_array_set_size(ranges, qs_len + 1);
 			if (qs)
 				memcpy(ranges->data, qs->data,
-				       sizeof(struct enum_range) * qs_len);
-			g_array_index(ranges, struct enum_range, qs_len) = iter->range;
+				       sizeof(GQuark) * qs_len);
+			g_array_index(ranges, GQuark, qs_len) = iter->quark;
 		} else {
 			size_t qs_len = ranges->len;
 
 			g_array_set_size(ranges, qs_len + 1);
-			g_array_index(ranges, struct enum_range, qs_len) = iter->range;
+			g_array_index(ranges, GQuark, qs_len) = iter->quark;
 		}
 	}
 	if (!ranges) {