diff --git a/cpp/src/ValueIDIndexesDefines.def b/cpp/src/ValueIDIndexesDefines.def
index 77d774f1..ac69229a 100644
--- a/cpp/src/ValueIDIndexesDefines.def
+++ b/cpp/src/ValueIDIndexesDefines.def
@@ -993,7 +993,7 @@ struct ignore_assign {
     ignore_assign(int value) : _value(value) { }
     operator int() const { return _value; }
 
-    const ignore_assign& operator =(int dummy) { return *this; }
+    const ignore_assign& operator =(int dummy) { (void)dummy; return *this; }
 
     int _value;
 };
diff --git a/cpp/src/ValueIDIndexesDefines.h b/cpp/src/ValueIDIndexesDefines.h
index 7b7e557c..96dfe64f 100644
--- a/cpp/src/ValueIDIndexesDefines.h
+++ b/cpp/src/ValueIDIndexesDefines.h
@@ -2,7 +2,7 @@ struct ignore_assign {
     ignore_assign(int value) : _value(value) { }
     operator int() const { return _value; }
 
-    const ignore_assign& operator =(int dummy) { return *this; }
+    const ignore_assign& operator =(int dummy) { (void)dummy; return *this; }
 
     int _value;
 };
diff --git a/license/Apache-License-2.0.txt b/licenses/Apache-License-2.0.txt
similarity index 100%
rename from license/Apache-License-2.0.txt
rename to licenses/Apache-License-2.0.txt
diff --git a/license/gpl.txt b/licenses/gpl.txt
similarity index 100%
rename from license/gpl.txt
rename to licenses/gpl.txt
diff --git a/license/lgpl.txt b/licenses/lgpl.txt
similarity index 100%
rename from license/lgpl.txt
rename to licenses/lgpl.txt
diff --git a/license/license.txt b/licenses/license.txt
similarity index 100%
rename from license/license.txt
rename to licenses/license.txt