From aa4781fcc0ec136e57f2f4d333b536a62a085fac Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 15 Jun 2010 18:23:49 +0200
Subject: [PATCH] BUG: missing constructor for pTraits specializations

---
 applications/test/pTraits/pTraitsTest.C      | 38 ++++++++++++++++++--
 src/OpenFOAM/primitives/Scalar/Scalar.C      |  8 ++++-
 src/OpenFOAM/primitives/Scalar/Scalar.H      |  3 ++
 src/OpenFOAM/primitives/bools/bool/bool.C    | 12 +++++--
 src/OpenFOAM/primitives/bools/bool/bool.H    |  3 ++
 src/OpenFOAM/primitives/ints/label/label.C   |  8 ++++-
 src/OpenFOAM/primitives/ints/label/label.H   |  3 ++
 src/OpenFOAM/primitives/ints/uLabel/uLabel.C |  6 ++++
 src/OpenFOAM/primitives/ints/uLabel/uLabel.H |  3 ++
 src/OpenFOAM/primitives/pTraits/pTraits.H    |  4 +++
 10 files changed, 81 insertions(+), 7 deletions(-)

diff --git a/applications/test/pTraits/pTraitsTest.C b/applications/test/pTraits/pTraitsTest.C
index 50b2fe780f..b739c0699a 100644
--- a/applications/test/pTraits/pTraitsTest.C
+++ b/applications/test/pTraits/pTraitsTest.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,15 +27,49 @@ Description
 
 #include "IOstreams.H"
 #include "pTraits.H"
+#include "vector.H"
+#include "tensor.H"
 
 using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:
 
