Merge remote-tracking branch 'origin/development' into android-clang-3

Author: ras0219-msft

Release/include/cpprest/astreambuf.h

@@ -186,7 +186,7 @@ namespace details
         std::string m_prevLocale;
         int m_prevThreadSetting;
 #elif !defined(ANDROID)
-        locale_t m_prevLocale;        
+        locale_t m_prevLocale;
 #endif
         scoped_c_thread_locale(const scoped_c_thread_locale &);
         scoped_c_thread_locale & operator=(const scoped_c_thread_locale &);
@@ -316,7 +316,7 @@ class datetime
     enum date_format { RFC_1123, ISO_8601 };
 
     /// <summary>
-    /// Returns the current UTC time. 
+    /// Returns the current UTC time.
     /// </summary>
     static _ASYNCRTIMP datetime __cdecl utc_now();
 
@@ -409,7 +409,7 @@ class datetime
         return days*_dayTicks;
     }
 
-    bool is_initialized() const 
+    bool is_initialized() const
     {
         return m_interval != 0;
     }
@@ -447,7 +447,7 @@ class datetime
 class cmp
 {
 public:
-    
+
     static int icmp(std::string left, std::string right)
     {
         size_t i;
@@ -481,7 +481,7 @@ inline int operator- (datetime t1, datetime t2)
 
     // Round it down to seconds
     diff /= 10 * 1000 * 1000;
-    
+
     return static_cast<int>(diff);
 }
 

Release/include/cpprest/asyncrt_utils.h

@@ -1,12 +1,12 @@
 /***
 * ==++==
 *
-* Copyright (c) Microsoft Corporation. All rights reserved. 
+* Copyright (c) Microsoft Corporation. All rights reserved.
 * 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.
@@ -94,7 +94,7 @@ namespace web {
                 }
                 return *this;
             }
-            
+
             _ASYNCRTIMP utility::string_t join();
 
             utility::string_t m_scheme;
@@ -138,11 +138,11 @@ namespace web {
     /// ('/path?query#frag').
     ///
     /// This implementation does not provide any scheme-specific handling -- an example of this
-    /// would be the following: 'http://path1/path'. This is a valid URI, but it's not a valid 
-    /// http-uri -- that is, it's syntactically correct but does not conform to the requirements 
-    /// of the http scheme (http requires a host). 
-    /// We could provide this by allowing a pluggable 'scheme' policy-class, which would provide 
-    /// extra capability for validating and canonicalizing a URI according to scheme, and would 
+    /// would be the following: 'http://path1/path'. This is a valid URI, but it's not a valid
+    /// http-uri -- that is, it's syntactically correct but does not conform to the requirements
+    /// of the http scheme (http requires a host).
+    /// We could provide this by allowing a pluggable 'scheme' policy-class, which would provide
+    /// extra capability for validating and canonicalizing a URI according to scheme, and would
     /// introduce a layer of type-safety for URIs of differing schemes, and thus differing semantics.
     ///
     /// One issue with implementing a scheme-independent URI facility is that of comparing for equality.
@@ -178,15 +178,15 @@ namespace web {
 
         /// <summary>
         /// Encodes a URI component according to RFC 3986.
-        /// Note if a full URI is specified instead of an individual URI component all 
+        /// Note if a full URI is specified instead of an individual URI component all
         /// characters not in the unreserved set are escaped.
         /// </summary>
         /// <param name="raw">The URI as a string.</param>
         /// <returns>The encoded string.</returns>
         _ASYNCRTIMP static utility::string_t __cdecl encode_uri(const utility::string_t &raw, uri::components::component = components::full_uri);
 
         /// <summary>
-        /// Encodes a string by converting all characters except for RFC 3986 unreserved characters to their 
+        /// Encodes a string by converting all characters except for RFC 3986 unreserved characters to their
         /// hexadecimal representation.
         /// </summary>
         /// <param name="utf8data">The UTF-8 string data.</param>
@@ -227,14 +227,14 @@ namespace web {
         uri() { m_uri = _XPLATSTR("/");};
 
         /// <summary>
-        /// Creates a URI from the given encoded string. This will throw an exception if the string 
+        /// Creates a URI from the given encoded string. This will throw an exception if the string
         /// does not contain a valid URI. Use uri::validate if processing user-input.
         /// </summary>
         /// <param name="uri_string">A pointer to an encoded string to create the URI instance.</param>
         _ASYNCRTIMP uri(const utility::char_t *uri_string);
 
         /// <summary>
-        /// Creates a URI from the given encoded string. This will throw an exception if the string 
+        /// Creates a URI from the given encoded string. This will throw an exception if the string
         /// does not contain a valid URI. Use uri::validate if processing user-input.
         /// </summary>
         /// <param name="uri_string">An encoded URI string to create the URI instance.</param>

Release/include/cpprest/base_uri.h

@@ -1,12 +1,12 @@
 /***
 * ==++==
 *
-* Copyright (c) Microsoft Corporation. All rights reserved. 
+* Copyright (c) Microsoft Corporation. All rights reserved.
 * 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.

Release/include/cpprest/basic_types.h

@@ -120,7 +120,7 @@ namespace Concurrency { namespace streams {
         /// </summary>
         virtual utility::size64_t size() const
         {
-            return utility::size64_t(m_size);
+            return utility::size64_t(m_data.size());
         }
 
         /// <summary>
@@ -153,10 +153,10 @@ namespace Concurrency { namespace streams {
         {
             // See the comment in seek around the restriction that we do not allow read head to
             // seek beyond the current write_end.
-            _ASSERTE(m_current_position <= m_size);
+            _ASSERTE(m_current_position <= m_data.size());
 
             SafeSize readhead(m_current_position);
-            SafeSize writeend(m_size);
+            SafeSize writeend(m_data.size());
             return (size_t)(writeend - readhead);
         }
 
@@ -330,7 +330,7 @@ namespace Concurrency { namespace streams {
             // For now, we assume that the current write_end is the end of the buffer. We use this artificial
             // end to restrict the read head from seeking beyond what is available.
 
-            pos_type end(m_size);
+            pos_type end(m_data.size());
 
             if (position >= beg)
             {
@@ -378,7 +378,7 @@ namespace Concurrency { namespace streams {
         {
             pos_type beg = 0;
             pos_type cur = static_cast<pos_type>(m_current_position);
-            pos_type end = static_cast<pos_type>(m_size);
+            pos_type end = static_cast<pos_type>(m_data.size());
 
             switch ( way )
             {
@@ -404,8 +404,7 @@ namespace Concurrency { namespace streams {
         /// </summary>
         basic_container_buffer(std::ios_base::openmode mode)
             : streambuf_state_manager<typename _CollectionType::value_type>(mode),
-              m_current_position(0),
-              m_size(0)
+              m_current_position(0)
         {
             validate_mode(mode);
         }
@@ -416,8 +415,7 @@ namespace Concurrency { namespace streams {
         basic_container_buffer(_CollectionType data, std::ios_base::openmode mode)
             : streambuf_state_manager<typename _CollectionType::value_type>(mode),
               m_data(std::move(data)),
-              m_current_position((mode & std::ios_base::in) ? 0 : m_data.size()),
-              m_size(m_data.size())
+              m_current_position((mode & std::ios_base::in) ? 0 : m_data.size())
         {
             validate_mode(mode);
         }
@@ -509,10 +507,8 @@ namespace Concurrency { namespace streams {
         /// </summary>
         void resize_for_write(size_t newPos)
         {
-            _ASSERTE(m_size <= m_data.size());
-
             // Resize the container if required
-            if (newPos > m_size)
+            if (newPos > m_data.size())
             {
                 m_data.resize(newPos);
             }
@@ -525,23 +521,14 @@ namespace Concurrency { namespace streams {
         {
             // The new write head
             m_current_position = newPos;
-
-            if ( this->can_write() && m_size < m_current_position)
-            {
-                // Update the size of the buffer with valid data if required
-                m_size = m_current_position;
-            }
-
-            _ASSERTE(m_current_position <= m_size);
-            _ASSERTE(m_size <= m_data.size());
+            _ASSERTE(m_current_position <= m_data.size());
         }
 
         // The actual data store
         _CollectionType m_data;
 
         // Read/write head
         size_t m_current_position;
-        size_t m_size;
     };
 
     } // namespace details

Release/include/cpprest/containerstream.h

@@ -36,7 +36,7 @@
 #define __declspec(x) __attribute__ ((x))
 
 // ignore these:
-#define dllimport 
+#define dllimport
 
 #include <stdint.h>
 #include <assert.h>

Release/include/cpprest/details/apple_compat.h

@@ -1,12 +1,12 @@
 /***
 * ==++==
 *
-* Copyright (c) Microsoft Corporation. All rights reserved. 
+* Copyright (c) Microsoft Corporation. All rights reserved.
 * 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.
@@ -40,7 +40,7 @@
 #define __declspec(x) __attribute__ ((x))
 
 // ignore these:
-#define dllimport 
+#define dllimport
 #ifdef __LP64__ // ignore cdecl on 64-bit
 #define cdecl
 #endif

Release/include/cpprest/details/linux_compat.h

@@ -1,12 +1,12 @@
 /***
 * ==++==
 *
-* Copyright (c) Microsoft Corporation. All rights reserved. 
+* Copyright (c) Microsoft Corporation. All rights reserved.
 * 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.

Release/include/cpprest/details/nosal.h

@@ -1,12 +1,12 @@
 /***
 * ==++==
 *
-* Copyright (c) Microsoft Corporation. All rights reserved. 
+* Copyright (c) Microsoft Corporation. All rights reserved.
 * 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.

Release/include/cpprest/details/windows_compat.h

@@ -1,12 +1,12 @@
 /***
 * ==++==
 *
-* Copyright (c) Microsoft Corporation. All rights reserved. 
+* Copyright (c) Microsoft Corporation. All rights reserved.
 * 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.
@@ -89,19 +89,19 @@ namespace details
     /// </summary>
     struct _file_info
     {
-        _ASYNCRTIMP _file_info(std::ios_base::openmode mode, size_t buffer_size) : 
-            m_rdpos(0), 
-            m_wrpos(0), 
-            m_atend(false), 
+        _ASYNCRTIMP _file_info(std::ios_base::openmode mode, size_t buffer_size) :
+            m_rdpos(0),
+            m_wrpos(0),
+            m_atend(false),
             m_buffer_size(buffer_size),
             m_buffer(nullptr),
-            m_bufoff(0), 
+            m_bufoff(0),
             m_bufsize(0),
             m_buffill(0),
             m_mode(mode)
         {
         }
-            
+
         // Positional data
 
         size_t m_rdpos;
@@ -140,7 +140,7 @@ namespace details
 }
 }}
 
-extern "C" 
+extern "C"
 {
 /// <summary>
 /// Open a file and create a streambuf instance to represent it.