kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'clang-format-prep'

Browse Source 
06259327 Tests: Wrap long comment lines in VSXaml test
18df6a9a Tests: Protect unicode literals from clang-format Cpp03 formatting
This commit is contained in:
Brad King 2016-05-12 09:28:28 -04:00 committed by CMake Topic Stage
commit 11eba2ecd5
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/CompileFeatures/cxx_unicode_literals.cpp
View File

@ -1,3 +1,5 @@
/* clang-format off */
const char16_t lit_16[] = u"\u00DA"; const char16_t lit_16[] = u"\u00DA";
const char32_t lit_32[] = U"\u00DA"; const char32_t lit_32[] = U"\u00DA";
/* clang-format on */

16
Tests/VSXaml/App.xaml.cpp
View File

@ -26,8 +26,9 @@ using namespace Windows::UI::Xaml::Navigation;
// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227 // The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227
/// <summary> /// <summary>
/// Initializes the singleton application object. This is the first line of authored code /// Initializes the singleton application object. This is the first line of
/// executed, and as such is the logical equivalent of main() or WinMain(). /// authored code executed, and as such is the logical equivalent of main()
/// or WinMain().
/// </summary> /// </summary>
App::App() App::App()
{ {
@ -36,8 +37,9 @@ App::App()
} }
/// <summary> /// <summary>
/// Invoked when the application is launched normally by the end user. Other entry points /// Invoked when the application is launched normally by the end user.
/// will be used such as when the application is launched to open a specific file. /// Other entry points will be used such as when the application is
/// launched to open a specific file.
/// </summary> /// </summary>
/// <param name="e">Details about the launch request and process.</param> /// <param name="e">Details about the launch request and process.</param>
void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ e) void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ e)
@ -101,9 +103,9 @@ void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEvent
} }
/// <summary> /// <summary>
/// Invoked when application execution is being suspended. Application state is saved /// Invoked when application execution is being suspended. Application state
/// without knowing whether the application will be terminated or resumed with the contents /// is saved without knowing whether the application will be terminated or
/// of memory still intact. /// resumed with the contents of memory still intact.
/// </summary> /// </summary>
/// <param name="sender">The source of the suspend request.</param> /// <param name="sender">The source of the suspend request.</param>
/// <param name="e">Details about the suspend request.</param> /// <param name="e">Details about the suspend request.</param>