+template<class T>
+void printTraits()
+{
+    Info<< pTraits<T>::typeName
+        << ": zero=" << pTraits<T>::zero
+        << " one=" << pTraits<T>::one << endl;
+}
+
+
+template<class T>
+void printTraits(const pTraits<T>& p)
+{
+    Info<< p.typeName << " == " << p << endl;
+}
+
+
 int main()
 {
-    Info<< pTraits<scalar>::typeName << endl;
+    printTraits<bool>();
+    printTraits<label>();
+    printTraits<scalar>();
+    printTraits<vector>();
+    printTraits<tensor>();
+
+    {
+        pTraits<bool> b(true);
+        printTraits(b);
+    }
+
+    {
+        pTraits<label> l(100);
+        printTraits(l);
+    }
+
+    printTraits(pTraits<scalar>(3.14159));
 
     Info<< "End\n" << endl;
 
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.C b/src/OpenFOAM/primitives/Scalar/Scalar.C
index acb471f8dd..f2e3b79009 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.C
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,6 +38,12 @@ const Scalar pTraits<Scalar>::max = ScalarVGREAT;
 
 const char* pTraits<Scalar>::componentNames[] = { "x" };
 
+pTraits<Scalar>::pTraits(const Scalar& p)
+:
+    p_(p)
+{}
+
+
 pTraits<Scalar>::pTraits(Istream& is)
 {
     is >> p_;
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index 159e6160a4..268e8b4bfd 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -65,6 +65,9 @@ public:
 
     // Constructors
 
+        //- Construct from primitive
+        explicit pTraits(const Scalar&);
+
         //- Construct from Istream
         pTraits(Istream&);
 
diff --git a/src/OpenFOAM/primitives/bools/bool/bool.C b/src/OpenFOAM/primitives/bools/bool/bool.C
index 562f0b43e5..f06fb77f8c 100644
--- a/src/OpenFOAM/primitives/bools/bool/bool.C
+++ b/src/OpenFOAM/primitives/bools/bool/bool.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,11 +28,17 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 const char* const Foam::pTraits<bool>::typeName = "bool";
-const bool Foam::pTraits<bool>::zero(false);
-const bool Foam::pTraits<bool>::one(true);
+const bool Foam::pTraits<bool>::zero = false;
+const bool Foam::pTraits<bool>::one = true;
 
 const char* Foam::pTraits<bool>::componentNames[] = { "x" };
 
+Foam::pTraits<bool>::pTraits(const bool& p)
+:
+    p_(p)
+{}
+
+
 Foam::pTraits<bool>::pTraits(Istream& is)
 {
     is >> p_;
diff --git a/src/OpenFOAM/primitives/bools/bool/bool.H b/src/OpenFOAM/primitives/bools/bool/bool.H
index 138a87dfa3..6ef6f99de3 100644
--- a/src/OpenFOAM/primitives/bools/bool/bool.H
+++ b/src/OpenFOAM/primitives/bools/bool/bool.H
@@ -91,6 +91,9 @@ public:
 
     // Constructors
 
+        //- Construct from primitive
+        explicit pTraits(const bool&);
+
         //- Construct from Istream
         pTraits(Istream&);
 
diff --git a/src/OpenFOAM/primitives/ints/label/label.C b/src/OpenFOAM/primitives/ints/label/label.C
index 532ac0b957..ec6524c9fe 100644
--- a/src/OpenFOAM/primitives/ints/label/label.C
+++ b/src/OpenFOAM/primitives/ints/label/label.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,6 +41,12 @@ const label pTraits<label>::max = labelMax;
 
 const char* pTraits<label>::componentNames[] = { "x" };
 
+pTraits<label>::pTraits(const label& p)
+:
+    p_(p)
+{}
+
+
 pTraits<label>::pTraits(Istream& is)
 {
     is >> p_;
diff --git a/src/OpenFOAM/primitives/ints/label/label.H b/src/OpenFOAM/primitives/ints/label/label.H
index 862c0cb316..f923e14e7f 100644
--- a/src/OpenFOAM/primitives/ints/label/label.H
+++ b/src/OpenFOAM/primitives/ints/label/label.H
@@ -165,6 +165,9 @@ public:
 
     // Constructors
 
+        //- Construct from primitive
+        explicit pTraits(const label&);
+
         //- Construct from Istream
         pTraits(Istream&);
 
diff --git a/src/OpenFOAM/primitives/ints/uLabel/uLabel.C b/src/OpenFOAM/primitives/ints/uLabel/uLabel.C
index 643a419f1e..d74f6ac567 100644
--- a/src/OpenFOAM/primitives/ints/uLabel/uLabel.C
+++ b/src/OpenFOAM/primitives/ints/uLabel/uLabel.C
@@ -41,6 +41,12 @@ const uLabel pTraits<uLabel>::max = uLabelMax;
 
 const char* pTraits<uLabel>::componentNames[] = { "x" };
 
+pTraits<uLabel>::pTraits(const uLabel& p)
+:
+    p_(p)
+{}
+
+
 pTraits<uLabel>::pTraits(Istream& is)
 {
     is >> p_;
diff --git a/src/OpenFOAM/primitives/ints/uLabel/uLabel.H b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
index 72d618dd52..3de35daa9d 100644
--- a/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
+++ b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
@@ -149,6 +149,9 @@ public:
 
     // Constructors
 
+        //- Construct from primitive
+        explicit pTraits(const uLabel&);
+
         //- Construct from Istream
         pTraits(Istream&);
 
diff --git a/src/OpenFOAM/primitives/pTraits/pTraits.H b/src/OpenFOAM/primitives/pTraits/pTraits.H
index 7c364677cb..d6a15b1261 100644
--- a/src/OpenFOAM/primitives/pTraits/pTraits.H
+++ b/src/OpenFOAM/primitives/pTraits/pTraits.H
@@ -55,11 +55,13 @@ public:
 
     // Constructors
 
+        //- Construct from primitive
         pTraits(const PrimitiveType& p)
         :
             PrimitiveType(p)
         {}
 
+        //- Construct from Istream
         pTraits(Istream& is)
         :
             PrimitiveType(is)
@@ -68,11 +70,13 @@ public:
 
     // Member operators
 
+        //- Access to the primitive
         operator PrimitiveType() const
         {
             return *this;
         }
 
+        //- Access to the primitive
         operator PrimitiveType&()
         {
             return *this;