FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Warning fixes

Browse Source
This commit is contained in:
Robert Osfield
2008-12-17 11:00:16 +00:00
parent e754fc5aab
commit a5c32da4ff
18 changed files with 80 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/osg/GraphicsContext
View File

@@ -158,14 +158,14 @@ class OSG_EXPORT GraphicsContext : public Object
ScreenSettings() :
width(0),
height(0),
colorDepth(0),
refreshRate(0)
refreshRate(0),
colorDepth(0)
{}
ScreenSettings(int width, int height, double refreshRate=0, unsigned int colorDepth=0) :
width(width),
height(height),
colorDepth(colorDepth),
refreshRate(refreshRate)
refreshRate(refreshRate),
colorDepth(colorDepth)
{}
int width;

2
include/osgAnimation/Sampler
View File

@@ -119,6 +119,6 @@ namespace osgAnimation
typedef TemplateSampler<Vec3CubicBezierInterpolator> Vec3CubicBezierSampler;
typedef TemplateSampler<Vec4CubicBezierInterpolator> Vec4CubicBezierSampler;
};
}
#endif

12
include/osgIntrospection/ConstructorInfo
View File

@@ -27,8 +27,8 @@ namespace osgIntrospection
{
public:
// Standard constructor.
ConstructorInfo(const Type& decltype, const ParameterInfoList& params, std::string briefHelp = std::string(), std::string detailedHelp = std::string())
: _decltype(decltype),
ConstructorInfo(const Type& declaratiionType, const ParameterInfoList& params, std::string briefHelp = std::string(), std::string detailedHelp = std::string())
: _declarationType(declaratiionType),
_params(params),
_explicit(false),
_briefHelp(briefHelp),
@@ -37,8 +37,8 @@ namespace osgIntrospection
}
// Constructor allowing explicit state specification.
ConstructorInfo(const Type& decltype, const ParameterInfoList& params, bool isExplicit, std::string briefHelp = std::string(), std::string detailedHelp = std::string())
: _decltype(decltype),
ConstructorInfo(const Type& declaratiionType, const ParameterInfoList& params, bool isExplicit, std::string briefHelp = std::string(), std::string detailedHelp = std::string())
: _declarationType(declaratiionType),
_params(params),
_explicit(isExplicit),
_briefHelp(briefHelp),
@@ -68,7 +68,7 @@ namespace osgIntrospection
/// declares the reflected constructor.
inline const Type& getDeclaringType() const
{
return _decltype;
return _declarationType;
}
/// Returns a list of objects that describe the reflected
@@ -92,7 +92,7 @@ namespace osgIntrospection
virtual void getInheritedProviders(CustomAttributeProviderList& providers) const;
private:
const Type& _decltype;
const Type& _declarationType;
ParameterInfoList _params;
bool _explicit;

16
include/osgIntrospection/MethodInfo
View File

@@ -46,10 +46,10 @@ namespace osgIntrospection
};
/// Direct initialization constructor.
inline MethodInfo(const std::string& qname, const Type& decltype, const Type& rtype, const ParameterInfoList& plist, VirtualState virtualState, std::string briefHelp = std::string(), std::string detailedHelp = std::string());
inline MethodInfo(const std::string& qname, const Type& declarationType, const Type& rtype, const ParameterInfoList& plist, VirtualState virtualState, std::string briefHelp = std::string(), std::string detailedHelp = std::string());
/// Direct initialization constructor for static functions (no virtual specifier).
inline MethodInfo(const std::string& qname, const Type& decltype, const Type& rtype, const ParameterInfoList& plist, std::string briefHelp = std::string(), std::string detailedHelp = std::string());
inline MethodInfo(const std::string& qname, const Type& declarationType, const Type& rtype, const ParameterInfoList& plist, std::string briefHelp = std::string(), std::string detailedHelp = std::string());
/// Destructor
inline ~MethodInfo();
@@ -119,7 +119,7 @@ namespace osgIntrospection
virtual void getInheritedProviders(CustomAttributeProviderList& providers) const;
std::string _name;
const Type& _decltype;
const Type& _declarationType;
const Type& _rtype;
ParameterInfoList _params;
VirtualState _virtualState;
@@ -130,9 +130,9 @@ namespace osgIntrospection
// INLINE METHODS
inline MethodInfo::MethodInfo(const std::string& qname, const Type& decltype, const Type& rtype, const ParameterInfoList& plist, VirtualState virtualState, std::string briefHelp, std::string detailedHelp)
inline MethodInfo::MethodInfo(const std::string& qname, const Type& declarationType, const Type& rtype, const ParameterInfoList& plist, VirtualState virtualState, std::string briefHelp, std::string detailedHelp)
: CustomAttributeProvider(),
_decltype(decltype),
_declarationType(declarationType),
_rtype(rtype),
_params(plist),
_virtualState(virtualState),
@@ -142,9 +142,9 @@ namespace osgIntrospection
_name = strip_namespace(qname);
}
inline MethodInfo::MethodInfo(const std::string& qname, const Type& decltype, const Type& rtype, const ParameterInfoList& plist, std::string briefHelp, std::string detailedHelp)
inline MethodInfo::MethodInfo(const std::string& qname, const Type& declarationType, const Type& rtype, const ParameterInfoList& plist, std::string briefHelp, std::string detailedHelp)
: CustomAttributeProvider(),
_decltype(decltype),
_declarationType(declarationType),
_rtype(rtype),
_params(plist),
_virtualState(NON_VIRTUAL),
@@ -169,7 +169,7 @@ namespace osgIntrospection
inline const Type& MethodInfo::getDeclaringType() const
{
return _decltype;
return _declarationType;
}
inline const Type& MethodInfo::getReturnType() const

