Commit 844ae748 authored by Jan Möbius's avatar Jan Möbius

No warning on missing datatype when adding new type

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@9355 383ad7c9-94d9-4d36-a494-682f7c89f535
parent dd52ae76
...@@ -149,7 +149,9 @@ void initializeTypes() { ...@@ -149,7 +149,9 @@ void initializeTypes() {
/// Adds a datatype and returns the id for the new type /// Adds a datatype and returns the id for the new type
DataType addDataType(QString _name, QString _readableName) { DataType addDataType(QString _name, QString _readableName) {
if ( typeId(_name) != DATA_UNKNOWN ) { // Check if datatype already exists.
// If so, we return the typeId that is used for it
if ( stringToTypeInfo.find( _name ) != stringToTypeInfo.end() ) {
std::cerr << "Redefinition of existing data type!" << std::endl; std::cerr << "Redefinition of existing data type!" << std::endl;
return typeId(_name); return typeId(_name);
} }
...@@ -174,9 +176,7 @@ DataType typeId(QString _name) { ...@@ -174,9 +176,7 @@ DataType typeId(QString _name) {
if ( index != stringToTypeInfo.end() ) if ( index != stringToTypeInfo.end() )
return types[ index->second ].type; return types[ index->second ].type;
else { else {
#ifdef DEBUG std::cerr << "Unknown Data type with name " << _name.toStdString() << std::endl;
std::cerr << "Unknown Data type with name " << _name.toStdString() << std::endl;
#endif
return DATA_UNKNOWN; return DATA_UNKNOWN;
} }
} }
......
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