diff --git a/applications/utilities/mesh/generation/extrude2DMesh/doExtrude2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/doExtrude2DMesh.C index c71f91079c8cda68c77b86054a9d8cf01c2c4a27..ff8f118d1ca7e8bb302bdcc15e60ceab09ad457a 100644 --- a/applications/utilities/mesh/generation/extrude2DMesh/doExtrude2DMesh.C +++ b/applications/utilities/mesh/generation/extrude2DMesh/doExtrude2DMesh.C @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) // ~~~~~~~~~~~~~~~~~~~~~~ scalar minRange = GREAT; - direction extrudeDir = -1; + direction extrudeDir = 4; //illegal value. for (direction dir = 0; dir < 3; dir++) { diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H index 4855bfbb0e5e5a855fb56c53f7b3b8655a0e6add..3eb9a1e612beec67a213324dc0cf2d395abef9a3 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H @@ -57,6 +57,7 @@ class argList; class ensightMesh { +public: class nFacePrimitives { public: @@ -75,6 +76,7 @@ class ensightMesh {} }; +private: // Private data diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H index 1504fb4d78363167fd2f4e934270702728afc71d..98c7660155f2f618474327a5ba553d514e23c205 100644 --- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H +++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H @@ -172,7 +172,7 @@ template<class ListType> ListType createWithValues ( const label sz, - const typename ListType::const_reference initValue, + typename ListType::const_reference initValue, const UList<label>& indices, typename ListType::const_reference setValue ); diff --git a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C index db45597ba705b4b9dacf9890d2b0b24f8b68179e..14fac1ba8cfea72447f90fd8882b6e973a3e5619 100644 --- a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C +++ b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C @@ -129,28 +129,29 @@ void Foam::SHA1::processBytes(const void *data, size_t len) } // Process available complete blocks - if (len >= 64) - { -#if !_STRING_ARCH_unaligned -# define alignof(type) offsetof (struct { char c; type x; }, x) -# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0) - if (UNALIGNED_P (data)) - { - while (len > 64) +// if (len >= 64) +// { +//#if !_STRING_ARCH_unaligned +//# define alignof(type) offsetof (struct { char c; type x; }, x) +//# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0) +// if (UNALIGNED_P (data)) +// { +// while (len > 64) + while (len >= 64) { processBlock(memcpy (buffer_, data, 64), 64); data = reinterpret_cast<const unsigned char*>(data) + 64; len -= 64; } - } - else -#endif - { - processBlock(data, len & ~63); - data = reinterpret_cast<const unsigned char*>(data) + (len & ~63); - len &= 63; - } - } +// } +// else +//#endif +// { +// processBlock(data, len & ~63); +// data = reinterpret_cast<const unsigned char*>(data) + (len & ~63); +// len &= 63; +// } +// } // Move remaining bytes in internal buffer. if (len > 0) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C index 873d5fb34611db8528ceb57e5af007c9fc711ccb..b300ea55251b59341110b9df77a102211edf1360 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C @@ -67,6 +67,10 @@ Foam::word Foam::PatchInteractionModel<CloudType>::interactionTypeToWord return "other"; } } +#ifdef __ICC + // Prevent Icc complaining about missing return statement. + return word::null; +#endif }