Satisfy OS X's compiler

equalitie · Sep 2, 2015 · 5d8cbfe · 5d8cbfe
1 parent 25a0e19
commit 5d8cbfe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/session.cc b/src/session.cc
@@ -1300,7 +1300,7 @@ np1secSession::StateAndAction np1secSession::receive(np1secMessage encrypted_mes
         }
       }
       //if it is user message, display content
-      else if ((received_message.message_sub_type == np1secMessage::USER_MESSAGE)) {
+      else if (received_message.message_sub_type == np1secMessage::USER_MESSAGE) {
         us->ops->display_message(room_name, participants[peers[received_message.sender_index]].id.nickname, received_message.user_message, us->ops->bare_sender_data);
 
         start_acking_timer(); //if we don't send any message for a while we'll

diff --git a/test/crypt_test.cc b/test/crypt_test.cc
@@ -23,7 +23,7 @@
 #include "src/crypt.h"
 
 using namespace np1sec;
-
+/*
 const unsigned char SESSION_KEY[] = {
   0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe, 0x2b, 0x73, 0xae, 0xf0,
   0x85, 0x7d, 0x77, 0x81, 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7,
@@ -34,6 +34,7 @@ const unsigned char SESSION_IV[] = {
   0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
   0x0c, 0x0d, 0x0e, 0x0f
 };
+*/
 
 class CryptTest : public ::testing::Test { };