OLD | NEW |
1 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ | 1 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ |
2 /* | 2 /* |
3 * Copyright (c) 2005,2006 INRIA | 3 * Copyright (c) 2005,2006 INRIA |
4 * | 4 * |
5 * This program is free software; you can redistribute it and/or modify | 5 * This program is free software; you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 2 as | 6 * it under the terms of the GNU General Public License version 2 as |
7 * published by the Free Software Foundation; | 7 * published by the Free Software Foundation; |
8 * | 8 * |
9 * This program is distributed in the hope that it will be useful, | 9 * This program is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 oss << PeekPointer (m_value.GetImpl ()); | 65 oss << PeekPointer (m_value.GetImpl ()); |
66 return oss.str (); | 66 return oss.str (); |
67 } | 67 } |
68 bool | 68 bool |
69 CallbackValue::DeserializeFromString (std::string value, Ptr<const AttributeChec
ker> checker) | 69 CallbackValue::DeserializeFromString (std::string value, Ptr<const AttributeChec
ker> checker) |
70 { | 70 { |
71 NS_LOG_FUNCTION (this << value << checker); | 71 NS_LOG_FUNCTION (this << value << checker); |
72 return false; | 72 return false; |
73 } | 73 } |
74 | 74 |
75 ATTRIBUTE_CHECKER_IMPLEMENT (Callback); | 75 ATTRIBUTE_CHECKER_IMPLEMENT_LIB (Callback, NS3_EXPORT); |
76 | 76 |
77 } // namespace ns3 | 77 } // namespace ns3 |
78 | 78 |
79 #if (__GNUC__ >= 3) | 79 #if (__GNUC__ >= 3) |
80 | 80 |
81 #include <cstdlib> | 81 #include <cstdlib> |
82 #include <cxxabi.h> | 82 #include <cxxabi.h> |
83 #include "log.h" | 83 #include "log.h" |
84 | 84 |
85 namespace ns3 { | 85 namespace ns3 { |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 std::free (demangled); | 119 std::free (demangled); |
120 } | 120 } |
121 return ret; | 121 return ret; |
122 } | 122 } |
123 | 123 |
124 } // namespace ns3 | 124 } // namespace ns3 |
125 | 125 |
126 #else | 126 #else |
127 | 127 |
128 std::string | 128 std::string |
129 ns3::CallbackBase::Demangle (const std::string& mangled) | 129 ns3::CallbackImplBase::Demangle (const std::string& mangled) |
130 { | 130 { |
131 NS_LOG_FUNCTION (this << mangled); | 131 NS_LOG_FUNCTION (mangled); |
132 return mangled; | 132 return mangled; |
133 } | 133 } |
134 | 134 |
135 #endif | 135 #endif |
136 | 136 |
OLD | NEW |