Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SYCL] Follow-up fixes for stream class #254

Merged
merged 1 commit into from
Jun 27, 2019
Merged

[SYCL] Follow-up fixes for stream class #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion sycl/include/CL/sycl/detail/stream_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#pragma once

#include <CL/sycl/accessor.hpp>
#include <CL/sycl/builtins.hpp>
#include <CL/sycl/detail/array.hpp>
#include <CL/sycl/device_selector.hpp>
#include <CL/sycl/queue.hpp>
Expand Down
30 changes: 15 additions & 15 deletions sycl/include/CL/sycl/stream.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,29 +28,29 @@ enum class stream_manipulator {
defaultfloat
};

const stream_manipulator dec = stream_manipulator::dec;
constexpr stream_manipulator dec = stream_manipulator::dec;

const stream_manipulator hex = stream_manipulator::hex;
constexpr stream_manipulator hex = stream_manipulator::hex;

const stream_manipulator oct = stream_manipulator::oct;
constexpr stream_manipulator oct = stream_manipulator::oct;

const stream_manipulator noshowbase = stream_manipulator::noshowbase;
constexpr stream_manipulator noshowbase = stream_manipulator::noshowbase;

const stream_manipulator showbase = stream_manipulator::showbase;
constexpr stream_manipulator showbase = stream_manipulator::showbase;

const stream_manipulator noshowpos = stream_manipulator::noshowpos;
constexpr stream_manipulator noshowpos = stream_manipulator::noshowpos;

const stream_manipulator showpos = stream_manipulator::showpos;
constexpr stream_manipulator showpos = stream_manipulator::showpos;

const stream_manipulator endl = stream_manipulator::endl;
constexpr stream_manipulator endl = stream_manipulator::endl;

const stream_manipulator fixed = stream_manipulator::fixed;
constexpr stream_manipulator fixed = stream_manipulator::fixed;

const stream_manipulator scientific = stream_manipulator::scientific;
constexpr stream_manipulator scientific = stream_manipulator::scientific;

const stream_manipulator hexfloat = stream_manipulator::hexfloat;
constexpr stream_manipulator hexfloat = stream_manipulator::hexfloat;

const stream_manipulator defaultfloat = stream_manipulator::defaultfloat;
constexpr stream_manipulator defaultfloat = stream_manipulator::defaultfloat;

class stream;

Expand Down Expand Up @@ -145,7 +145,7 @@ class stream {
}

// Set the flags which correspond to the input stream manipulator.
void set_manipulator(const stream_manipulator &SM) const {
void set_manipulator(const stream_manipulator SM) const {
switch (SM) {
case stream_manipulator::dec:
set_flag(detail::Dec, detail::BaseField);
Expand Down Expand Up @@ -195,7 +195,7 @@ class stream {
friend const stream &operator<<(const stream &, const float &);
friend const stream &operator<<(const stream &, const double &);
friend const stream &operator<<(const stream &, const half &);
friend const stream &operator<<(const stream &, const stream_manipulator &);
friend const stream &operator<<(const stream &, const stream_manipulator);
friend const stream &operator<<(const stream &Out,
const __precision_manipulator__ &RHS);

Expand Down Expand Up @@ -319,7 +319,7 @@ inline const stream &operator<<(const stream &Out,
}

inline const stream &operator<<(const stream &Out,
const stream_manipulator &RHS) {
const stream_manipulator RHS) {
switch (RHS) {
case stream_manipulator::endl:
Out << '\n';
Expand Down
6 changes: 3 additions & 3 deletions sycl/test/basic_tests/stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// RUN: %clang -std=c++11 -fsycl -lstdc++ %s -o %t.out -lOpenCL -lsycl
// TEMPORARY_DISABLED_RUNx: env SYCL_DEVICE_TYPE=HOST %t.out | FileCheck %s
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out | FileCheck %s
// TEMPORARY_DISABLED_RUNx: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
// TEMPORARY_DISABLED_RUNx: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
// TEMPORARY_DISABLED_RUNx: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER
// RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
// RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER
//==------------------ stream.cpp - SYCL stream basic test -----------------==//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
Expand Down