Fixed merge issues.

[stg.git] / include / stg / user_traff.h

diff --git a/include/stg/user_traff.h b/include/stg/user_traff.h
index 41c6c23fe63814c37c1da51a9a49a43ddbd1ccde..1b9e2035ce9e8466457bf4c2857ff61cf1451367 100644 (file)
--- a/include/stg/user_traff.h
+++ b/include/stg/user_traff.h
@@ -27,12 +27,13 @@
 #ifndef USER_TRAFF_H
 #define USER_TRAFF_H
 
-#include <iostream>
-#include <vector>
-
+#include "resetable.h"
 #include "const.h"
 #include "os_int.h"
 
+#include <iostream>
+#include <vector>
+
 enum TRAFF_DIRECTION {TRAFF_UPLOAD, TRAFF_DOWNLOAD};
 
 class DIR_TRAFF
@@ -88,7 +89,7 @@ public:
     ValueType & operator[](IndexType idx) { return traff[idx]; }
     DIR_TRAFF GetData() const
     {
-    DIR_TRAFF res(traff.size());
+    DIR_TRAFF res;
     for (IndexType i = 0; i < traff.size(); ++i)
         if (!traff[i].empty())
             res[i] = traff[i].data();