Read about our upcoming Code of Conduct on this issue

Commit 7ee1db90 authored by Aleksandr Bakhshiev's avatar Aleksandr Bakhshiev
Browse files

Fixed some C++ Builder build bugs.

--HG--
branch : MockCompsTest
parent 65b0327eff85
......@@ -173,6 +173,10 @@
<CppCompile Include="..\..\..\Core\Application\UProject.cpp">
<BuildOrder>94</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\Core\Application\UProjectDeployer.cpp">
<DependentOn>..\..\..\Core\Application\UProjectDeployer.h</DependentOn>
<BuildOrder>127</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\Core\Application\URpcCommand.cpp">
<BuildOrder>95</BuildOrder>
</CppCompile>
......@@ -1011,13 +1015,13 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
</Deployment>
</BorlandProject>
<ProjectFileVersion>12</ProjectFileVersion>
......
......@@ -210,10 +210,10 @@ void UBasePropCreator::CreateProperty(RDK::USerStorageXML* serstorage, RDK::UMoc
CreatorProperty<PropType, TypeInt, MDVector<UnKnow> >::CreatePropertyByType(serstorage,mock_unet);
return;
}
// MVector
if(type.find("MVector",0) == 0)
{
#ifndef __BORLANDC__ // TODO:
// MVector
if(type.find("MVector",0) == 0)
{
CreatorProperty<PropType, TypeInt, MVector<UnKnow,1> >::CreatePropertyByType(serstorage,mock_unet);
return;
}
......@@ -221,9 +221,10 @@ void UBasePropCreator::CreateProperty(RDK::USerStorageXML* serstorage, RDK::UMoc
// MMatrix
if(type.find("MMatrix",0) == 0)
{
CreatorProperty<PropType, TypeInt, MMatrix<UnKnow,1,1> >::CreatePropertyByType(serstorage,mock_unet);
return;
}
CreatorProperty<PropType, TypeInt, MMatrix<UnKnow,1,1> >::CreatePropertyByType(serstorage,mock_unet);
return;
}
#endif
}
template <template<typename, typename, unsigned int> class PropType, unsigned int TypeInt>
......@@ -450,7 +451,8 @@ public:
{
CreatorProperty<PropType, TypeInt, std::vector<simpleVector> >::CreatePropertyByType(serstorage, mock_unet);
return true;
}
}
// MVector<T>
if(type.find("MVector",0) == 0)
{
......
......@@ -22,6 +22,7 @@ See file license.txt for more information
#include "../../Deploy/Include/rdk_error_codes.h"
#include "UComponentFactory.h"
#include "UMockUNet.h"
#include "UBasePropCreator.h"
// --------------------------------------
//
......
......@@ -3,6 +3,8 @@
#include "UMockUNet.h"
#include "UStorage.h"
#include "UBasePropCreator.h"
namespace RDK {
// TODO Logger
......
......@@ -2,7 +2,6 @@
#define UMOCKUNET_H
#include "UNet.h"
#include "UBasePropCreator.h"
extern std::vector<std::string> ForbiddenInputs;
extern std::vector<std::string> ForbiddenOutputs;
......
......@@ -18,6 +18,7 @@ See file license.txt for more information
#include <map>
#include <list>
#include <string>
#include "../Utilities/USupport.h"
//#include <memory.h>
......@@ -257,6 +258,19 @@ std::basic_istream<CharT>& operator >> (std::basic_istream<CharT>& stream, T dat
return stream;
}
*/
template<typename CharT>
std::basic_ostream<CharT>& operator << (std::basic_ostream<CharT>& stream, const UnKnow &data)
{
return stream;
}
template<typename CharT>
std::basic_istream<CharT>& operator >> (std::basic_istream<CharT>& stream, UnKnow &data)
{
return stream;
}
}
#endif
......@@ -170,6 +170,18 @@ USerStorageXML& operator >> (USerStorageXML& storage, UnKnow &data)
return storage;
}
USerStorageXML& operator << (USerStorageXML& storage, const simpleVector &data)
{
storage.SetNodeAttribute("Type",std::string("simpleVector"));
return storage;
}
USerStorageXML& operator >> (USerStorageXML& storage, simpleVector &data)
{
return storage;
}
//
USerStorageXML& operator << (USerStorageXML& storage, const std::vector<bool> &data)
......
......@@ -171,6 +171,9 @@ USerStorageXML& operator >> (USerStorageXML& storage, T* &data)
USerStorageXML& operator << (USerStorageXML& storage, const UnKnow &data);
USerStorageXML& operator >> (USerStorageXML& storage, UnKnow &data);
USerStorageXML& operator << (USerStorageXML& storage, const simpleVector &data);
USerStorageXML& operator >> (USerStorageXML& storage, simpleVector &data);
//
template<typename T1, typename T2>
......
......@@ -89,7 +89,13 @@ class UnKnow
{
private:
public:
UnKnow() {}
UnKnow() {};
UnKnow(const UnKnow & value) {};
UnKnow(int value) {};
bool operator == (const UnKnow &value) const { return true; };
bool operator < (const UnKnow &value) const { return false; };
bool operator ! (void) const { return false; };
UnKnow& operator = (const int &value) { return *this; };
};
// ""
......@@ -98,6 +104,9 @@ class simpleVector
private:
public:
simpleVector() {}
bool operator == (const simpleVector &value) const { return true; };
bool operator < (const simpleVector &value) const { return false; };
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment