Merge branch 'development' of https://git01.codeplex.com/casablanca into jsonlocale

Conflicts:
	Release/src/json/json_parsing.cpp
	Release/src/json/json_serialization.cpp
	Release/src/utilities/asyncrt_utils.cpp

Author: stgates

Release/CMakeLists.txt

@@ -110,7 +110,6 @@ elseif(("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") OR IOS)
   set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
 
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
-  set(STRICT_CXX_FLAGS ${WARNINGS} "-Werror -pedantic")
 elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
   message("-- Setting gcc options")
 
@@ -121,7 +120,6 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
   set(LD_FLAGS "${LD_FLAGS} -Wl,-z,defs")
 
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
-  set(STRICT_CXX_FLAGS ${WARNINGS} "-Werror -pedantic")
 else()
   message("-- Unknown compiler, success is doubtful.")
 endif()

Release/include/cpprest/astreambuf.h

@@ -52,11 +52,13 @@ namespace concurrency = Concurrency;
 #endif
 #endif
 
+#if defined(_MSC_VER)
 #pragma warning(push)
 // Suppress unreferenced formal parameter warning as they are required for documentation.
 #pragma warning(disable : 4100)
 // Suppress no-side-effect recursion warning, since it is safe and template-binding-dependent.
 #pragma warning(disable : 4718)
+#endif
 
 #ifndef _MS_WINDOWS
 // TFS 579628 - 1206: figure out how to avoid having this specialization for Linux (beware of 64-bit Linux)
@@ -666,7 +668,7 @@ namespace streams
             _commit(count);
             m_alloced = false;
         }
-#pragma region dependencies
+
     public:
         virtual bool can_seek() const = 0;
         virtual bool has_size() const = 0;
@@ -712,8 +714,6 @@ namespace streams
             return pplx::task_from_result();
         }
 
-#pragma endregion
-
     protected:
         streambuf_state_manager(std::ios_base::openmode mode)
         {
@@ -904,8 +904,6 @@ namespace streams
             return m_buffer;
         }
 
-#pragma region Function forwarding
-
         /// <summary>
         /// <c>can_read</c> is used to determine whether a stream buffer will support read operations (get).
         /// </summary>
@@ -1195,13 +1193,13 @@ namespace streams
             return get_base()->exception();
         }
 
-#pragma endregion
-
     private:
         std::shared_ptr<details::basic_streambuf<_CharType>> m_buffer;
 
     };
 
 }}
 
+#if defined(_MSC_VER)
 #pragma warning(pop) // 4100
+#endif

Release/include/cpprest/base_uri.h

