Fixed cppcheck style warnings

diff --git a/cds/details/bitop_generic.h b/cds/details/bitop_generic.h
index 38a1dd49e37a0909dca1f75e1c2dea80d1ab1933..a1a594459b60157cc33914e203e1439f339cee35 100644 (file)
--- a/cds/details/bitop_generic.h
+++ b/cds/details/bitop_generic.h
@@ -25,7 +25,7 @@
     SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
     OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.     
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #ifndef CDSLIB_DETAILS_BITOP_GENERIC_H
@@ -81,7 +81,7 @@ namespace cds {
                 r -= 2;
             }
             if (!(x & 0x80000000u)) {
-                x <<= 1;
+                //x <<= 1;
                 r -= 1;
             }
             return r;
@@ -143,7 +143,7 @@ namespace cds {
                 r += 2;
             }
             if (!(x & 1)) {
-                x >>= 1;
+                //x >>= 1;
                 r += 1;
             }
             return r;

diff --git a/test/stress/framework/city.cpp b/test/stress/framework/city.cpp
index 69ba0e6a48ab07ad527d304bd3f06fba3d21adeb..bb4b34063e7cd81d1670dd9bca312f64700e95b0 100644 (file)
--- a/test/stress/framework/city.cpp
+++ b/test/stress/framework/city.cpp
@@ -559,6 +559,7 @@ static void CityHashCrc256Long(const char *s, size_t len,
   }
   if (len > 0) {
     s = s + len - 40;
+    // cppcheck-suppress uselessAssignmentPtrArg
     CHUNK(33);
     e ^= Rotate(a, 43);
     h += Rotate(b, 42);