Remove warnings for clang++ 3.6.2-1

This commit is contained in:
vczh
2015-12-27 15:11:44 -08:00
parent 3773575f89
commit 50ea98d4c8
9 changed files with 26 additions and 25 deletions
+5 -5
View File
@@ -44002,7 +44002,7 @@ IGuiResourceResolverManager
return true;
}
vint GetMaxPrecompilePassIndex()
vint GetMaxPrecompilePassIndex()override
{
vint maxPass = -1;
FOREACH(Ptr<IGuiResourceTypeResolver>, resolver, typeResolvers.Values())
@@ -44019,7 +44019,7 @@ IGuiResourceResolverManager
return maxPass;
}
vint GetMaxInitializePassIndex()
vint GetMaxInitializePassIndex()override
{
vint maxPass = -1;
FOREACH(Ptr<IGuiResourceTypeResolver>, resolver, typeResolvers.Values())
@@ -44149,7 +44149,7 @@ Image Type Resolver (Image)
}
}
Ptr<DescriptableObject> ResolveResourcePrecompiled(stream::IStream& stream, collections::List<WString>& errors)
Ptr<DescriptableObject> ResolveResourcePrecompiled(stream::IStream& stream, collections::List<WString>& errors)override
{
stream::internal::Reader reader(stream);
MemoryStream memoryStream;
@@ -44247,7 +44247,7 @@ Text Type Resolver (Text)
}
}
Ptr<DescriptableObject> ResolveResourcePrecompiled(stream::IStream& stream, collections::List<WString>& errors)
Ptr<DescriptableObject> ResolveResourcePrecompiled(stream::IStream& stream, collections::List<WString>& errors)override
{
stream::internal::Reader reader(stream);
WString text;
@@ -44351,7 +44351,7 @@ Xml Type Resolver (Xml)
return 0;
}
Ptr<DescriptableObject> ResolveResourcePrecompiled(stream::IStream& stream, collections::List<WString>& errors)
Ptr<DescriptableObject> ResolveResourcePrecompiled(stream::IStream& stream, collections::List<WString>& errors)override
{
stream::internal::Reader reader(stream);
WString text;
+3 -3
View File
@@ -8074,7 +8074,7 @@ Basic Construction
virtual void SetVisible(bool value);
/// <summary>Get the Alt-combined shortcut key associated with this control.</summary>
/// <returns>The Alt-combined shortcut key associated with this control.</returns>
virtual const WString& GetAlt();
virtual const WString& GetAlt()override;
/// <summary>Associate a Alt-combined shortcut key with this control.</summary>
/// <returns>Returns true if this operation succeeded.</returns>
/// <param name="value">The Alt-combined shortcut key to associate. Only zero, sigle or multiple upper case letters are legal.</param>
@@ -10851,7 +10851,7 @@ Predefined ItemProvider
class ListProvider : public ItemProviderBase, public ItemsBase<T>
{
protected:
void NotifyUpdateInternal(vint start, vint count, vint newCount)
void NotifyUpdateInternal(vint start, vint count, vint newCount)override
{
InvokeOnItemModified(start, count, newCount);
}
@@ -16110,7 +16110,7 @@ Datagrid ContentProvider
void NotifyCloseEditor();
void NotifySelectCell(vint row, vint column);
void RequestSaveData();
void RequestSaveData()override;
IDataEditor* OpenEditor(vint row, vint column, IDataEditorFactory* editorFactory);
void CloseEditor(bool forOpenNewEditor);
public:
+8 -8
View File
@@ -542,7 +542,7 @@ GuiDefaultInstanceLoader
return GetDefaultConstructor(typeInfo.typeDescriptor) != 0;
}
Ptr<workflow::WfStatement> CreateInstance(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List<WString>& errors)
Ptr<workflow::WfStatement> CreateInstance(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List<WString>& errors)override
{
auto create = MakePtr<WfNewTypeExpression>();
create->type = GetTypeFromTypeInfo(GetDefaultConstructor(typeInfo.typeDescriptor)->GetReturn());
@@ -560,7 +560,7 @@ GuiDefaultInstanceLoader
return stat;
}
Ptr<workflow::WfStatement> AssignParameters(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List<WString>& errors)
Ptr<workflow::WfStatement> AssignParameters(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List<WString>& errors)override
{
auto block = MakePtr<WfBlockStatement>();
@@ -645,7 +645,7 @@ GuiDefaultInstanceLoader
return nullptr;
}
Ptr<workflow::WfExpression> GetParameter(const PropertyInfo& propertyInfo, GlobalStringKey variableName, collections::List<WString>& errors)
Ptr<workflow::WfExpression> GetParameter(const PropertyInfo& propertyInfo, GlobalStringKey variableName, collections::List<WString>& errors)override
{
auto refValue = MakePtr<WfReferenceExpression>();
refValue->name.value = variableName.ToString();
@@ -1175,7 +1175,7 @@ GuiEvalInstanceEventBinder (eval)
return GlobalStringKey::_Eval;
}
Ptr<workflow::WfStatement> GenerateInstallStatement(GlobalStringKey variableName, description::IEventInfo* eventInfo, const WString& code, collections::List<WString>& errors)
Ptr<workflow::WfStatement> GenerateInstallStatement(GlobalStringKey variableName, description::IEventInfo* eventInfo, const WString& code, collections::List<WString>& errors)override
{
if (auto statement = Workflow_ParseStatement(code, errors))
{
@@ -2876,7 +2876,7 @@ GuiTableCompositionInstanceLoader
propertyNames.Add(_Columns);
}
void GetPairedProperties(const PropertyInfo& propertyInfo, collections::List<GlobalStringKey>& propertyNames)
void GetPairedProperties(const PropertyInfo& propertyInfo, collections::List<GlobalStringKey>& propertyNames)override
{
if (propertyInfo.propertyName == _Rows || propertyInfo.propertyName == _Columns)
{
@@ -3169,12 +3169,12 @@ GuiDocumentItemInstanceLoader
}
bool CanCreate(const TypeInfo& typeInfo)
bool CanCreate(const TypeInfo& typeInfo)override
{
return typeName == typeInfo.typeName;
}
Ptr<workflow::WfStatement> CreateInstance(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List<WString>& errors)
Ptr<workflow::WfStatement> CreateInstance(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List<WString>& errors)override
{
if (typeInfo.typeName == GetTypeName())
{
@@ -5239,7 +5239,7 @@ GuiToolstripButtonInstanceLoader
return BASE_TYPE::GetPropertyType(propertyInfo);
}
Ptr<workflow::WfExpression> GetParameter(const PropertyInfo& propertyInfo, GlobalStringKey variableName, collections::List<WString>& errors)
Ptr<workflow::WfExpression> GetParameter(const PropertyInfo& propertyInfo, GlobalStringKey variableName, collections::List<WString>& errors)override
{
if (propertyInfo.propertyName == _SubMenu)
{
+2 -2
View File
@@ -1707,7 +1707,7 @@ Interface Proxy
INVOKE_INTERFACE_PROXY(SetTabAlt, index, value, host);
}
compositions::IGuiAltAction* GetTabAltAction(vint index)
compositions::IGuiAltAction* GetTabAltAction(vint index)override
{
return INVOKEGET_INTERFACE_PROXY(GetTabAltAction, index);
}
@@ -1770,7 +1770,7 @@ Interface Proxy
INVOKE_INTERFACE_PROXY_NOPARAMS(InitializeNativeWindowProperties);
}
void SetSizeState(INativeWindow::WindowSizeState value)
void SetSizeState(INativeWindow::WindowSizeState value)override
{
INVOKE_INTERFACE_PROXY(SetSizeState, value);
}
+6 -6
View File
@@ -10600,18 +10600,18 @@ GeneralValueSerializer
{
}
ITypeDescriptor* GetOwnerTypeDescriptor()
ITypeDescriptor* GetOwnerTypeDescriptor()override
{
return ownedTypeDescriptor;
}
bool Validate(const WString& text)
bool Validate(const WString& text)override
{
T output;
return Deserialize(text, output);
}
bool Parse(const WString& input, Value& output)
bool Parse(const WString& input, Value& output)override
{
T value;
if(Deserialize(input, value))
@@ -10652,7 +10652,7 @@ GeneralValueSerializer
return false;
}
bool Serialize(const T& input, Value& output)
bool Serialize(const T& input, Value& output)override
{
WString text;
if(Serialize(input, text))
@@ -10663,7 +10663,7 @@ GeneralValueSerializer
return false;
}
bool Deserialize(const Value& input, T& output)
bool Deserialize(const Value& input, T& output)override
{
if(input.GetValueType()!=Value::Text)
{
@@ -10688,7 +10688,7 @@ TypedValueSerializer
protected:
T defaultValue;
T GetDefaultValue()
T GetDefaultValue()override
{
return defaultValue;
}
+2 -1
View File
@@ -18260,7 +18260,8 @@ Serialization (TypeImpl)
static void IO(Writer& writer, WfTypeImpl& value)
{
bool hasTypeImpl = &value != nullptr;
auto pvalue = &value; // clang++: -Wtautological-undefined-compare
bool hasTypeImpl = pvalue != nullptr;
writer << hasTypeImpl;
if (hasTypeImpl)
{
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.