fix compilation [1h]

cppapi/client/devapi_base.cpp

@@ -3415,10 +3415,9 @@ DeviceInfo const &DeviceProxy::info()
 //		command implemented for this TANGO device
 //
 //-----------------------------------------------------------------------------
-
+//TODO make cmd const &
 CommandInfo DeviceProxy::command_query(string cmd)
 {
-    CommandInfo command_info;
     DevCmdInfo_var cmd_info;
     DevCmdInfo_2_var cmd_info_2;
     DevCmdInfo_6_var cmd_info_6;
@@ -3509,7 +3508,7 @@ CommandInfo DeviceProxy::command_query(string cmd)
         }
     }
 
-    return (command_info);
+    assert(false);//should not reach this line
 }
 
 //-----------------------------------------------------------------------------
@@ -3568,7 +3567,6 @@ CommandInfoList *DeviceProxy::get_command_config(vector<string> &cmd_names)
 
 CommandInfoList *DeviceProxy::command_list_query()
 {
-    CommandInfoList *command_info_list = NULL;
     DevCmdInfoList_var cmd_info_list;
     DevCmdInfoList_2_var cmd_info_list_2;
     DevCmdInfoList_6_var cmd_info_list_6;
@@ -3587,7 +3585,7 @@ CommandInfoList *DeviceProxy::command_list_query()
             {
                 case 1:
                     dev = Device::_duplicate(device);
-                cmd_info_list = dev->command_list_query();
+                    cmd_info_list = dev->command_list_query();
 
                     return newCommandInfoList(cmd_info_list);
                 case 2:
@@ -3605,7 +3603,6 @@ CommandInfoList *DeviceProxy::command_list_query()
 
                     return newCommandInfoList(cmd_info_list_6);
                 }
-            }
             ctr = 2;
         }
         catch (CORBA::TRANSIENT &trans)
@@ -3659,7 +3656,7 @@ CommandInfoList *DeviceProxy::command_list_query()
         }
     }
 
-    return (command_info_list);
+    assert(false);
 }
 
 //-----------------------------------------------------------------------------

cppapi/client/device_command_info.cpp

@@ -26,7 +26,7 @@
 //===================================================================================================================
 
 #include <tango.h>
-#include <tango/client/device/device_command_info.h>
+#include <device_command_info.h>
 
 namespace Tango
 {

cppapi/server/command.h

@@ -385,6 +385,39 @@ class Command
 //@}
 
 
+//TODO unit tests
+/**
+ * Set in_enum_labels from vector ref
+ */
+	void set_in_enum_labels(vector<string> &v)
+	{
+		this->get_ext()->in_enum_labels = v;
+	}
+
+/**
+ * Set in_enum_labels from vector rvalue
+ */
+	void set_in_enum_labels(vector<string> &&v)
+	{
+		this->get_ext()->in_enum_labels = move(v);
+	}
+
+	/**
+ * Set in_enum_labels from vector ref
+ */
+	void set_out_enum_labels(vector<string> &v)
+	{
+		this->get_ext()->out_enum_labels = v;
+	}
+
+/**
+ * Set in_enum_labels from vector rvalue
+ */
+	void set_out_enum_labels(vector<string> &&v)
+	{
+		this->get_ext()->out_enum_labels = move(v);
+	}
+
 /**@name Extract methods.
  * All these methods extract data from the CORBA Any object received as
  * command input data
@@ -1228,25 +1261,32 @@ class Command
     class CommandExt
     {
     public:
-        CommandExt() {}
+		CommandExt()
+			:
+			in_enum_labels(),
+			out_enum_labels()
+		{}
+
+		vector<string> in_enum_labels;
+		vector<string> out_enum_labels;
     };
 
 	void alloc_any(CORBA::Any *&);
 	void throw_bad_type(const char *);
 
-#ifdef HAS_UNIQUE_PTR
-    unique_ptr<CommandExt>          ext;           // Class extension
-#else
-	CommandExt		                *ext;
-#endif
+	shared_ptr<CommandExt> ext; //Class extension
 
 //
 // Ported from the extension class
 //
 
     Tango::DispLevel	cmd_disp_level;		    // Display  level
     long			    poll_period;		    // Polling period
-
+public:
+	shared_ptr<CommandExt> get_ext()
+	{
+		return ext;
+	}
 };
 
 //=============================================================================