Skip to content

Commit 3cfd0de

Browse files
stgatesstgates
committed
Fixing up the Dev14 builds being broken due to pplx extensibilty namespace.
1 parent eb4ffec commit 3cfd0de

File tree

14 files changed

+47
-195
lines changed

14 files changed

+47
-195
lines changed

‎Release/include/cpprest/astreambuf.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,10 @@
3232
#include <cstring>
3333
#include <math.h>
3434

35-
#if (defined(_MSC_VER) && (_MSC_VER >= 1800))
36-
#include <ppltasks.h>
37-
namespace pplx = Concurrency;
38-
#else
3935
#include "pplx/pplxtasks.h"
40-
#endif
41-
4236
#include "cpprest/basic_types.h"
4337
#include "cpprest/asyncrt_utils.h"
4438

45-
#ifndef _CONCRT_H
46-
#ifndef _LWRCASE_CNCRRNCY
47-
#define _LWRCASE_CNCRRNCY
48-
// Note to reader: we're using lower-case namespace names everywhere, but the 'Concurrency' namespace
49-
// is capitalized for historical reasons. The alias let's us pretend that style issue doesn't exist.
50-
namespace Concurrency { }
51-
namespace concurrency = Concurrency;
52-
#endif
53-
#endif
54-
5539
#if defined(_MSC_VER)
5640
#pragma warning(push)
5741
// Suppress unreferenced formal parameter warning as they are required for documentation.

‎Release/include/cpprest/asyncrt_utils.h

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,17 @@
2727

2828
#pragma once
2929

30-
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
31-
#include <ppltasks.h>
32-
namespace pplx = Concurrency;
33-
#else
34-
#include "pplx/pplxtasks.h"
35-
#endif
36-
37-
#include "cpprest/xxpublic.h"
38-
#include "cpprest/basic_types.h"
3930
#include <string>
4031
#include <vector>
4132
#include <cstdint>
4233
#include <system_error>
4334
#include <random>
4435
#include <locale.h>
4536

37+
#include "pplx/pplxtasks.h"
38+
#include "cpprest/xxpublic.h"
39+
#include "cpprest/basic_types.h"
40+
4641
#if !defined(_MS_WINDOWS) || (_MSC_VER >= 1700)
4742
#include <chrono>
4843
#endif

‎Release/include/cpprest/containerstream.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,10 @@
3232
#include <algorithm>
3333
#include <iterator>
3434

35-
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
36-
#include <ppltasks.h>
37-
namespace pplx = Concurrency;
38-
#else
3935
#include "pplx/pplxtasks.h"
40-
#endif
41-
4236
#include "cpprest/astreambuf.h"
4337
#include "cpprest/streams.h"
4438

45-
#ifndef _CONCRT_H
46-
#ifndef _LWRCASE_CNCRRNCY
47-
#define _LWRCASE_CNCRRNCY
48-
// Note to reader: we're using lower-case namespace names everywhere, but the 'Concurrency' namespace
49-
// is capitalized for historical reasons. The alias let's us pretend that style issue doesn't exist.
50-
namespace Concurrency { }
51-
namespace concurrency = Concurrency;
52-
#endif
53-
#endif
54-
5539
// Suppress unreferenced formal parameter warning as they are required for documentation
5640
#if defined(_MSC_VER)
5741
#pragma warning(push)

‎Release/include/cpprest/fileio.h

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -31,55 +31,16 @@
3131
****/
3232
#pragma once
3333