@@ -153,10 +153,6 @@ namespace web {
         /// <returns>The decoded string.</returns>
         _ASYNCRTIMP static utility::string_t __cdecl decode(const utility::string_t &encoded);
 
-#pragma endregion
-
-#pragma region splitting
-
         /// <summary>
         /// Splits a path into its hierarchical components.
         /// </summary>
@@ -171,21 +167,13 @@ namespace web {
         /// <returns>A <c>std::map&lt;utility::string_t, utility::string_t&gt;</c> containing the key-value components of the query.</returns>
         _ASYNCRTIMP static std::map<utility::string_t, utility::string_t> __cdecl split_query(const utility::string_t &query);
 
-#pragma endregion
-
-#pragma region validation
-
         /// <summary>
         /// Validates a string as a uri.
         /// </summary>
         /// <param name="uri_string">The uri string to be validated.</param>
         /// <returns><c>true</c> if the given string represents a valid URI, <c>false</c> otherwise.</returns>
         _ASYNCRTIMP static bool __cdecl validate(const utility::string_t &uri_string);
 
-#pragma endregion
-
-#pragma region constructors
-
         /// <summary>
         /// Creates an empty uri
         /// </summary>
@@ -205,10 +193,6 @@ namespace web {
         /// <param name="uri_string">An encoded uri string to create the URI instance.</param>
         _ASYNCRTIMP uri(const utility::string_t &uri_string);
 
-#pragma endregion
-
-#pragma region accessors
-
         /// <summary>
         /// Get the scheme component of the URI as an encoded string.
         /// </summary>
@@ -263,10 +247,6 @@ namespace web {
         /// <returns>The new uri object with the path, query and fragment portion of this uri.</returns>
         _ASYNCRTIMP uri resource() const;
 
-#pragma endregion
-
-#pragma region diagnostics
-
         /// <summary>
         /// An empty uri specifies no components, and serves as a default value
         /// </summary>
@@ -350,10 +330,6 @@ namespace web {
             return path().empty() || path() == _XPLATSTR("/");
         }
 
-#pragma endregion
-
-#pragma region conversion
-
         /// <summary>
         /// Returns the full (encoded) uri as a string.
         /// </summary>
@@ -363,10 +339,6 @@ namespace web {
             return m_uri;
         }
 
-#pragma endregion
-
-#pragma region operators
-
         _ASYNCRTIMP bool operator == (const uri &other) const;
 
         bool operator < (const uri &other) const
@@ -379,8 +351,6 @@ namespace web {
             return !(this->operator == (other));
         }
 
-#pragma endregion
-
     private:
         friend class uri_builder;
 

Release/include/cpprest/containerstream.h

@@ -53,8 +53,10 @@ namespace concurrency = Concurrency;
 #endif
 
 // Suppress unreferenced formal parameter warning as they are required for documentation
+#if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable : 4100)
+#endif
 
 namespace Concurrency { namespace streams {
 
@@ -648,4 +650,6 @@ namespace Concurrency { namespace streams {
 
 }} // namespaces
 
+#if defined(_MSC_VER)
 #pragma warning(pop) // 4100
+#endif

Release/include/cpprest/fileio.h

@@ -90,11 +90,11 @@ namespace details
         // Input buffer
 
         size_t m_buffer_size;  // The intended size of the buffer to read into.
-        SafeSize m_bufsize;    // Buffer allocated size, as actually allocated.
-
         char   *m_buffer;
-        size_t m_bufoff;    // File position that the start of the buffer represents.
-        size_t m_buffill;   // Amount of file data actually in the buffer
+
+        size_t m_bufoff;       // File position that the start of the buffer represents.
+        SafeSize m_bufsize;    // Buffer allocated size, as actually allocated.
+        size_t m_buffill;      // Amount of file data actually in the buffer
 
         std::ios_base::openmode m_mode;
 

Release/include/cpprest/http_client.h

@@ -106,10 +106,8 @@ class http_client_config
         , m_validate_certificates(true)
 #endif
         , m_set_user_nativehandle_options([](native_handle)->void{})
-#ifdef _MS_WINDOWS
-#if !defined(__cplusplus_winrt)
+#if defined(_MS_WINDOWS) && !defined(__cplusplus_winrt)
         , m_buffer_request(false)
-#endif
 #endif
     {
     }
@@ -319,29 +317,23 @@ class http_client_config
     // Whether or not to guarantee ordering, i.e. only using one underlying TCP connection.
     bool m_guarantee_order;
 
-    // IXmlHttpRequest2 doesn't allow configuration of certificate verification.
-#if !defined(__cplusplus_winrt)
-    bool m_validate_certificates;
-#endif
+    utility::seconds m_timeout;
+    size_t m_chunksize;
 
-#ifdef _MS_WINDOWS
 #if !defined(__cplusplus_winrt)
-    bool m_buffer_request;
-#endif
+    // IXmlHttpRequest2 doesn't allow configuration of certificate verification.
+    bool m_validate_certificates;
 #endif
 
     std::function<void(native_handle)> m_set_user_nativehandle_options;
 
-    utility::seconds m_timeout;
-    size_t m_chunksize;
-
-#ifdef _MS_WINDOWS
-#ifdef __cplusplus_winrt
+#if defined(_MS_WINDOWS) && defined(__cplusplus_winrt)
     friend class details::winrt_client;
-#else
+#elif defined(_MS_WINDOWS)
+    bool m_buffer_request;
+
     friend class details::winhttp_client;
-#endif // __cplusplus_winrt  
-#endif // _MS_WINDOWS
+#endif // defined(_MS_WINDOWS) && defined(__cplusplus_winrt)
 
     /// <summary>
     /// Invokes a user callback to allow for customization of the requst

Release/include/cpprest/http_client_impl.h

@@ -65,7 +65,6 @@ namespace web { namespace http { namespace client { namespace details
 
 #ifdef _MS_WINDOWS
 static const utility::char_t * get_with_body = _XPLATSTR("A GET or HEAD request should not have an entity body.");
-#endif
 
 // Helper function to trim leading and trailing null characters from a string.
 static void trim_nulls(utility::string_t &str)
@@ -77,6 +76,8 @@ static void trim_nulls(utility::string_t &str)
     str.erase(index);
 }
 
+#endif
+
 // Flatten the http_headers into a name:value pairs separated by a carriage return and line feed.
 static utility::string_t flatten_http_headers(const http_headers &headers)
 {
@@ -200,21 +201,21 @@ class request_context
         return outstream.streambuf();
     }
 
+    // Reference to the http_client implementation.
+    std::shared_ptr<_http_client_communicator> m_http_client;
+
     // request/response pair.
     http_request m_request;
     http_response m_response;
 
+    std::exception_ptr m_exceptionPtr;
+
     size64_t m_uploaded;
     size64_t m_downloaded;
 
-    std::exception_ptr m_exceptionPtr;
-
     // task completion event to signal request is completed.
     pplx::task_completion_event<http_response> m_request_completion;
 
-    // Reference to the http_client implementation.
-    std::shared_ptr<_http_client_communicator> m_http_client;
-
     // Registration for cancellation notification if enabled.
     pplx::cancellation_token_registration m_cancellationRegistration;
 

Release/include/cpprest/http_msg.h

@@ -101,6 +101,7 @@ class status_codes
 #undef DAT
 };
 
+/// Message direction
 namespace message_direction
 {
     /// <summary>
@@ -198,8 +199,8 @@ class http_exception : public std::exception
     }
 
 private:
-    std::string m_msg;
     std::error_code m_errorCode;
+    std::string m_msg;
 };
 
 namespace details
@@ -299,12 +300,11 @@ class http_msg_base
     /// </summary>
     concurrency::streams::ostream m_outStream;
 
+    http_headers m_headers;
     bool m_default_outstream;
 
     /// <summary> The TCE is used to signal the availability of the message body. </summary>
     pplx::task_completion_event<utility::size64_t> m_data_available;
-
-    http_headers m_headers;
 };
 
 /// <summary>
@@ -353,8 +353,6 @@ class _http_response : public http::details::http_msg_base
 } // namespace details
 
 
-#pragma region HTTP response message
-
 /// <summary>
 /// Represents an HTTP response.
 /// </summary>
@@ -608,8 +606,6 @@ class http_response
     std::shared_ptr<http::details::_http_response> _m_impl;
 };
 
-#pragma endregion
-
 namespace details {
 /// <summary>
 /// Internal representation of an HTTP request message.
@@ -681,17 +677,18 @@ class _http_request : public http::details::http_msg_base, public std::enable_sh
     // Actual initiates sending the response, without checking if a response has already been sent.
     pplx::task<void> _reply_impl(http_response response);
 
+    http::method m_method;
+
     // Tracks whether or not a response has already been started for this message.
     pplx::details::atomic_long m_initiated_response;
 
-    pplx::cancellation_token m_cancellationToken;
+    std::unique_ptr<http::details::_http_server_context> m_server_context;
 
-    http::method m_method;
+    pplx::cancellation_token m_cancellationToken;
 
     http::uri m_base_uri;
     http::uri m_uri;
     utility::string_t m_listener_path;
-    std::unique_ptr<http::details::_http_server_context> m_server_context;
 
     concurrency::streams::ostream m_response_stream;
 
@@ -703,8 +700,6 @@ class _http_request : public http::details::http_msg_base, public std::enable_sh
 
 }  // namespace details
 
-#pragma region HTTP Request
-
 /// <summary>
 /// Represents an HTTP request.
 /// </summary>
@@ -1162,8 +1157,6 @@ class http_request
     std::shared_ptr<http::details::_http_request> _m_impl;
 };
 
-#pragma endregion
-
 /// <summary>
 /// HTTP client handler class, used to represent an HTTP pipeline stage.
 /// </summary>