Commit dc5528bf authored by mloskot's avatar mloskot

Applied fixes and cleaning required by Visual C++ 8.0. Moved definition of...

Applied fixes and cleaning required by Visual C++ 8.0. Moved definition of soci_error ctor to error.cpp.
parent 69d3ee42
......@@ -5,7 +5,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
//
#define soci_EMPTY_SOURCE
#define SOCI_EMPTY_SOURCE
#include "soci.h"
#include "soci-empty.h"
......
......@@ -4,7 +4,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#define SOCI_SOURCE
#include "blob.h"
#include "session.h"
......
//
// Copyright (C) 2004-2007 Maciej Sobczak, Stephen Hutton
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#define SOCI_SOURCE
#include "soci-backend.h"
#include <stdexcept>
#include <string>
namespace soci
{
soci_error::soci_error(std::string const & msg)
: std::runtime_error(msg)
{
}
} // namespace soci
......@@ -4,7 +4,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#define SOCI_SOURCE
#include "into-type.h"
#include "statement.h"
......
......@@ -4,7 +4,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#define SOCI_SOURCE
#include "once-temp-type.h"
#include "ref-counted-statement.h"
......
......@@ -4,7 +4,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#define SOCI_SOURCE
#include "prepare-temp-type.h"
#include "ref-counted-prepare-info.h"
......
......@@ -4,7 +4,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#define SOCI_SOURCE
#include "procedure.h"
#include "statement.h"
#include "prepare-temp-type.h"
......
......@@ -15,7 +15,7 @@ namespace soci
namespace details
{
class procedure_impl : public statement_impl
class SOCI_DECL procedure_impl : public statement_impl
{
public:
procedure_impl(session &s) : statement_impl(s), refCount_(1) {}
......
......@@ -4,7 +4,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#define SOCI_SOURCE
#include "ref-counted-prepare-info.h"
using namespace soci;
......
......@@ -4,7 +4,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#define SOCI_SOURCE
#include "ref-counted-statement.h"
#include "statement.h"
......
......@@ -4,7 +4,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#define SOCI_SOURCE
#include "row.h"
#include "statement.h"
......
......@@ -4,7 +4,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#define SOCI_SOURCE
#include "rowid.h"
#include "session.h"
......
......@@ -4,10 +4,14 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#define SOCI_SOURCE
#include "session.h"
#include "soci-backend.h"
#ifdef _MSC_VER
#pragma warning(disable:C4355)
#endif
using namespace soci;
using namespace soci::details;
......
......@@ -25,15 +25,12 @@ enum eDataType { eString, eChar, eDate, eDouble, eInteger,
// the enum type for indicator variables
enum eIndicator { eOK, eNoData, eNull, eTruncated };
class SOCI_DECL soci_error : public std::runtime_error
{
public:
soci_error(std::string const & msg)
: std::runtime_error(msg) {}
soci_error(std::string const & msg);
};
namespace details
{
......
......@@ -4,7 +4,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#define SOCI_SOURCE
#include "statement.h"
#include "into-type.h"
#include "session.h"
......
......@@ -19,7 +19,7 @@
namespace soci
{
class session;
struct values;
class values;
namespace details
{
......
......@@ -2269,6 +2269,7 @@ void test23()
}
catch(soci_error const& e)
{
e;
caught = true;
}
assert(caught);
......@@ -2310,6 +2311,7 @@ void test24()
}
catch(soci_error const& e)
{
e;
caught = true;
}
assert(caught);
......
......@@ -4,7 +4,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#define SOCI_SOURCE
#include "use-type.h"
#include "statement.h"
......
......@@ -4,7 +4,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#define SOCI_SOURCE
#include "values.h"
#include "row.h"
#include "soci-backend.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment