Fix compile warnings (#1228)

with the -pedantic flag. Signed-off-by: Peter Tisovčík <mienkofax@gmail.com> * fix ignoring pragma warning Signed-off-by: Peter Tisovčík <mienkofax@gmail.com> * fix unused parameter _value Signed-off-by: Peter Tisovčík <mienkofax@gmail.com>
OpenZWave · May 24, 2017 · e49ac4d · e49ac4d
1 parent b761382
commit e49ac4d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/cpp/src/aes/aes.h b/cpp/src/aes/aes.h
@@ -72,7 +72,9 @@ typedef union
     uint8_t b[4];
 } aes_inf;
 
+#ifdef _MSC_VER
 #pragma warning( disable : 4324 )
+#endif
 
 #ifdef _WIN64
 __declspec(align(16))
@@ -90,7 +92,9 @@ typedef struct
     aes_inf inf;
 } aes_decrypt_ctx;
 
+#ifdef _MSC_VER
 #pragma warning( default : 4324 )
+#endif
 
 /* This routine must be called before first use if non-static       */
 /* tables are being used                                            */

diff --git a/cpp/src/value_classes/Value.h b/cpp/src/value_classes/Value.h
@@ -81,7 +81,7 @@ namespace OpenZWave
 		bool GetChangeVerified() { return m_verifyChanges; }
 
 		virtual string const GetAsString() const { return ""; }
-		virtual bool SetFromString( string const& _value ) { return false; }
+		virtual bool SetFromString( string const& ) { return false; }
 
 		bool Set();							// For the user to change a value in a device
 

diff --git a/cpp/src/value_classes/ValueList.cpp b/cpp/src/value_classes/ValueList.cpp
@@ -292,10 +292,10 @@ void ValueList::OnValueRefreshed
 // <ValueList::GetItemIdxByLabel>
 // Get the index of an item from its label
 //-----------------------------------------------------------------------------
-int32 const ValueList::GetItemIdxByLabel
+int32 ValueList::GetItemIdxByLabel
 (
 	string const& _label
-)
+) const
 {
 	for( int32 i=0; i<(int32)m_items.size(); ++i )
 	{
@@ -312,10 +312,10 @@ int32 const ValueList::GetItemIdxByLabel
 // <ValueList::GetItemIdxByValue>
 // Get the index of an item from its value
 //-----------------------------------------------------------------------------
-int32 const ValueList::GetItemIdxByValue
+int32 ValueList::GetItemIdxByValue
 (
 	int32 const _value
-)
+) const
 {
 	for( int32 i=0; i<(int32)m_items.size(); ++i )
 	{

diff --git a/cpp/src/value_classes/ValueList.h b/cpp/src/value_classes/ValueList.h
@@ -70,13 +70,13 @@ namespace OpenZWave
 
 		Item const* GetItem() const;
 
-		int32 const GetItemIdxByLabel( string const& _label );
-		int32 const GetItemIdxByValue( int32 const _value );
+		int32 GetItemIdxByLabel( string const& _label ) const;
+		int32 GetItemIdxByValue( int32 const _value ) const;
 
 		bool GetItemLabels( vector<string>* o_items );
 		bool GetItemValues( vector<int32>* o_values );
 
-		uint8 const GetSize()const{ return m_size; }
+		uint8 GetSize()const{ return m_size; }
 
 	private:
 		vector<Item>	m_items;