Merge "Support Debian/Raspbian build"

Juniper · Mar 3, 2016 · aebe2a2 · aebe2a2
2 parents af61e5a + c795f34
commit aebe2a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/lib/SConscript b/lib/SConscript
@@ -16,7 +16,9 @@ subdirs = [
 (distname, version, _) = platform.dist()
 if distname == 'Ubuntu' and LooseVersion(version) >= LooseVersion('14.04'):
     pass
-elif distname == 'centos' and LooseVersion(version) >= LooseVersion('7.0'):
+elif (distname == 'debian' or distname == 'raspbian') and LooseVersion(version) >= LooseVersion('8'):
+    pass
+elif (distname == 'centos' or distname == 'redhat') and LooseVersion(version) >= LooseVersion('7.0'):
     subdirs += [
         'gperftools',
         'log4cplus',

diff --git a/src/bgp/origin-vn/origin_vn.cc b/src/bgp/origin-vn/origin_vn.cc
@@ -95,20 +95,16 @@ OriginVn OriginVn::FromString(const string &str,
 }
 
 as_t OriginVn::as_number() const {
-    uint8_t data[OriginVn::kSize];
-    copy(data_.begin(), data_.end(), &data[0]);
-    if (data[0] == 0x80 && data[1] == 0x71) {
-        as_t as_number = get_value(data + 2, 2);
+    if (data_[0] == 0x80 && data_[1] == 0x71) {
+        as_t as_number = get_value(data_.data() + 2, 2);
         return as_number;
     }
     return 0;
 }
 
 int OriginVn::vn_index() const {
-    uint8_t data[OriginVn::kSize];
-    copy(data_.begin(), data_.end(), &data[0]);
-    if (data[0] == 0x80 && data[1] == 0x71) {
-        int vn_index = get_value(data + 4, 4);
+    if (data_[0] == 0x80 && data_[1] == 0x71) {
+        int vn_index = get_value(data_.data() + 4, 4);
         return vn_index;
     }
     return 0;