Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-10 18:08:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename some ctor arguments to suppress shadow-related warnings.

Browse Source 
git-svn-id: https://arducopter.googlecode.com/svn/trunk@2071 f9c3cf11-9bcb-44bc-f272-b75c42450872
This commit is contained in:
DrZiplok 2011-05-02 05:55:34 +00:00
parent fe648644ce
commit f5ba77f23b
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libraries/AP_Common/AP_Var.h
View File

@ -423,8 +423,8 @@ public:
/// @param key Storage key for the group. /// @param key Storage key for the group.
/// @param name An optional name prefix for members of the group. /// @param name An optional name prefix for members of the group.
/// ///
AP_Var_group(Key key = k_key_none, const prog_char_t *name = NULL, Flags flags = k_flags_none) : AP_Var_group(Key with_key = k_key_none, const prog_char_t *name = NULL, Flags flags = k_flags_none) :
AP_Var(key, name, flags | k_flag_is_group) AP_Var(with_key, name, flags | k_flag_is_group)
{ {
_bytes_in_use += sizeof(*this); _bytes_in_use += sizeof(*this);
} }
@ -490,10 +490,10 @@ public:
/// @param flags Optional flags that may affect the behaviour of the variable. /// @param flags Optional flags that may affect the behaviour of the variable.
/// ///
AP_VarT<T> (const T initial_value = 0, AP_VarT<T> (const T initial_value = 0,
Key key = k_key_none, Key with_key = k_key_none,
const prog_char_t *name = NULL, const prog_char_t *name = NULL,
Flags flags = k_flags_none) : Flags flags = k_flags_none) :
AP_Var(key, name, flags), AP_Var(with_key, name, flags),
_value(initial_value) _value(initial_value)
{ {
_bytes_in_use += sizeof(*this); _bytes_in_use += sizeof(*this);
@ -511,12 +511,12 @@ public:
/// @param name An optional name by which the variable may be known. /// @param name An optional name by which the variable may be known.
/// @param flags Optional flags that may affect the behaviour of the variable. /// @param flags Optional flags that may affect the behaviour of the variable.
/// ///
AP_VarT<T> (AP_Var_group *group, // XXX maybe make this a ref? AP_VarT<T> (AP_Var_group *with_group, // XXX maybe make this a ref?
Key index, Key index,
T initial_value, T initial_value,
const prog_char_t *name = NULL, const prog_char_t *name = NULL,
Flags flags = k_flags_none) : Flags flags = k_flags_none) :
AP_Var(group, index, name, flags), AP_Var(with_group, index, name, flags),
_value(initial_value) _value(initial_value)
{ {
_bytes_in_use += sizeof(*this); _bytes_in_use += sizeof(*this);
@ -623,10 +623,10 @@ public:
/// @param name An optional name by which the variable may be known. /// @param name An optional name by which the variable may be known.
/// @param flags Optional flags that may affect the behavior of the variable. /// @param flags Optional flags that may affect the behavior of the variable.
/// ///
AP_VarS<T> (Key key = k_key_none, AP_VarS<T> (Key with_key = k_key_none,
const prog_char_t *name = NULL, const prog_char_t *name = NULL,
Flags flags = k_flags_none) : Flags flags = k_flags_none) :
AP_Var(key, name, flags) AP_Var(with_key, name, flags)
{ {
_bytes_in_use += sizeof(*this); _bytes_in_use += sizeof(*this);
} }
@ -642,11 +642,11 @@ public:
/// @param name An optional name by which the variable may be known. /// @param name An optional name by which the variable may be known.
/// @param flags Optional flags that may affect the behavior of the variable. /// @param flags Optional flags that may affect the behavior of the variable.
/// ///
AP_VarS<T> (AP_Var_group *group, // XXX maybe make this a ref? AP_VarS<T> (AP_Var_group *with_group, // XXX maybe make this a ref?
Key index, Key index,
const prog_char_t *name = NULL, const prog_char_t *name = NULL,
Flags flags = k_flags_none) : Flags flags = k_flags_none) :
AP_Var(group, index, name, flags) AP_Var(with_group, index, name, flags)
{ {
_bytes_in_use += sizeof(*this); _bytes_in_use += sizeof(*this);
} }
@ -739,10 +739,10 @@ public:
/// @param name An optional name by which the variable may be known. /// @param name An optional name by which the variable may be known.
/// @param flags Optional flags that may affect the behavior of the variable. /// @param flags Optional flags that may affect the behavior of the variable.
/// ///
AP_VarA<T,N> (Key key = k_key_none, AP_VarA<T,N> (Key with_key = k_key_none,
const prog_char_t *name = NULL, const prog_char_t *name = NULL,
Flags flags = k_flags_none) : Flags flags = k_flags_none) :
AP_Var(key, name, flags) AP_Var(with_key, name, flags)
{ {
_bytes_in_use += sizeof(*this); _bytes_in_use += sizeof(*this);
} }
@ -758,11 +758,11 @@ public:
/// @param name An optional name by which the variable may be known. /// @param name An optional name by which the variable may be known.
/// @param flags Optional flags that may affect the behavior of the variable. /// @param flags Optional flags that may affect the behavior of the variable.
/// ///
AP_VarA<T,N> (AP_Var_group *group, // XXX maybe make this a ref? AP_VarA<T,N> (AP_Var_group *with_group, // XXX maybe make this a ref?
Key index, Key index,
const prog_char_t *name = NULL, const prog_char_t *name = NULL,
Flags flags = k_flags_none) : Flags flags = k_flags_none) :
AP_Var(group, index, name, flags) AP_Var(with_group, index, name, flags)
{ {
_bytes_in_use += sizeof(*this); _bytes_in_use += sizeof(*this);
} }
@ -854,20 +854,20 @@ public:
/// Constructors mimic AP_Float::AP_Float() /// Constructors mimic AP_Float::AP_Float()
/// ///
AP_Float16(float initial_value = 0, AP_Float16(float initial_value = 0,
Key key = k_key_none, Key with_key = k_key_none,
const prog_char_t *name = NULL, const prog_char_t *name = NULL,
Flags flags = k_flags_none) : Flags flags = k_flags_none) :
AP_Float(initial_value, key, name, flags) AP_Float(initial_value, with_key, name, flags)
{ {
_bytes_in_use += sizeof(*this); _bytes_in_use += sizeof(*this);
} }
AP_Float16(AP_Var_group *group, AP_Float16(AP_Var_group *with_group,
Key index, Key index,
float initial_value = 0, float initial_value = 0,
const prog_char_t *name = NULL, const prog_char_t *name = NULL,
Flags flags = k_flags_none) : Flags flags = k_flags_none) :
AP_Float(group, index, initial_value, name, flags) AP_Float(with_group, index, initial_value, name, flags)
{ {
_bytes_in_use += sizeof(*this); _bytes_in_use += sizeof(*this);
} }