Skip to content

Fix build error in release mode, refine ipprefix class #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stcheng merged 2 commits into from
Sep 9, 2016
Merged

Fix build error in release mode, refine ipprefix class #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22b9053
Fix getIp() in release mode
qiluo-msft Sep 9, 2016
fd26113
Fix throw
qiluo-msft Sep 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ lib_LTLIBRARIES = libswsscommon.la
if DEBUG
DBGFLAGS = -ggdb -DDEBUG
else
DBGFLAGS = -g
DBGFLAGS = -g -DNDEBUG
endif

libswsscommon_la_SOURCES = \
Expand Down
7 changes: 4 additions & 3 deletions common/ipprefix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define __IPPREFIX__

#include <assert.h>
#include <stdexcept>
#include "ipaddress.h"

namespace swss {
Expand All @@ -18,7 +19,7 @@ class IpPrefix
return m_ip.isV4();
}

inline const IpAddress getIp() const
inline const IpAddress& getIp() const
{
return m_ip;
}
Expand Down Expand Up @@ -50,11 +51,11 @@ class IpPrefix
ipa.ip_addr.ipv6_addr[mid] = 0xFF << left;
memset(ipa.ip_addr.ipv6_addr, 0xFF, mid);
memset(ipa.ip_addr.ipv6_addr + mid + 1, 0, 16 - mid - 1);
return ipa;
return IpAddress(ipa);
}
default:
{
assert(false);
throw std::logic_error("Invalid family");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bin_PROGRAMS = tests
if DEBUG
DBGFLAGS = -ggdb -DDEBUG
else
DBGFLAGS = -g
DBGFLAGS = -g -DNDEBUG
endif

CFLAGS_GTEST = -I $(top_srcdir)/googletest/googletest/include
Expand Down