Browse Source

Fixed the warnings in the test C++ for C# only.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/1164/head
Dimitar Dobrev 7 years ago
parent
commit
01b4fa4c2e
  1. 2
      tests/CSharp/AnotherUnit.h
  2. 3
      tests/CSharp/CSharp.cpp
  3. 21
      tests/CSharp/CSharpTemplates.h
  4. 4
      tests/NamespacesBase/NamespacesBase.h
  5. 1
      tests/NamespacesDerived/NamespacesDerived.h

2
tests/CSharp/AnotherUnit.h

@ -36,7 +36,7 @@ struct DLL_API ForwardDeclaredStruct; @@ -36,7 +36,7 @@ struct DLL_API ForwardDeclaredStruct;
struct DLL_API DuplicateDeclaredStruct;
template <typename T>
class TemplateInAnotherUnit
class DLL_API TemplateInAnotherUnit
{
T field;
};

3
tests/CSharp/CSharp.cpp

@ -1425,8 +1425,7 @@ int funcWithTypedefedFuncPtrAsParam(typedefedFuncPtr* func) @@ -1425,8 +1425,7 @@ int funcWithTypedefedFuncPtrAsParam(typedefedFuncPtr* func)
typedefedFuncPtr* TestDuplicateDelegate::testDuplicateDelegate(int a)
{
typedefedFuncPtr* func;
return func;
return 0;
}
void InlineNamespace::FunctionInsideInlineNamespace()

21
tests/CSharp/CSharpTemplates.h

@ -270,7 +270,7 @@ private: @@ -270,7 +270,7 @@ private:
};
template <typename T, typename D = IndependentFields<T>>
class HasDefaultTemplateArgument
class DLL_API HasDefaultTemplateArgument
{
public:
HasDefaultTemplateArgument();
@ -288,7 +288,7 @@ private: @@ -288,7 +288,7 @@ private:
};
template <>
class HasDefaultTemplateArgument<bool, bool>
class DLL_API HasDefaultTemplateArgument<bool, bool>
{
public:
HasDefaultTemplateArgument();
@ -421,6 +421,12 @@ T& TemplateWithIndexer<T>::operator[](int i) @@ -421,6 +421,12 @@ T& TemplateWithIndexer<T>::operator[](int i)
return t[0];
}
template <typename T>
T& TemplateWithIndexer<T>::operator[](const T& key)
{
return t[0];
}
template <typename T>
T& TemplateWithIndexer<T>::operator[](const char* string)
{
@ -491,15 +497,16 @@ private: @@ -491,15 +497,16 @@ private:
HasDefaultTemplateArgument<bool, bool> explicitSpecialization;
};
class DLL_API SpecializedInterfaceForMap : InternalWithExtension<char>
class DLL_API SpecializedInterfaceForMap : public InternalWithExtension<char>
{
public:
SpecializedInterfaceForMap();
~SpecializedInterfaceForMap();
};
class DLL_API HasSpecializationForSecondaryBase : T1, DependentValueFields<int>, IndependentFields<int>,
InternalWithExtension<float>, DependentPointerFields<DependentValueFields<int>>
class DLL_API HasSpecializationForSecondaryBase : public DependentValueFields<int>,
public IndependentFields<int>,
public InternalWithExtension<float>
{
public:
HasSpecializationForSecondaryBase();
@ -583,7 +590,7 @@ struct MapResultType<InputSequence<T>, MapFunctor> @@ -583,7 +590,7 @@ struct MapResultType<InputSequence<T>, MapFunctor>
typedef InputSequence<typename LazyResultType<MapFunctor>::Type> ResultType;
};
class RegularDynamic
class DLL_API RegularDynamic
{
public:
RegularDynamic();
@ -592,7 +599,7 @@ public: @@ -592,7 +599,7 @@ public:
};
template<typename T>
class TemplateDerivedFromRegularDynamic : public RegularDynamic
class DLL_API TemplateDerivedFromRegularDynamic : public RegularDynamic
{
public:
TemplateDerivedFromRegularDynamic();

4
tests/NamespacesBase/NamespacesBase.h

@ -11,7 +11,7 @@ namespace OverlappingNamespace @@ -11,7 +11,7 @@ namespace OverlappingNamespace
green,
};
class InBaseLib
class DLL_API InBaseLib
{
public:
InBaseLib()
@ -60,7 +60,7 @@ class TemplateClass @@ -60,7 +60,7 @@ class TemplateClass
};
template <typename T>
class TemplateWithIndependentFields
class DLL_API TemplateWithIndependentFields
{
public:
void useDependentPointer(const T* t);

1
tests/NamespacesDerived/NamespacesDerived.h

@ -5,7 +5,6 @@ @@ -5,7 +5,6 @@
// Test whether qualified names turn out right.
namespace OverlappingNamespace
{
class InDerivedLib
{
public:

Loading…
Cancel
Save