SunnyQjm/ChronoSync
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removing ns3 namespace

Browse Source
This commit is contained in:
Alexander Afanasyev committed 2012-03-02 11:44:13 -08:00
1 parent cf9d65b78c
commit 017784ccdd
20 files changed
+15 -124
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

model/sync-app.h
-5
View File
@@ -23,9 +23,6 @@
#ifndef SYNC_APP_H
#define SYNC_APP_H
namespace ns3
{
namespace Sync
{
@@ -37,6 +34,4 @@ private:
} // Sync
} // ns3
#endif // SYNC_APP_H
model/sync-ccnx-name-info.cc
+3 -6
View File
@@ -29,11 +29,10 @@
using namespace std;
using namespace boost;
namespace ns3 {
namespace Sync {
NameInfoConstPtr
CcnxNameInfo::FindOrCreate (Ptr<const CcnxNameComponents> name)
CcnxNameInfo::FindOrCreate (ns3::Ptr<const ns3::CcnxNameComponents> name)
{
string key = lexical_cast<string> (*name);
@@ -44,11 +43,11 @@ CcnxNameInfo::FindOrCreate (Ptr<const CcnxNameComponents> name)
return item.first->second;
}
CcnxNameInfo::CcnxNameInfo (Ptr<const CcnxNameComponents> name)
CcnxNameInfo::CcnxNameInfo (ns3::Ptr<const ns3::CcnxNameComponents> name)
: m_name (name)
{
m_id = m_ids ++; // set ID for a newly inserted element
m_digest << *name;
// m_digest << *name;
}
string
@@ -71,6 +70,4 @@ CcnxNameInfo::operator == (const NameInfo &info) const
}
} // Sync
} // ns3
model/sync-ccnx-name-info.h
+4 -8
View File
@@ -25,10 +25,7 @@
#include "sync-name-info.h"
#include "ns3/ptr.h"
namespace ns3 {
class CcnxNameComponents;
#include "ns3/ccnx-name-components.h"
namespace Sync {
@@ -40,7 +37,7 @@ public:
* @param name routable prefix
*/
static NameInfoConstPtr
FindOrCreate (Ptr<const CcnxNameComponents> name);
FindOrCreate (ns3::Ptr<const ns3::CcnxNameComponents> name);
virtual ~CcnxNameInfo () { };
@@ -62,12 +59,11 @@ private:
*/
CcnxNameInfo () {}
CcnxNameInfo& operator = (const CcnxNameInfo &info) { return *this; }
CcnxNameInfo (Ptr<const CcnxNameComponents> name);
CcnxNameInfo (ns3::Ptr<const ns3::CcnxNameComponents> name);
Ptr<const CcnxNameComponents> m_name;
ns3::Ptr<const ns3::CcnxNameComponents> m_name;
};
} // Sync
} // ns3
#endif // SYNC_CCNX_NAME_INFO_H
model/sync-diff-leaf.h
-2
View File
@@ -25,7 +25,6 @@
#include "sync-leaf.h"
namespace ns3 {
namespace Sync {
/**
@@ -86,6 +85,5 @@ private:
typedef boost::shared_ptr<DiffLeaf> DiffLeafPtr;
} // Sync
} // ns3
#endif // SYNC_DIFF_LEAF_H
model/sync-diff-state-container.h
-2
View File
@@ -23,7 +23,6 @@
#ifndef SYNC_DIFF_STATE_CONTAINER_H
#define SYNC_DIFF_STATE_CONTAINER_H
namespace ns3 {
namespace Sync {
#include "diff-state.h"
@@ -75,6 +74,5 @@ struct LeafContainer : public mi::multi_index_container<
} // Sync
} // ns3
#endif // SYNC_DIFF_STATE_CONTAINER_H
model/sync-diff-state.cc
-2
View File
@@ -27,7 +27,6 @@
using namespace boost;
namespace ns3 {
namespace Sync {
DiffState::DiffState ()
@@ -80,4 +79,3 @@ DiffState::remove (NameInfoConstPtr info)
} // ns3
} // Sync
model/sync-diff-state.h
-2
View File
@@ -25,7 +25,6 @@
#include "sync-state.h"
namespace ns3 {
namespace Sync {
class DiffState;
@@ -91,6 +90,5 @@ private:
};
} // Sync
} // ns3
#endif // SYNC_DIFF_STATE_H
model/sync-digest.cc
-2
View File
@@ -28,7 +28,6 @@
using namespace boost;
namespace ns3 {
namespace Sync {
Digest::Digest ()
@@ -106,5 +105,4 @@ Digest::operator << (const Digest &src)
} // Sync
} // ns3
model/sync-digest.h
-2
View File
@@ -27,7 +27,6 @@
#include <openssl/evp.h>
#include <boost/cstdint.hpp>
namespace ns3 {
namespace Sync {
const std::size_t HASH_SIZE = 160;
@@ -92,6 +91,5 @@ private:
struct DigestCalculationError : virtual boost::exception { };
} // Sync
} // ns3
#endif // SYNC_DIGEST_H
model/sync-full-state.cc
+4 -6
View File
@@ -31,7 +31,6 @@
using namespace boost;
namespace ll = boost::lambda;
namespace ns3 {
namespace Sync {
@@ -44,17 +43,17 @@ FullState::~FullState ()
{
}
Time
ns3::Time
FullState::getTimeFromLastUpdate () const
{
return Simulator::Now () - m_lastUpdated;
return ns3::Simulator::Now () - m_lastUpdated;
}
// from State
void
FullState::update (NameInfoConstPtr info, const SeqNo &seq)
{
m_lastUpdated = Simulator::Now ();
m_lastUpdated = ns3::Simulator::Now ();
LeafContainer::iterator item = m_leaves.find (*info);
if (item == m_leaves.end ())
@@ -70,11 +69,10 @@ FullState::update (NameInfoConstPtr info, const SeqNo &seq)
void
FullState::remove (NameInfoConstPtr info)
{
m_lastUpdated = Simulator::Now ();
m_lastUpdated = ns3::Simulator::Now ();
m_leaves.erase (*info);
}
} // Sync
} // ns3
model/sync-full-state.h
+2 -4
View File
@@ -26,7 +26,6 @@
#include "ns3/nstime.h"
#include "sync-state.h"
namespace ns3 {
namespace Sync {
/**
@@ -47,7 +46,7 @@ public:
*
* This value can be used to randomize reconciliation waiting time in SyncApp
*/
Time
ns3::Time
getTimeFromLastUpdate () const;
// from State
@@ -58,11 +57,10 @@ public:
remove (NameInfoConstPtr info);
private:
Time m_lastUpdated; ///< @brief Time when state was updated last time
ns3::Time m_lastUpdated; ///< @brief Time when state was updated last time
};
} // Sync
} // ns3
#endif // SYNC_STATE_H
model/sync-leaf.h
-2
View File
@@ -26,7 +26,6 @@
#include "sync-seq-no.h"
#include "sync-name-info.h"
namespace ns3 {
namespace Sync {
/**
@@ -88,6 +87,5 @@ private:
typedef boost::shared_ptr<Leaf> LeafPtr;
} // Sync
} // ns3
#endif // SYNC_LEAF_H
model/sync-name-info.cc
-2
View File
@@ -25,7 +25,6 @@
#include <boost/lexical_cast.hpp>
namespace ns3 {
namespace Sync {
NameInfo::NameMap NameInfo::m_names;
@@ -39,4 +38,3 @@ size_t NameInfo::m_ids = 0;
// NameInfo::getDigest<PrefixInfo> () const;
} // Sync
} // ns3
model/sync-name-info.h
+1 -2
View File
@@ -26,8 +26,8 @@
#include <boost/shared_ptr.hpp>
#include <map>
#include <string>
#include "sync-digest.h"
namespace ns3 {
namespace Sync {
/**
@@ -80,6 +80,5 @@ typedef boost::shared_ptr<const NameInfo> NameInfoConstPtr;
} // Sync
} // ns3
#endif // SYNC_NAME_INFO_H
model/sync-name-manager.cc
-21
View File
@@ -1,21 +0,0 @@
/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2012 University of California, Los Angeles
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation;
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
* 卞超轶 Chaoyi Bian <bcy@pku.edu.cn>
* Alexander Afanasyev <alexander.afanasyev@ucla.edu>
*/
model/sync-name-manager.h
-42
View File
@@ -1,42 +0,0 @@
/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2012 University of California, Los Angeles
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation;
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
* 卞超轶 Chaoyi Bian <bcy@pku.edu.cn>
* Alexander Afanasyev <alexander.afanasyev@ucla.edu>
*/
#ifndef SYNC_NAME_MANAGER_H
#define SYNC_NAME_MANAGER_H
namespace ns3
{
namespace Sync
{
class NameManager
{
public:
private:
};
} // Sync
} // ns3
#endif // SYNC_NAME_MANAGER_H
model/sync-seq-no.h
+1 -7
View File
@@ -25,11 +25,7 @@
#include <boost/cstdint.hpp>
namespace ns3
{
namespace Sync
{
namespace Sync {
/**
* @brief Sequence number abstraction
@@ -102,6 +98,4 @@ public:
} // Sync
} // ns3
#endif // SYNC_SEQ_NO_H
model/sync-state-leaf-container.h
-2
View File
@@ -36,7 +36,6 @@
namespace mi = boost::multi_index;
namespace ns3 {
namespace Sync {
struct NameInfoHash : public std::unary_function<NameInfo, std::size_t>
@@ -69,6 +68,5 @@ struct LeafContainer : public mi::multi_index_container<
};
} // Sync
} // ns3
#endif // SYNC_STATE_LEAF_CONTAINER
model/sync-state-manager.h
-2
View File
@@ -25,7 +25,6 @@
#include "sync-diff-state-container.h"
namespace ns3 {
namespace Sync {
class StateManager
@@ -39,6 +38,5 @@ private:
} // Sync
} // ns3
#endif // SYNC_STATE_MANAGER_H
model/sync-state.h
-3
View File
@@ -25,8 +25,6 @@
#include "sync-state-leaf-container.h"
namespace ns3 {
/**
* \defgroup sync SYNC protocol
*
@@ -65,6 +63,5 @@ protected:
};
} // Sync
} // ns3
#endif // SYNC_STATE_H