diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-13 01:04:09 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-13 01:04:09 +0000 |
| commit | 363cb8bc1d4e59d868ecb2a5168e3249f9bf5aad (patch) | |
| tree | 3a1bed7db5f3e20704070b790aae50e554b3ecfb /win8/metro_driver | |
| parent | efea5c8a588af8fd2bccb615a4f7ed5e8f027533 (diff) | |
| download | chromium_src-363cb8bc1d4e59d868ecb2a5168e3249f9bf5aad.zip chromium_src-363cb8bc1d4e59d868ecb2a5168e3249f9bf5aad.tar.gz chromium_src-363cb8bc1d4e59d868ecb2a5168e3249f9bf5aad.tar.bz2 | |
win/clang: Don't token-paste ( onto function name.
Fixes
..\..\win8\metro_driver\winrt_utils.cc(80,1) : error(clang): pasting formed 'CreateString(', an invalid preprocessing token [-Winvalid-token-paste]
IMPLEMENT_CREATE_PROPERTY(String, HSTRING);
^
..\..\win8\metro_driver\winrt_utils.cc(54,47) : note(clang): expanded from macro 'IMPLEMENT_CREATE_PROPERTY'
hr = property_value_statics->Create ## Name ## ( \
^
BUG=82385
TBR=grt@chromium.org
Review URL: https://codereview.chromium.org/373423004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver')
| -rw-r--r-- | win8/metro_driver/winrt_utils.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win8/metro_driver/winrt_utils.cc b/win8/metro_driver/winrt_utils.cc index 26da18a..5c724df 100644 --- a/win8/metro_driver/winrt_utils.cc +++ b/win8/metro_driver/winrt_utils.cc @@ -51,7 +51,7 @@ HRESULT Create ## Name ## Property(Type value, \ RuntimeClass_Windows_Foundation_PropertyValue, \ property_value_statics.GetAddressOf()); \ CheckHR(hr, "Can't create IPropertyValueStatics"); \ - hr = property_value_statics->Create ## Name ## ( \ + hr = property_value_statics->Create ## Name ( \ value, \ reinterpret_cast<IInspectable**>(prop)); \ CheckHR(hr, "Failed to create Property"); \ @@ -60,10 +60,10 @@ HRESULT Create ## Name ## Property(Type value, \ #define COMPARE_ATOMIC_PROPERTY_VALUES(Name, Type) \ Type lhs_value; \ - hr = lhs->Get ## Name ##(&lhs_value); \ + hr = lhs->Get ## Name (&lhs_value); \ CheckHR(hr, "Can't get value for lhs"); \ Type rhs_value; \ - hr = rhs->Get ## Name ##(&rhs_value); \ + hr = rhs->Get ## Name (&rhs_value); \ CheckHR(hr, "Can't get value for rhs"); \ if (lhs_value < rhs_value) \ *result = -1; \ |