diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H index a5cc3262a0..0b7b3bd33a 100644 --- a/src/OpenFOAM/db/IOstreams/token/token.H +++ b/src/OpenFOAM/db/IOstreams/token/token.H @@ -564,7 +564,7 @@ public: inline void operator=(compound* compoundPtr); - //- Deprecated(2016-05) transfer word pointer to the token + //- Deprecated(2017-11) transfer word pointer to the token // \deprecated(2017-11) - use move assign from word inline void operator=(word* wordPtr); diff --git a/src/OpenFOAM/primitives/strings/string/string.H b/src/OpenFOAM/primitives/strings/string/string.H index e64e44061b..a63261b758 100644 --- a/src/OpenFOAM/primitives/strings/string/string.H +++ b/src/OpenFOAM/primitives/strings/string/string.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2016-2018 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2016 OpenFOAM Foundation @@ -239,16 +239,8 @@ public: const size_type start = 0 ); - //- Expand initial tildes and all occurrences of environment variables - // Expansion includes: - // -# environment variables - // - "$VAR", "${VAR}" - // -# current directory - // - leading "./" : the current directory - // -# tilde expansion - // - leading "~/" : home directory - // - leading "~user" : home directory for specified user - // - leading "~OpenFOAM" : site/user OpenFOAM configuration directory + //- Inplace expand initial tags, tildes, and all occurrences of + //- environment variables as per stringOps::expand // // Any unknown entries are removed silently if allowEmpty is true // \sa diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.H b/src/OpenFOAM/primitives/strings/stringOps/stringOps.H index fdf8bad9a6..6604ff9ab7 100644 --- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.H +++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.H @@ -216,7 +216,9 @@ namespace stringOps ); - //- Expand initial tildes and all occurrences of environment variables + //- Expand initial tags, tildes, and all occurrences of environment + //- variables + // // Expansion includes: // -# environment variables // - "$VAR", "${VAR}" @@ -273,7 +275,9 @@ namespace stringOps ); - //- Expand initial tildes and all occurrences of environment variables + //- Expand initial tags, tildes, and all occurrences of environment + //- variables + // // Expansion includes: // -# environment variables // - "$VAR", "${VAR}"