Мелкие правки форматирования

extensions/IOControl/IOControl.h

@@ -207,8 +207,6 @@ class IOControl:
         /*! глобальная функция для вывода help-а */
         static void help_print( int argc, const char* const* argv );
 
-//        inline std::string getName(){ return myname; }
-
         /*! Информация о входе/выходе */
         struct IOInfo:
             public IOBase
@@ -306,7 +304,6 @@ class IOControl:
 
         bool checkCards( const std::string& func="" );
 
-//        std::string myname;
         xmlNode* cnode; /*!< xml-узел в настроечном файле */
 
         int polltime;   /*!< переодичность обновления данных (опроса карт в/в), [мсек] */

extensions/tests/SMemoryTest/smemory-test.cc

@@ -37,7 +37,7 @@ int main(int argc, const char **argv)
 
         act.addObject(static_cast<class UniSetObject*>(shm));
 
-        int num = conf->getArgPInt("--numproc",20);
+        int num = conf->getArgPInt("--numproc",1);
 
 		for( int i=1; i<=num; i++ )
 		{

include/IOController.h

@@ -64,21 +64,21 @@ class IOController:
                                         UniSetTypes::ObjectId sup_id = UniSetTypes::DefaultObjectId );
 
 
-        virtual IOController_i::SensorInfoSeq* getSensorSeq(const UniSetTypes::IDSeq& lst);
-        virtual UniSetTypes::IDSeq* setOutputSeq(const IOController_i::OutSeq& lst, UniSetTypes::ObjectId sup_id);
+        virtual IOController_i::SensorInfoSeq* getSensorSeq( const UniSetTypes::IDSeq& lst );
+        virtual UniSetTypes::IDSeq* setOutputSeq( const IOController_i::OutSeq& lst, UniSetTypes::ObjectId sup_id );
 
 //     ----------------------------------------------------------------
-        virtual UniversalIO::IOType getIOType(const IOController_i::SensorInfo& si);
+        virtual UniversalIO::IOType getIOType( const IOController_i::SensorInfo& si );
 
         virtual IOController_i::SensorInfoSeq* getSensorsMap();
-        virtual IOController_i::SensorIOInfo getSensorIOInfo(const IOController_i::SensorInfo& si);
+        virtual IOController_i::SensorIOInfo getSensorIOInfo( const IOController_i::SensorInfo& si );
 
         virtual CORBA::Long getRawValue(const IOController_i::SensorInfo& si);
         virtual void calibrate(const IOController_i::SensorInfo& si,
                                     const IOController_i::CalibrateInfo& ci,
                                     UniSetTypes::ObjectId adminId );
 
-        IOController_i::CalibrateInfo getCalibrateInfo(const IOController_i::SensorInfo& si);
+        IOController_i::CalibrateInfo getCalibrateInfo( const IOController_i::SensorInfo& si );
 
         inline IOController_i::SensorInfo SensorInfo(UniSetTypes::ObjectId id,
                                 UniSetTypes::ObjectId node=UniSetTypes::conf->getLocalNode())
@@ -89,10 +89,9 @@ class IOController:
             return si;
         };
 
-        UniSetTypes::Message::Priority getPriority(const IOController_i::SensorInfo& si,
-                                                    UniversalIO::IOType type);
+        UniSetTypes::Message::Priority getPriority( const IOController_i::SensorInfo& si, UniversalIO::IOType type );
 
-        virtual IOController_i::ShortIOInfo getChangedTime(const IOController_i::SensorInfo& si);
+        virtual IOController_i::ShortIOInfo getChangedTime( const IOController_i::SensorInfo& si );
 
         virtual IOController_i::ShortMapSeq* getSensors();
 
@@ -123,7 +122,6 @@ class IOController:
         ChangeUndefinedStateSignal signal_change_undefined_state();
         // -----------------------------------------------------------------------------------------
 
-
         struct USensorInfo:
             public IOController_i::SensorIOInfo
         {

src/Interfaces/UInterface.cc

@@ -30,7 +30,6 @@
 #include <iomanip>
 #include "ORepHelpers.h"
 #include "UInterface.h"
-//#include "Debug.h"
 #include "Configuration.h"
 #include "PassiveTimer.h"