Merge branch 'master' into utf8

conf/test.xml

@@ -82,11 +82,11 @@
 
 	</MBSlave1>
 
-	<RSExchange name="RSExchange" speed="38400">
+	<RTUExchange name="RTUExchange" speed="38400">
 		<DeviceList>
 			<item addr="0x02" force_disconnect="1" speed="9600" respondSensor="RespondRTU_S" timeout="5000" invert="0"/>
 		</DeviceList>
-	</RSExchange>
+	</RTUExchange>
 
 	<UDPExchange name="UDPExchange"/>
 	<UDPExchange2 name="UDPExchange2"/>

extensions/RTUExchange/start_fg.sh

 #!/bin/sh
 
 uniset-start.sh -f ./uniset-rtuexchange --confile test.xml \
+	--smemory-id SharedMemory \
 	--rs-dev /dev/cbsideA0 \
-	--rs-name RSExchange \
+	--rs-name RTUExchange \
 	--rs-speed 38400 \
 	--rs-filter-field rs \
-	--rs-filter-value 3 \
+	--rs-filter-value 1 \
 	--dlog-add-levels info,crit,warn \
 	--rs-force 0 \
 	--rs-force-out 0 \

include/MessageType.h

@@ -87,7 +87,7 @@ namespace UniSetTypes
 	    	inline bool operator < ( const VoidMessage& msg ) const
 			{
 				if( priority != msg.priority )
-					return priority < msg.priority; 					
+					return priority < msg.priority;
 	
 				if( tm.tv_sec != msg.tm.tv_sec )
 					return tm.tv_sec >= msg.tm.tv_sec;

include/UniSetTypes.h

@@ -113,6 +113,11 @@ namespace UniSetTypes
 	   UniSetTypes::MessageCode code;	/*!< идентификатор */
 	   std::string text;				/*!< текст */
 	   std::string idname;				/*!< текстовое название идентификатора */
+
+		inline bool operator < ( const MessageInfo& m ) const
+		{
+			return (code < m.code);
+		}
 	};
 
 	/*! Информация об имени объекта */
@@ -126,6 +131,11 @@ namespace UniSetTypes
 	    char* repName;		/*!< текстовое имя для регистрации в репозитории */
 	    char* textName;		/*!< текстовое имя */
 	    void* data;
+	
+		inline bool operator < ( const ObjectInfo& o ) const
+		{
+			return (id < o.id);
+		}
 	};
 	
 	typedef std::list<NodeInfo> ListOfNode;

src/Interfaces/UniversalInterface.cc

@@ -2280,10 +2280,7 @@ ObjectPtr UniversalInterface::CacheOfResolve::resolve( ObjectId id, ObjectId nod
 	// то мы делаем _duplicate....
 	
 	if( !CORBA::is_nil(it->second.ptr) )
-	    return it->second.ptr._retn();
-//	    return it->second.ptr;
-//	    return CORBA::Object::_duplicate(it->second.ptr);
-//		return it->second.ptr.out(); // CORBA::Object::_duplicate(it->second.ptr);
+	    return CORBA::Object::_duplicate(it->second.ptr);
 
 	throw NameNotFound();
 }

src/ObjectRepository/ObjectIndex_XML.cc

@@ -284,12 +284,5 @@ const ObjectInfo* ObjectIndex_XML::getObjectInfo( const ObjectId id )
 		return &omap[id];
 
 	return NULL;
-/*
-	ObjectInfo ret;
-	ret.id = DefaultObjectId;
-	ret.repName = "";
-	ret.textName = "";
-	return ret;
-*/	
 }
 // ------------------------------------------------------------------------------------------

src/ObjectRepository/ObjectIndex_idXML.cc

@@ -228,12 +228,5 @@ const ObjectInfo* ObjectIndex_idXML::getObjectInfo( const ObjectId id )
 		return &(it->second);
 
 	return NULL;
-/*
-	ObjectInfo ret;
-	ret.id = DefaultObjectId;
-	ret.repName = "";
-	ret.textName = "";
-	return ret;
-*/	
 }
 // ------------------------------------------------------------------------------------------