34-
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
35-
#include <ppltasks.h>
36-
namespace pplx = Concurrency;
37-
#if (_MSC_VER >= 1900)
38-
#include <concrt.h>
39-
#ifndef DEV14_EXTENSIBILITY_WRKRND
40-
#define DEV14_EXTENSIBILITY_WRKRND
41-
namespace Concurrency {
42-
namespace extensibility {
43-
typedef ::std::condition_variable condition_variable_t;
44-
typedef ::std::mutex critical_section_t;
45-
typedef ::std::unique_lock< ::std::mutex> scoped_critical_section_t;
46-
47-
typedef ::Concurrency::event event_t;
48-
typedef ::Concurrency::reader_writer_lock reader_writer_lock_t;
49-
typedef ::Concurrency::reader_writer_lock::scoped_lock scoped_rw_lock_t;
50-
typedef ::Concurrency::reader_writer_lock::scoped_lock_read scoped_read_lock_t;
51-
52-
typedef ::Concurrency::details::_ReentrantBlockingLock recursive_lock_t;
53-
typedef recursive_lock_t::_Scoped_lock scoped_recursive_lock_t;
54-
}
55-
}
56-
#endif // DEV14_EXTENSIBILITY_WRKRND
57-
#endif // _MSC_VER >= 1900
58-
#else // _MSC_VER
59-
#include "pplx/pplxtasks.h"
60-
#endif
61-
62-
#include "cpprest/xxpublic.h"
63-
6434
#ifdef _MS_WINDOWS
6535
#include <cstdint>
6636
#endif
6737

38+
#include "pplx/pplxtasks.h"
39+
#include "cpprest/xxpublic.h"
6840
#include "cpprest/basic_types.h"
6941

70-
#ifndef _CONCRT_H
71-
#ifndef _LWRCASE_CNCRRNCY
72-
#define _LWRCASE_CNCRRNCY
73-
// Note to reader: we're using lower-case namespace names everywhere, but the 'Concurrency' namespace
74-
// is capitalized for historical reasons. The alias let's us pretend that style issue doesn't exist.
75-
namespace Concurrency { }
76-
namespace concurrency = Concurrency;
77-
#endif
78-
#endif
79-
8042
namespace Concurrency { namespace streams
8143
{
82-
8344
namespace details
8445
{
8546
/// <summary>

‎Release/include/cpprest/http_client.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,9 @@ typedef void* native_handle;}}}
4343
#include <memory>
4444
#include <limits>
4545

46+
#include "pplx/pplxtasks.h"
4647
#include "cpprest/xxpublic.h"
4748
#include "cpprest/http_msg.h"
48-
49-
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
50-
#include <ppltasks.h>
51-
namespace pplx = Concurrency;
52-
#else
53-
#include "pplx/pplxtasks.h"
54-
#endif
55-
5649
#include "cpprest/json.h"
5750
#include "cpprest/uri.h"
5851
#include "cpprest/web_utilities.h"

‎Release/include/cpprest/http_msg.h

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,31 +32,7 @@
3232
#include <vector>
3333
#include <system_error>
3434

35-
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
36-
#include <ppltasks.h>
37-
namespace pplx = Concurrency;
38-
#if (_MSC_VER >= 1900)
39-
#include <concrt.h>
40-
#ifndef DEV14_EXTENSIBILITY_WRKRND
41-
#define DEV14_EXTENSIBILITY_WRKRND
42-
namespace pplx = Concurrency;
43-
namespace Concurrency {
44-
namespace extensibility {
45-
typedef ::Concurrency::event event_t;
46-
typedef ::Concurrency::reader_writer_lock reader_writer_lock_t;
47-
typedef ::Concurrency::reader_writer_lock::scoped_lock scoped_rw_lock_t;
48-
typedef ::Concurrency::reader_writer_lock::scoped_lock_read scoped_read_lock_t;
49-
50-
typedef ::Concurrency::details::_ReentrantBlockingLock recursive_lock_t;
51-
typedef recursive_lock_t::_Scoped_lock scoped_recursive_lock_t;
52-
}
53-
}
54-
#endif // DEV14_EXTENSIBILITY_WRKRND
55-
#endif // _MSC_VER >= 1900
56-
#else
5735
#include "pplx/pplxtasks.h"
58-
#endif
59-
6036
#include "cpprest/json.h"
6137
#include "cpprest/uri.h"
6238
#include "cpprest/http_headers.h"

