Making Sync's destructor virtual (to prevent creation of Sync object)
This commit is contained in:
1 parent
150f14d0ea
commit
58c77b0c36
7 files changed
+22
-15
No files matched your search
+1
-1
@@ -568,7 +568,7 @@ WARN_LOGFILE =
|
||||
# directories like "/usr/src/myproject". Separate the files or directories
|
||||
# with spaces.
|
||||
|
||||
INPUT = model helper
|
||||
INPUT = doc model helper
|
||||
|
||||
# This tag can be used to specify the character encoding of the source files
|
||||
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
namespace boost { template<class T> class shared_ptr { T *dummy; }; }
|
||||
// typedef
|
||||
// namespace boost {
|
||||
// template<class T>
|
||||
// class shared_ptr
|
||||
// {
|
||||
// typedef T* type;
|
||||
// };
|
||||
// }
|
||||
+4
-11
@@ -95,21 +95,14 @@ public:
|
||||
inline Digest &
|
||||
operator << (const std::string &str);
|
||||
|
||||
/**
|
||||
* @brief Add uint32_t value to digest calculation
|
||||
* @param value uint32_t value to put into digest
|
||||
*/
|
||||
inline Digest &
|
||||
operator << (uint32_t value);
|
||||
|
||||
// /**
|
||||
// * @brief Add integer to digest calculation
|
||||
// * @param value the value to add to the digest
|
||||
// */
|
||||
// template<class INT>
|
||||
// inline Digest &
|
||||
// operator << (INT value);
|
||||
|
||||
private:
|
||||
/**
|
||||
* @brief Disabled copy operator
|
||||
*/
|
||||
Digest &
|
||||
operator = (Digest &digest) { return *this; }
|
||||
|
||||
|
||||
@@ -91,7 +91,7 @@ FullState::update (NameInfoConstPtr info, const SeqNo &seq)
|
||||
LeafContainer::iterator item = m_leaves.find (*info);
|
||||
if (item == m_leaves.end ())
|
||||
{
|
||||
m_leaves.insert (make_shared<Leaf> (info, cref (seq)));
|
||||
m_leaves.insert (make_shared<FullLeaf> (info, cref (seq)));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -30,6 +30,10 @@ Leaf::Leaf (NameInfoConstPtr info, const SeqNo &seq)
|
||||
{
|
||||
}
|
||||
|
||||
Leaf::~Leaf ()
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
Leaf::setSeq (const SeqNo &seq)
|
||||
{
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ public:
|
||||
* @param seq Initial sequence number of the pointer
|
||||
*/
|
||||
Leaf (NameInfoConstPtr info, const SeqNo &seq);
|
||||
virtual ~Leaf () { }
|
||||
virtual ~Leaf () = 0;
|
||||
|
||||
/**
|
||||
* @brief Get name of the leaf
|
||||
|
||||
@@ -13,6 +13,7 @@ def configure(conf):
|
||||
conf.load("compiler_cxx")
|
||||
conf.check_cfg(atleast_pkgconfig_version='0.20')
|
||||
conf.check_cfg(package='openssl', args=['--cflags', '--libs'], uselib_store='SSL')
|
||||
conf.check_cfg(package='libxml-2.0', args=['--cflags', '--libs'], uselib_store='XML')
|
||||
conf.define ('STANDALONE', 1)
|
||||
# conf.define ('DIGEST_BASE64', 1) # base64 is not working and probably will not work at all
|
||||
|
||||
@@ -26,7 +27,7 @@ def build (bld):
|
||||
features=['cxx', 'cxxshlib'],
|
||||
source = bld.path.ant_glob(['model/sync-*.cc',
|
||||
'helper/sync-*.cc']),
|
||||
uselib = 'BOOST BOOST_IOSTREAMS SSL'
|
||||
uselib = 'BOOST BOOST_IOSTREAMS SSL XML'
|
||||
)
|
||||
|
||||
# Unit tests
|
||||
|
||||
Reference in new issue
Block a user