update time due to rebase

.gitattributes

@@ -0,0 +1,5 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Declare files that will always have LF line endings on checkout.
+*.sh test eol=lf

include/credentials.h

@@ -55,12 +55,12 @@ struct Credentials {
 
   Credentials(error::Error err, std::string&& access_key,
               std::string&& secret_key, std::string&& session_token,
-              utils::Time expiration)
+              utils::UtcTime expiration)
       : err(err),
         access_key(std::move(access_key)),
         secret_key(std::move(secret_key)),
         session_token(std::move(session_token)),
-        expiration(expiration) {}
+        expiration(std::move(expiration)) {}
 
   ~Credentials() = default;
 

include/error.h

@@ -18,6 +18,7 @@
 
 #include <iosfwd>
 #include <string>
+#include <type_traits>
 
 namespace minio {
 namespace error {
@@ -32,9 +33,9 @@ class Error {
   Error(const Error&) = default;
   Error& operator=(const Error&) = default;
 
-  Error(Error&& v) : msg_(std::move(v.msg_)) {}
+  Error(Error&& v) noexcept : msg_(std::move(v.msg_)) {}
 
-  Error& operator=(Error&& v) {
+  Error& operator=(Error&& v) noexcept {
     if (this != &v) {
       msg_ = std::move(v.msg_);
     }

include/types.h

@@ -22,7 +22,7 @@
 #include <iostream>
 #include <list>
 #include <map>
-#include <nlohmann/json.hpp>
+#include <nlohmann/json_fwd.hpp>
 #include <ostream>
 #include <string>
 #include <type_traits>
@@ -318,7 +318,7 @@ struct Bucket {
   utils::UtcTime creation_date;
 
   Bucket() = default;
-  Bucket(std::string&& name, utils::Time&& creation_date)
+  Bucket(std::string&& name, utils::UtcTime&& creation_date)
       : name(std::move(name)), creation_date(std::move(creation_date)) {}
   ~Bucket() = default;
 };  // struct Bucket

include/utils.h

@@ -17,14 +17,14 @@
 #define _MINIO_UTILS_H
 
 #ifdef _WIN32
-#include <Winsock2.h>  // NOTE: needed for struct timeval
+#include <corecrt.h>
 #else
 #include <pwd.h>
 #endif
 
+#include <ctime>
 #include <ios>
 #include <iosfwd>
-#include <iostream>
 #include <list>
 #include <map>
 #include <set>

src/utils.cc

@@ -15,17 +15,14 @@
 
 #ifdef _WIN32
 #define _CRT_SECURE_NO_WARNINGS
+#include <corecrt.h>
 #endif
 
-#include "utils.h"
-
-#include <corecrt.h>
 #include <openssl/bio.h>
 #include <openssl/buffer.h>
 #include <openssl/crypto.h>
 #include <openssl/evp.h>
-#include <openssl/ossl_typ.h>
-#include <sys/types.h>
+#include <openssl/types.h>
 #include <zconf.h>
 #include <zlib.h>
 
@@ -55,6 +52,7 @@
 #include <vector>
 
 #include "error.h"
+#include "utils.h"
 
 const std::string WEEK_DAYS[] = {"Sun", "Mon", "Tue", "Wed",
                                  "Thu", "Fri", "Sat"};