‎Release/include/cpprest/interopstream.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,10 @@
2626
****/
2727
#pragma once
2828

29-
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
30-
#include <ppltasks.h>
31-
namespace pplx = Concurrency;
32-
#else // defined(_MSC_VER) && (_MSC_VER >= 1800)
3329
#include "pplx/pplxtasks.h"
34-
#endif // defined(_MSC_VER) && (_MSC_VER >= 1800)
35-
3630
#include "cpprest/astreambuf.h"
3731
#include "cpprest/streams.h"
3832

39-
#ifndef _CONCRT_H
40-
#ifndef _LWRCASE_CNCRRNCY
41-
#define _LWRCASE_CNCRRNCY
42-
// Note to reader: we're using lower-case namespace names everywhere, but the 'Concurrency' namespace
43-
// is capitalized for historical reasons. The alias let's us pretend that style issue doesn't exist.
44-
namespace Concurrency { }
45-
namespace concurrency = Concurrency;
46-
#endif // _LWRCASE_CNCRRNCY
47-
#endif // _CONCRT_H
48-
4933
#pragma warning(push)
5034
// Suppress unreferenced formal parameter warning as they are required for documentation
5135
#pragma warning(disable : 4100)

‎Release/include/cpprest/producerconsumerstream.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,9 @@
3535
#include <algorithm>
3636
#include <iterator>
3737

38-
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
39-
#include <ppltasks.h>
40-
namespace pplx = Concurrency;
41-
#else
4238
#include "pplx/pplxtasks.h"
43-
#endif
44-
4539
#include "cpprest/astreambuf.h"
4640

47-
#ifndef _CONCRT_H
48-
#ifndef _LWRCASE_CNCRRNCY
49-
#define _LWRCASE_CNCRRNCY
50-
// Note to reader: we're using lower-case namespace names everywhere, but the 'Concurrency' namespace
51-
// is capitalized for historical reasons. The alias let's us pretend that style issue doesn't exist.
52-
namespace Concurrency { }
53-
namespace concurrency = Concurrency;
54-
#endif
55-
#endif
56-
5741
// Suppress unreferenced formal parameter warning as they are required for documentation
5842
#if defined(_MSC_VER)
5943
#pragma warning(push)

‎Release/include/cpprest/rawptrstream.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,10 @@
3535
#include <algorithm>
3636
#include <iterator>
3737

38-
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
39-
#include <ppltasks.h>
40-
namespace pplx = Concurrency;
41-
#else
4238
#include "pplx/pplxtasks.h"
43-
#endif
44-
4539
#include "cpprest/astreambuf.h"
4640
#include "cpprest/streams.h"
4741

48-
#ifndef _CONCRT_H
49-
#ifndef _LWRCASE_CNCRRNCY
50-
#define _LWRCASE_CNCRRNCY
51-
// Note to reader: we're using lower-case namespace names everywhere, but the 'Concurrency' namespace
52-
// is capitalized for historical reasons. The alias let's us pretend that style issue doesn't exist.
53-
namespace Concurrency { }
54-
namespace concurrency = Concurrency;
55-
#endif
56-
#endif
57-
5842
// Suppress unreferenced formal parameter warning as they are required for documentation
5943
#pragma warning(push)
6044
#pragma warning(disable : 4100)

‎Release/include/cpprest/ws_client.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,8 @@
3535
#include <condition_variable>
3636
#include <mutex>
3737

38-
#include "cpprest/xxpublic.h"
39-
40-
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
41-
#include <ppltasks.h>
42-
namespace pplx = Concurrency;
43-
#else
4438
#include "pplx/pplxtasks.h"
45-
#endif
46-
39+
#include "cpprest/xxpublic.h"
4740
#include "cpprest/uri.h"
4841
#include "cpprest/web_utilities.h"
4942
#include "cpprest/http_headers.h"

0 commit comments

Comments
 (0)