Update the documentation to use vtkm::FloatDefault instead of vtkm::Scalar.

This commit is contained in:
Robert Maynard 2014-12-10 10:38:03 -05:00
parent 519509bba1
commit 735a2ff25a
6 changed files with 7 additions and 7 deletions

@ -595,8 +595,8 @@ public:
///
/// \code{.cpp}
/// typedef vtkm::cont::ArrayHandleCompositeVector<
/// vtkm::cont::ArrayHandle<vtkm::Scalar>,
/// vtkm::cont::ArrayHandle<vtkm::Scalar> >::type OutArrayType;
/// vtkm::cont::ArrayHandle<vtkm::FloatDefault>,
/// vtkm::cont::ArrayHandle<vtkm::FloatDefault> >::type OutArrayType;
/// OutArrayType outArray = vtkm::cont::make_ArrayHandleCompositeVector(a1,a2);
/// \endcode
///

@ -50,7 +50,7 @@ public:
typedef typename ArrayTransferType::PortalConstExecution PortalConst;
};
/// The type of value held in the array (vtkm::Scalar, vtkm::Vector3, etc.)
/// The type of value held in the array (vtkm::FloatDefault, vtkm::Vec, etc.)
///
typedef T ValueType;

@ -53,7 +53,7 @@ private:
typedef vtkm::cont::internal::Storage<T,StorageTag> StorageType;
public:
/// The type of value held in the array (vtkm::Scalar, vtkm::Vector3, etc.)
/// The type of value held in the array (vtkm::FloatDefault, vtkm::Vec, etc.)
///
typedef T ValueType;

@ -52,7 +52,7 @@ private:
T,StorageTag,DeviceAdapterTag> ArrayManagerType;
public:
/// The type of value held in the array (vtkm::Scalar, vtkm::Vector3, etc.)
/// The type of value held in the array (vtkm::FloatDefault, vtkm::Vec, etc.)
///
typedef T ValueType;

@ -46,7 +46,7 @@ void TestTypeSizes()
VTKM_TEST_ASSERT(VTKM_SIZE_SCALAR == EXPECTED_SIZE,
"VTKM_SIZE_SCALAR an unexpected size.");
VTKM_TEST_ASSERT(sizeof(vtkm::FloatDefault) == EXPECTED_SIZE,
"vtkm::Scalar an unexpected size.");
"vtkm::FloatDefault an unexpected size.");
}
}

@ -46,7 +46,7 @@ void TestTypeSizes()
VTKM_TEST_ASSERT(VTKM_SIZE_SCALAR == EXPECTED_SIZE,
"VTKM_SIZE_SCALAR an unexpected size.");
VTKM_TEST_ASSERT(sizeof(vtkm::FloatDefault) == EXPECTED_SIZE,
"vtkm::Scalar an unexpected size.");
"vtkm::FloatDefault an unexpected size.");
}
}