From 757d8c36e91b7ca73e034e8a4d4a0827ef0d5416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Fri, 14 Jan 2011 16:02:19 +0100 Subject: [PATCH] Dynare++: fixed warnings about printf format strings --- dynare++/extern/matlab/dynare_simul.cpp | 8 +++----- dynare++/integ/src/quadrature-points.cpp | 4 ++-- dynare++/sylv/cc/Vector.cpp | 7 ++----- dynare++/tl/cc/symmetry.cweb | 5 ++--- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dynare++/extern/matlab/dynare_simul.cpp b/dynare++/extern/matlab/dynare_simul.cpp index 82e1c4cf4..b7c68b986 100644 --- a/dynare++/extern/matlab/dynare_simul.cpp +++ b/dynare++/extern/matlab/dynare_simul.cpp @@ -1,6 +1,4 @@ -// $Id: dynare_simul.cpp 1488 2007-12-19 14:16:30Z kamenik $ - -// Copyright 2005, Ondra Kamenik +// Copyright (C) 2005-2011, Ondra Kamenik // This is the mexFunction providing interface to // DecisionRule<>::simulate(). It takes the following input @@ -87,13 +85,13 @@ extern "C" { if (ft.ncols() != gk_dim[1]) { char buf[1000]; sprintf(buf, "Wrong number of columns for folded tensor: got %d but I want %d\n", - gk_dim[1], ft.ncols()); + (int) gk_dim[1], ft.ncols()); DYN_MEX_FUNC_ERR_MSG_TXT(buf); } if (ft.nrows() != gk_dim[0]) { char buf[1000]; sprintf(buf, "Wrong number of rows for folded tensor: got %d but I want %d\n", - gk_dim[0], ft.nrows()); + (int) gk_dim[0], ft.nrows()); DYN_MEX_FUNC_ERR_MSG_TXT(buf); } ft.zeros(); diff --git a/dynare++/integ/src/quadrature-points.cpp b/dynare++/integ/src/quadrature-points.cpp index 005d67440..18130c9ad 100644 --- a/dynare++/integ/src/quadrature-points.cpp +++ b/dynare++/integ/src/quadrature-points.cpp @@ -1,4 +1,4 @@ - +// Copyright (C) 2008-2011, Ondra Kamenik #include "parser/cc/matrix_parser.h" #include "utils/cc/memory_file.h" @@ -141,7 +141,7 @@ int main(int argc, char** argv) delete *it; points.erase(new_end, points.end()); - printf("Duplicit nodes removed: %d\n", sq.numEvals(level)-points.size()); + printf("Duplicit nodes removed: %zd\n", sq.numEvals(level)-points.size()); // calculate weights and mass double mass = 0.0; diff --git a/dynare++/sylv/cc/Vector.cpp b/dynare++/sylv/cc/Vector.cpp index e21663d70..caba781db 100644 --- a/dynare++/sylv/cc/Vector.cpp +++ b/dynare++/sylv/cc/Vector.cpp @@ -1,7 +1,4 @@ -/* $Header: /var/lib/cvs/dynare_cpp/sylv/cc/Vector.cpp,v 1.1.1.1 2004/06/04 13:01:13 kamenik Exp $ */ - -/* Tag $Name: $ */ - +// Copyright (C) 2004-2011, Ondra Kamenik #include "Vector.h" #include "GeneralMatrix.h" @@ -44,7 +41,7 @@ const Vector& Vector::operator=(const Vector& v) (data <= v.data && v.data < data+len*s || v.data <= data && data < v.data+v.len*v.s) && (data-v.data) % s == 0) { - printf("this destroy=%d, v destroy=%d, data-v.data=%d, len=%d\n", destroy, v.destroy, data-v.data, len); + printf("this destroy=%d, v destroy=%d, data-v.data=%zd, len=%d\n", destroy, v.destroy, data-v.data, len); throw SYLV_MES_EXCEPTION("Attempt to assign overlapping vectors."); } copy(v.base(), v.skip()); diff --git a/dynare++/tl/cc/symmetry.cweb b/dynare++/tl/cc/symmetry.cweb index 28da46ff5..63a86a9df 100644 --- a/dynare++/tl/cc/symmetry.cweb +++ b/dynare++/tl/cc/symmetry.cweb @@ -1,5 +1,4 @@ -@q $Id: symmetry.cweb 148 2005-04-19 15:12:26Z kamenik $ @> -@q Copyright 2004, Ondra Kamenik @> +@q Copyright (C) 2004-2011, Ondra Kamenik @> @ Start of {\tt symmetry.cpp} file. @@ -146,7 +145,7 @@ InducedSymmetries::InducedSymmetries(const Equivalence& e, const Permutation& p, @<|InducedSymmetries::print| code@>= void InducedSymmetries::print() const { - printf("Induced symmetries: %d\n",size()); + printf("Induced symmetries: %zd\n",size()); for (unsigned int i = 0; i < size(); i++) operator[](i).print(); }