Switch to unified view

a/src/Common/APNamingInfo.cc b/src/Common/APNamingInfo.cc
...
...
13
// along with this program.  If not, see http://www.gnu.org/licenses/.
13
// along with this program.  If not, see http://www.gnu.org/licenses/.
14
// 
14
// 
15
15
16
#include "APNamingInfo.h"
16
#include "APNamingInfo.h"
17
17
18
APNamingInfo::APNamingInfo() : apinstance(""), aename(""), aeinstance("") {
18
APNamingInfo::APNamingInfo() :
19
    apn(APN()), apinstance(""),
20
    aename(""), aeinstance("")
21
{
19
}
22
}
20
23
21
APNamingInfo::APNamingInfo(APN napn) : apinstance(""), aename(""), aeinstance("") {
24
APNamingInfo::APNamingInfo(APN napn) : apinstance(""), aename(""), aeinstance("")
25
{
22
    this->apn = napn;
26
    this->apn = napn;
23
}
27
}
24
28
25
APNamingInfo::APNamingInfo(APN napn, std::string napinstance,
29
APNamingInfo::APNamingInfo(APN napn, std::string napinstance,
26
        std::string naename, std::string naeinstance) {
30
        std::string naename, std::string naeinstance) :
27
    this->apn = napn;
31
        apn(napn), apinstance(napinstance),
28
    this->apinstance = napinstance;
32
        aename(naename), aeinstance(naeinstance)
29
    this->aename = naename;
33
{
30
    this->aeinstance = naeinstance;
31
}
34
}
32
35
33
34
APNamingInfo::~APNamingInfo() {
36
APNamingInfo::~APNamingInfo()
37
{
38
    this->apn = APN();
35
    this->apinstance = "";
39
    this->apinstance = "";
36
    this->aename = "";
40
    this->aename = "";
37
    this->aeinstance = "";
41
    this->aeinstance = "";
38
}
42
}
39
43
40
std::string APNamingInfo::info() const{
44
std::string APNamingInfo::info() const
45
{
41
    std::stringstream os;
46
    std::ostringstream os;
42
    os << "AP: "<< apn;
47
    os << "AP: "<< apn;
43
    if (!apinstance.empty())
48
    if (!apinstance.empty())
44
        os << " (" << apinstance << ")";
49
        os << " (" << apinstance << ")";
45
    if (!aename.empty())
50
    if (!aename.empty())
46
        os << " AE: " << aename;
51
        os << " AE: " << aename;
...
...
49
    //os << endl;
54
    //os << endl;
50
    return os.str();
55
    return os.str();
51
}
56
}
52
57
53
//Free function
58
//Free function
54
std::ostream& operator<< (std::ostream& os, const APNamingInfo& apni) {
59
std::ostream& operator<< (std::ostream& os, const APNamingInfo& apni)
60
{
55
    return os << apni.info();
61
    return os << apni.info();
56
}
62
}
57
63