From 33598699fab53fa4b76eea03c3b026278ae202fc Mon Sep 17 00:00:00 2001
From: William Tanenbaum
 <sha1-faefd172b4369b2002e8f0f7d11f304fd9896b5b@cern.ch>
Date: Thu, 1 Sep 2005 03:43:38 +0000
Subject: [PATCH] --- yaml --- r: 694 b: refs/heads/vhbbHeppy74X c:
 80d5102f8fdebe261bdcafa0e745e0ad61fe7e9e h: refs/heads/vhbbHeppy74X

---
 [refs]                                        |  2 +-
 trunk/FWCore/ParameterSet/src/BuilderVPSet.h  |  8 ++++----
 trunk/FWCore/ParameterSet/src/MakersPSet.cc   |  2 +-
 .../FWCore/ParameterSet/test/ps_t.cppunit.cc  | 20 +++++++++----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 908c0386d93a5..72c8a1d4d84e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/vhbbHeppy74X: 58e3f0c5f8c87cd7f9355e3912b3ff99f5fc5173
+refs/heads/vhbbHeppy74X: 80d5102f8fdebe261bdcafa0e745e0ad61fe7e9e
diff --git a/trunk/FWCore/ParameterSet/src/BuilderVPSet.h b/trunk/FWCore/ParameterSet/src/BuilderVPSet.h
index 13495b7440a3a..2e9386282562f 100644
--- a/trunk/FWCore/ParameterSet/src/BuilderVPSet.h
+++ b/trunk/FWCore/ParameterSet/src/BuilderVPSet.h
@@ -1,5 +1,5 @@
-#ifndef PARAMETERSET_BUILDERVPARAMETERSET_H
-#define PARAMETERSET_BUILDERVPARAMETERSET_H
+#ifndef ParameterSet_BuilderVPSet_h
+#define ParameterSet_BuilderVPSet_h
 // -*- C++ -*-
 //
 // Package:     ParameterSet
@@ -16,7 +16,7 @@
 //
 // Author:      Chris Jones
 // Created:     Wed May 18 15:38:32 EDT 2005
-// $Id: BuilderVPSet.h,v 1.1 2005/05/29 02:29:55 wmtan Exp $
+// $Id: BuilderVPSet.h,v 1.2 2005/06/23 19:57:22 wmtan Exp $
 //
 
 // system include files
@@ -50,4 +50,4 @@ struct BuilderVPSet : public Visitor
    }
 }
 
-#endif /* PARAMETERSET_BUILDERVPARAMETERSET_H */
+#endif /* ParameterSet_BuilderVPSet_h */
diff --git a/trunk/FWCore/ParameterSet/src/MakersPSet.cc b/trunk/FWCore/ParameterSet/src/MakersPSet.cc
index faf443ad99584..3eb5e947ff366 100644
--- a/trunk/FWCore/ParameterSet/src/MakersPSet.cc
+++ b/trunk/FWCore/ParameterSet/src/MakersPSet.cc
@@ -242,7 +242,7 @@ namespace edm {
 
           // Make sure the node is of type 'source' (which comes from a
           // 'secsource' entry.
-          if ( iNode.type() != "source" )
+          if (iNode.type() != "source")
             {
               throw edm::Exception(errors::Configuration,"PSetError")
                 << "An illegal entry has been found within a module declaration"
diff --git a/trunk/FWCore/ParameterSet/test/ps_t.cppunit.cc b/trunk/FWCore/ParameterSet/test/ps_t.cppunit.cc
index eb5020ee10576..54279fa5bfd6f 100644
--- a/trunk/FWCore/ParameterSet/test/ps_t.cppunit.cc
+++ b/trunk/FWCore/ParameterSet/test/ps_t.cppunit.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ps_t.cppunit.cc,v 1.2 2005/08/29 22:01:20 paterno Exp $
+ * $Id: ps_t.cppunit.cc,v 1.3 2005/08/30 12:53:21 paterno Exp $
  */
 
 #include <iostream>
@@ -95,7 +95,7 @@ untrackedTestbody(T value)
 {
   edm::ParameterSet p;
   p.template addUntrackedParameter<T>("x", value);
-  CPPUNIT_ASSERT( p.template getUntrackedParameter<T>("x") == value );
+  CPPUNIT_ASSERT(p.template getUntrackedParameter<T>("x") == value);
 
   // TODO: When CPPUNIT 1.10.2 arrives, uncomment the following code block.
 
@@ -112,20 +112,20 @@ untrackedTestbody(T value)
       p.template getUntrackedParameter<T>("does not exist");
       // We can't use CPPUNIT_ASSERT, because it throws, and that
       // makes it impossible to check for the right exception below.
-      assert ( 0 == "failed to throw a required exception" );
+      assert (0 == "failed to throw a required exception");
      }
    catch (cms::Exception& x)
      {
        // ok, this is expected
      }
-   catch ( ... )
+   catch (...)
      {
        // Failure!
 
       // Don't want to use CPPUNIT_ASSERT here, because it throws, and
       // that makes understanding the handling of this catch block too
       // hard for passers-by.
-       assert ( 0 == "threw the wrong kind of exception" );
+       assert (0 == "threw the wrong kind of exception");
      }
   //-------------------------------------------------------------------------
 }
@@ -257,10 +257,10 @@ void testps::mapByIdTest()
   psets.insert(std::make_pair(id_d, d));
 
   // query map
-  CPPUNIT_ASSERT( psets.size() == 4 );
-  CPPUNIT_ASSERT( psets[id_a] == a );
-  CPPUNIT_ASSERT( psets[id_b] == b );
-  CPPUNIT_ASSERT( psets[id_c] == c );
-  CPPUNIT_ASSERT( psets[id_d] == d );
+  CPPUNIT_ASSERT(psets.size() == 4);
+  CPPUNIT_ASSERT(psets[id_a] == a);
+  CPPUNIT_ASSERT(psets[id_b] == b);
+  CPPUNIT_ASSERT(psets[id_c] == c);
+  CPPUNIT_ASSERT(psets[id_d] == d);
 }