11 files changed, 30 insertions, 40 deletions
diff --git a/icnet/utils/icnet_utils_array.cc b/icnet/utils/icnet_utils_array.cc
index 413119cb..a395ddd8 100644
--- a/icnet/utils/icnet_utils_array.cc
+++ b/icnet/utils/icnet_utils_array.cc
@@ -15,8 +15,6 @@
 
 #include "icnet_utils_array.h"
 
-namespace icnet {
-
 namespace utils {
 
 Array::Array(const void *array, size_t size) {
@@ -47,6 +45,4 @@ Array &Array::setSize(std::size_t size) {
   return *this;
 }
 
-}
-
 }
 \ No newline at end of file
diff --git a/icnet/utils/icnet_utils_array.h b/icnet/utils/icnet_utils_array.h
index f13c0b47..c356190e 100644
--- a/icnet/utils/icnet_utils_array.h
+++ b/icnet/utils/icnet_utils_array.h
@@ -17,8 +17,6 @@
 
 #include <cstddef>
 
-namespace icnet {
-
 namespace utils {
 
 class Array {
@@ -41,5 +39,3 @@ class Array {
 };
 
 }
-
-}
diff --git a/icnet/utils/icnet_utils_daemonizator.cc b/icnet/utils/icnet_utils_daemonizator.cc
index 2bb6dd05..061573d1 100644
--- a/icnet/utils/icnet_utils_daemonizator.cc
+++ b/icnet/utils/icnet_utils_daemonizator.cc
@@ -20,8 +20,6 @@
 #include <iostream>
 #include <sys/stat.h>
 
-namespace icnet {
-
 namespace utils {
 
 void Daemonizator::daemonize() {
@@ -70,5 +68,3 @@ void Daemonizator::daemonize() {
 }
 
 }
-
-}
diff --git a/icnet/utils/icnet_utils_daemonizator.h b/icnet/utils/icnet_utils_daemonizator.h
index 20cd80bb..6297c836 100644
--- a/icnet/utils/icnet_utils_daemonizator.h
+++ b/icnet/utils/icnet_utils_daemonizator.h
@@ -15,8 +15,6 @@
 
 #pragma once
 
-namespace icnet {
-
 namespace utils {
 
 class Daemonizator {
@@ -24,6 +22,4 @@ class Daemonizator {
   static void daemonize();
 };
 
-}
-
 }
 \ No newline at end of file
diff --git a/icnet/utils/icnet_utils_hash.cc b/icnet/utils/icnet_utils_hash.cc
index 39dd0229..51a0f639 100644
--- a/icnet/utils/icnet_utils_hash.cc
+++ b/icnet/utils/icnet_utils_hash.cc
@@ -15,8 +15,6 @@
 
 #include "icnet_utils_hash.h"
 
-namespace icnet {
-
 namespace utils {
 
 uint32_t Hash::hash32(const void *data, std::size_t len) {
@@ -59,6 +57,4 @@ uint64_t Hash::cumulativeHash64(const void *data, std::size_t len, uint64_t last
   return hash;
 }
 
-}
-
 }
 \ No newline at end of file
diff --git a/icnet/utils/icnet_utils_hash.h b/icnet/utils/icnet_utils_hash.h
index 9ae01f39..26ae9c6f 100644
--- a/icnet/utils/icnet_utils_hash.h
+++ b/icnet/utils/icnet_utils_hash.h
@@ -18,8 +18,6 @@
 #include <cstdint>
 #include <cstddef>
 
-namespace icnet {
-
 namespace utils {
 
 //const uint32_t FNV1A_PRIME_32 = 0x01000193;
@@ -37,6 +35,4 @@ class Hash {
 
 };
 
-}
-
 }
 \ No newline at end of file
diff --git a/icnet/utils/icnet_utils_sharable_vector.h b/icnet/utils/icnet_utils_sharable_vector.h
new file mode 100644
index 00000000..d78a9a6a
--- /dev/null
+++ b/icnet/utils/icnet_utils_sharable_vector.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <vector>
+#include <memory>
+
+namespace utils {
+
+template<class T>
+class SharableVector : public std::vector<T>, public std::enable_shared_from_this<SharableVector<T>> {
+ public:
+  virtual ~SharableVector() {};
+};
+
+}
diff --git a/icnet/utils/icnet_utils_string_tokenizer.cc b/icnet/utils/icnet_utils_string_tokenizer.cc
index ead1052a..19d76c3e 100644
--- a/icnet/utils/icnet_utils_string_tokenizer.cc
+++ b/icnet/utils/icnet_utils_string_tokenizer.cc
@@ -17,8 +17,6 @@
 #include "icnet_utils_string_tokenizer.h"
 #include "icnet_errors.h"
 
-namespace icnet {
-
 namespace utils {
 
 StringTokenizer::StringTokenizer(const std::string &str)
@@ -48,5 +46,4 @@ std::string StringTokenizer::nextToken() {
   return token;
 }
 
-}
 }
 \ No newline at end of file
diff --git a/icnet/utils/icnet_utils_string_tokenizer.h b/icnet/utils/icnet_utils_string_tokenizer.h
index 7dc6b458..c1111b49 100644
--- a/icnet/utils/icnet_utils_string_tokenizer.h
+++ b/icnet/utils/icnet_utils_string_tokenizer.h
@@ -17,8 +17,6 @@
 
 #include <string>
 
-namespace icnet {
-
 namespace utils {
 
 class StringTokenizer {
@@ -34,5 +32,3 @@ class StringTokenizer {
 };
 
 }
-
-}
diff --git a/icnet/utils/icnet_utils_uri.cc b/icnet/utils/icnet_utils_uri.cc
index 8268bdf9..53d67b29 100644
--- a/icnet/utils/icnet_utils_uri.cc
+++ b/icnet/utils/icnet_utils_uri.cc
@@ -16,8 +16,6 @@
 #include "icnet_utils_uri.h"
 #include "icnet_errors_runtime_exception.h"
 
-namespace icnet {
-
 namespace utils {
 
 Uri::Uri() {
@@ -132,6 +130,4 @@ std::string Uri::getQueryString() {
   return query_string_;
 }
 
-} // end namespace utils
-
-} // end namespace icnet
-\ No newline at end of file
+} // end namespace utils
+\ No newline at end of file
diff --git a/icnet/utils/icnet_utils_uri.h b/icnet/utils/icnet_utils_uri.h
index 38172282..4d422766 100644
--- a/icnet/utils/icnet_utils_uri.h
+++ b/icnet/utils/icnet_utils_uri.h
@@ -18,8 +18,6 @@
 #include <string>
 #include <algorithm>    // find
 
-namespace icnet {
-
 namespace utils {
 
 class Uri {
@@ -46,6 +44,4 @@ class Uri {
   std::string query_string_, path_, protocol_, locator_, port_;
 };  // uri
 
-}
-
 }
 \ No newline at end of file