16
include/osgIntrospection/PropertyInfo
View File

@@ -56,9 +56,9 @@ namespace osgIntrospection
/// be null, meaning a restricted access. If both are null, the
/// user is expected to add a custom accessor attribute to this
/// PropertyInfo object.
PropertyInfo(const Type& decltype, const Type& ptype, const std::string& name, const MethodInfo* getm, const MethodInfo* setm, std::string briefHelp = std::string(), std::string detailedHelp = std::string())
PropertyInfo(const Type& declaratiionType, const Type& ptype, const std::string& name, const MethodInfo* getm, const MethodInfo* setm, std::string briefHelp = std::string(), std::string detailedHelp = std::string())
: CustomAttributeProvider(),
_decltype(decltype),
_declarationType(declaratiionType),
_ptype(ptype),
_name(name),
_getm(getm),
@@ -78,9 +78,9 @@ namespace osgIntrospection
/// declares the property, the Type object that describes the
/// type of the property's value, the property name and the
/// getter/setter/counter/adder/insert/remover methods.
PropertyInfo(const Type& decltype, const Type& ptype, const std::string& name, const MethodInfo* getm, const MethodInfo* setm, const MethodInfo* numm, const MethodInfo* addm, const MethodInfo* insm, const MethodInfo* remm, std::string briefHelp = std::string(), std::string detailedHelp = std::string())
PropertyInfo(const Type& declaratiionType, const Type& ptype, const std::string& name, const MethodInfo* getm, const MethodInfo* setm, const MethodInfo* numm, const MethodInfo* addm, const MethodInfo* insm, const MethodInfo* remm, std::string briefHelp = std::string(), std::string detailedHelp = std::string())
: CustomAttributeProvider(),
_decltype(decltype),
_declarationType(declaratiionType),
_ptype(ptype),
_name(name),
_getm(getm),
@@ -105,9 +105,9 @@ namespace osgIntrospection
/// If the getter method has parameters, the property is considered
/// to be indexed. The same is true if the getter is null and the
/// setter has more than one parameter.
PropertyInfo(const Type& decltype, const Type& ptype, const std::string& name, const MethodInfo* getm, const MethodInfo* setm, const MethodInfo* remm, std::string briefHelp = std::string(), std::string detailedHelp = std::string())
PropertyInfo(const Type& declaratiionType, const Type& ptype, const std::string& name, const MethodInfo* getm, const MethodInfo* setm, const MethodInfo* remm, std::string briefHelp = std::string(), std::string detailedHelp = std::string())
: CustomAttributeProvider(),
_decltype(decltype),
_declarationType(declaratiionType),
_ptype(ptype),
_name(name),
_getm(getm),
@@ -161,7 +161,7 @@ namespace osgIntrospection
/// Returns the type that declares the property.
inline virtual const Type& getDeclaringType() const
{
return _decltype;
return _declarationType;
}
/// Returns the type of the reflected property.
@@ -360,7 +360,7 @@ namespace osgIntrospection
virtual void getInheritedProviders(CustomAttributeProviderList& providers) const;
private:
const Type& _decltype;
const Type& _declarationType;
const Type& _ptype;
std::string _name;
const MethodInfo* _getm;

2
include/osgShadow/MinimalDrawBoundsShadowMap
View File

@@ -118,8 +118,8 @@ class OSGSHADOW_EXPORT MinimalDrawBoundsShadowMap
}
protected:
osg::ref_ptr< osg::NodeCallback > _nc;
osg::observer_ptr< ViewData > _vd;
osg::ref_ptr< osg::NodeCallback > _nc;
};
};