General whitespace cleanup and removal of commented-out code.

Author: ras0219-msft

Release/CMakeLists.txt

@@ -38,7 +38,6 @@ elseif(ANDROID)
   endif()
   find_host_package(Boost 1.55 EXACT REQUIRED COMPONENTS random system thread locale filesystem chrono atomic)
 
-  # find_package(Threads REQUIRED)
   set(OPENSSL_FOUND 1)
   if(ARM)
     set(OPENSSL_INCLUDE_DIR "${CMAKE_BINARY_DIR}/../openssl/armeabi-v7a/include")
@@ -59,15 +58,15 @@ elseif(ANDROID)
   else()
     set(LIBCXX_STL "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86/thumb/libgnustl_static.a")
   endif()
+  # These are used in the shared library case
   set(ANDROID_STL_FLAGS
-#    pthread
     ${LIBCXX_STL}
-#    atomic
+    atomic
     dl
     gcc
     c
     m
-#    -nodefaultlibs
+    -nodefaultlibs
     )
 
   option(BUILD_SHARED_LIBS "Build shared Libraries." OFF)

Release/include/cpprest/filestream.h

@@ -664,9 +664,9 @@ namespace details {
                     return (pos_type)_seekrdpos_fsb(m_info, size_t(m_info->m_rdpos+offset), sizeof(_CharType));
                 case std::ios_base::end:
                     return (pos_type)_seekrdtoend_fsb(m_info, int64_t(offset), sizeof(_CharType));
-		default:
-		    // Fail on invalid input (_S_ios_seekdir_end)
-		    assert(false);
+                default:
+                    // Fail on invalid input (_S_ios_seekdir_end)
+                    assert(false);
                 }
             }
             else if ( (m_info->m_mode & std::ios::ios_base::app) == 0 )
@@ -679,9 +679,9 @@ namespace details {
                     return (pos_type)_seekwrpos_fsb(m_info, size_t(m_info->m_wrpos+offset), sizeof(_CharType));
                 case std::ios_base::end:
                     return (pos_type)_seekwrpos_fsb(m_info, size_t(-1), sizeof(_CharType));
-		default:
-		    // Fail on invalid input (_S_ios_seekdir_end)
-		    assert(false);
+                default:
+                    // Fail on invalid input (_S_ios_seekdir_end)
+                    assert(false);
                 }
             }
             return (pos_type)traits::eof(); 

Release/src/pplx/threadpool.cpp

@@ -37,7 +37,7 @@ JNIEnv* get_jvm_env()
     auto result = JVM.load()->AttachCurrentThread(&env, nullptr);
     if (result != JNI_OK)
     {
-	throw std::runtime_error("Could not attach to JVM");
+        throw std::runtime_error("Could not attach to JVM");
     }
 
     return env;