1 files changed, 4 insertions, 7 deletions
diff --git a/include/stick20_commands.h b/include/stick20_commands.h
index 75bce1c..b3dbacf 100644
--- a/include/stick20_commands.h
+++ b/include/stick20_commands.h
@@ -147,7 +147,6 @@ namespace nitrokey {
                     CommandTransaction;
             };
 
-#define d(x) ss << " "#x":\t" << (int)x << std::endl;
 
             class GetDeviceStatus : Command<CommandID::GET_DEVICE_STATUS> {
             public:
@@ -167,10 +166,10 @@ namespace nitrokey {
 
                     std::string dissect() const {
                       std::stringstream ss;
-                      d(command_counter);
-                      d(last_command);
-                      d(status);
-                      d(progress_bar_value);
+                      print_to_ss((int)command_counter);
+                      print_to_ss((int)last_command);
+                      print_to_ss((int)status);
+                      print_to_ss((int)progress_bar_value);
                       ss << "_padding:\t"
                          << ::nitrokey::misc::hexdump((const char *) (_padding),
                                                       sizeof _padding);
@@ -182,8 +181,6 @@ namespace nitrokey {
                     CommandTransaction;
             };
 
-#undef d
-
 
 // TODO fix original nomenclature
             class SendSetReadonlyToUncryptedVolume : public PasswordCommand<CommandID::ENABLE_READONLY_UNCRYPTED_LUN> {};