Skip to content
Snippets Groups Projects
Commit 81a8da13 authored by mattijs's avatar mattijs
Browse files

ENH: wordRe: disable implicit conversions

parent f89bcd33
Branches
Tags
No related merge requests found
...@@ -120,22 +120,25 @@ public: ...@@ -120,22 +120,25 @@ public:
inline wordRe(const wordRe&); inline wordRe(const wordRe&);
//- Construct from keyType //- Construct from keyType
inline wordRe(const keyType&, const compOption=LITERAL); inline explicit wordRe(const keyType&);
//- Construct from keyType
inline wordRe(const keyType&, const compOption);
//- Construct as copy of word //- Construct as copy of word
inline explicit wordRe(const word&); inline explicit wordRe(const word&);
//- Construct as copy of character array //- Construct as copy of character array
// Optionally specify how it should be treated. // Optionally specify how it should be treated.
inline wordRe(const char*, const compOption = LITERAL); inline explicit wordRe(const char*, const compOption = LITERAL);
//- Construct as copy of string. //- Construct as copy of string.
// Optionally specify how it should be treated. // Optionally specify how it should be treated.
inline wordRe(const string&, const compOption = LITERAL); inline explicit wordRe(const string&, const compOption = LITERAL);
//- Construct as copy of std::string //- Construct as copy of std::string
// Optionally specify how it should be treated. // Optionally specify how it should be treated.
inline wordRe(const std::string&, const compOption = LITERAL); inline explicit wordRe(const std::string&, const compOption = LITERAL);
//- Construct from Istream //- Construct from Istream
// Words are treated as literals, strings with an auto-test // Words are treated as literals, strings with an auto-test
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
...@@ -65,6 +65,18 @@ inline Foam::wordRe::wordRe(const word& str) ...@@ -65,6 +65,18 @@ inline Foam::wordRe::wordRe(const word& str)
{} {}
inline Foam::wordRe::wordRe(const keyType& str)
:
word(str, false),
re_()
{
if (str.isPattern())
{
compile();
}
}
inline Foam::wordRe::wordRe(const keyType& str, const compOption opt) inline Foam::wordRe::wordRe(const keyType& str, const compOption opt)
: :
word(str, false), word(str, false),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment