luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

gfile: Don't use C++ keyword "template" as variable name

Browse Source 
This breaks autotestkeyword.cc from gtk+.
This commit is contained in:
Colin Walters 2011-12-09 11:13:23 -05:00
parent 8fcb73b0a9
commit 4eeac41d7d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gfile.c
View File

@ -5895,7 +5895,7 @@ g_file_new_for_uri (const char *uri)
/** /**
* g_file_new_tmp: * g_file_new_tmp:
* @template: (type filename) (allow-none): Template for the file * @tmpl: (type filename) (allow-none): Template for the file
* name, as in g_file_open_tmp(), or %NULL for a default template. * name, as in g_file_open_tmp(), or %NULL for a default template.
* @iostream: (out): on return, a #GFileIOStream for the created file. * @iostream: (out): on return, a #GFileIOStream for the created file.
* @error: a #GError, or %NULL * @error: a #GError, or %NULL
@ -5915,7 +5915,7 @@ g_file_new_for_uri (const char *uri)
* Free the returned object with g_object_unref(). * Free the returned object with g_object_unref().
**/ **/
GFile * GFile *
g_file_new_tmp (const char *template, g_file_new_tmp (const char *tmpl,
GFileIOStream **iostream, GFileIOStream **iostream,
GError **error) GError **error)
{ {
@ -5924,10 +5924,10 @@ g_file_new_tmp (const char *template,
GFile *file; GFile *file;
GFileOutputStream *output; GFileOutputStream *output;
g_return_val_if_fail (template != NULL, NULL); g_return_val_if_fail (tmpl != NULL, NULL);
g_return_val_if_fail (iostream != NULL, NULL); g_return_val_if_fail (iostream != NULL, NULL);
fd = g_file_open_tmp (template, &path, error); fd = g_file_open_tmp (tmpl, &path, error);
if (fd == -1) if (fd == -1)
return NULL; return NULL;

2
gio/gfile.h
View File

@ -550,7 +550,7 @@ GType g_file_get_type (void) G_GNUC_CONST;
GFile * g_file_new_for_path (const char *path); GFile * g_file_new_for_path (const char *path);
GFile * g_file_new_for_uri (const char *uri); GFile * g_file_new_for_uri (const char *uri);
GFile * g_file_new_for_commandline_arg (const char *arg); GFile * g_file_new_for_commandline_arg (const char *arg);
GFile * g_file_new_tmp (const char *template, GFile * g_file_new_tmp (const char *tmpl,
GFileIOStream **iostream, GFileIOStream **iostream,
GError **error); GError **error);
GFile * g_file_parse_name (const char *parse_name); GFile * g_file_parse_name (const char *parse_name);