gta.h   gta.h 
/* /*
* gta.h * gta.h
* *
* This file is part of libgta, a library that implements the Generic Tagge d * This file is part of libgta, a library that implements the Generic Tagge d
* Array (GTA) file format. * Array (GTA) file format.
* *
* Copyright (C) 2010, 2011 * Copyright (C) 2010, 2011, 2012
* Martin Lambers <marlam@marlam.de> * Martin Lambers <marlam@marlam.de>
* *
* Libgta is free software: you can redistribute it and/or modify it under the * Libgta is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free * terms of the GNU Lesser General Public License as published by the Free
* Software Foundation, either version 2.1 of the License, or (at your opti on) * Software Foundation, either version 2.1 of the License, or (at your opti on)
* any later version. * any later version.
* *
* Libgta is distributed in the hope that it will be useful, but WITHOUT AN Y * Libgta is distributed in the hope that it will be useful, but WITHOUT AN Y
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNES S FOR * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNES S FOR
* A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 gta.hpp   gta.hpp 
/* /*
* gta.hpp * gta.hpp
* *
* This file is part of libgta, a library that implements the Generic Tagge d * This file is part of libgta, a library that implements the Generic Tagge d
* Array (GTA) file format. * Array (GTA) file format.
* *
* Copyright (C) 2010, 2011 * Copyright (C) 2010, 2011, 2012
* Martin Lambers <marlam@marlam.de> * Martin Lambers <marlam@marlam.de>
* *
* Libgta is free software: you can redistribute it and/or modify it under the * Libgta is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free * terms of the GNU Lesser General Public License as published by the Free
* Software Foundation, either version 2.1 of the License, or (at your opti on) * Software Foundation, either version 2.1 of the License, or (at your opti on)
* any later version. * any later version.
* *
* Libgta is distributed in the hope that it will be useful, but WITHOUT AN Y * Libgta is distributed in the hope that it will be useful, but WITHOUT AN Y
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNES S FOR * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNES S FOR
* A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
skipping to change at line 45 skipping to change at line 45
#include <istream> #include <istream>
#include <ostream> #include <ostream>
#include <vector> #include <vector>
#include <limits> #include <limits>
#include <cerrno> #include <cerrno>
#include <cstring> #include <cstring>
#include <cstdio> #include <cstdio>
#include <gta/gta.h> #include <gta/gta.h>
#ifdef _MSC_VER
# pragma warning (push)
# pragma warning (disable: 4996) // strerror and _snprintf
# pragma warning (disable: 4244) // conversion from uintmax_t to unsi
gned int
#endif
/** /**
* \brief The gta namespace. * \brief The gta namespace.
*/ */
namespace gta namespace gta
{ {
/** /**
* \brief GTA result * \brief GTA result
* *
* This is equivalent to \a gta_result_t from the C interface. * This is equivalent to \a gta_result_t from the C interface.
*/ */
skipping to change at line 211 skipping to change at line 217
case unexpected_eof: case unexpected_eof:
w = "unexpected end of input"; w = "unexpected end of input";
break; break;
case invalid_data: case invalid_data:
w = "invalid data"; w = "invalid data";
break; break;
case system_error: case system_error:
w = strerror(_sys_errno); w = strerror(_sys_errno);
break; break;
} }
#if defined _MSC_VER
_snprintf(_what, _whatsize, "%s: %s", s, w);
#else
snprintf(_what, _whatsize, "%s: %s", s, w); snprintf(_what, _whatsize, "%s: %s", s, w);
#endif
} }
/** /**
* \brief Get the original GTA result. * \brief Get the original GTA result.
* \return The original GTA result. * \return The original GTA result.
*/ */
gta::result result() const gta::result result() const
{ {
return _r; return _r;
} }
skipping to change at line 2155 skipping to change at line 2165
inline int version_patch() inline int version_patch()
{ {
int patch; int patch;
gta_version(NULL, NULL, &patch); gta_version(NULL, NULL, &patch);
return patch; return patch;
} }
/*@}*/ /*@}*/
} }
#ifdef _MSC_VER
# pragma warning (pop)
#endif
#endif #endif
 End of changes. 5 change blocks. 
1 lines changed or deleted 16 lines changed or added


 gta_version.h   gta_version.h 
skipping to change at line 27 skipping to change at line 27
* A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details. * details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with Libgta. If not, see <http://www.gnu.org/licenses/>. * along with Libgta. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef GTA_VERSION_H #ifndef GTA_VERSION_H
#define GTA_VERSION_H #define GTA_VERSION_H
#define GTA_VERSION "1.0.1" #define GTA_VERSION "1.0.2"
#define GTA_VERSION_MAJOR 1 #define GTA_VERSION_MAJOR 1
#define GTA_VERSION_MINOR 0 #define GTA_VERSION_MINOR 0
#define GTA_VERSION_PATCH 1 #define GTA_VERSION_PATCH 2
#define GTA_VERSION_NUMBER 0x010001 #define GTA_VERSION_NUMBER 0x010002
#endif #endif
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/