Commits

Sebastien Binet  committed 20a8a4f Merge

sync w/ atlasoff

  • Participants
  • Parent commits b15351b, 2b88e34
  • Branches waffle-repo, mob

Comments (0)

Files changed (8)

 c9bb97a37d0b48f1cd3610e7847f09031a401c6d Navigation-00-08-14
 66e147521888637d239b66f2caa29dabd18e049a Navigation-00-08-15
 e56fd59eaa884e65897106642d151f2a87071bff Navigation-00-08-16
+27c78d1f7c9f14491af26360b82449553f57f56a Navigation-00-08-17
+3b7bd17eabd88d1f5be8e204f592373061f2fce9 Navigation-00-08-18
+2012-02-21 Walter Lampl
+	* Move IAthenaBarCode from Control/Navigation to Control/AthenaKernel
+	  to avoid circular dependency problem with UserDataStore
+	* Navigation/IAthenaBarCode.h includes  AthenaKernel/IAthenaBarCode.h for
+	  backward compatibility
+	* Tag Navigation-00-08-18
+
 2011-10-07  Sebastien Binet  <binet@voatlas51.cern.ch>
 
 	* Tagging Navigation-00-08-17.

File Navigation/AthenaBarCodeBase.h

 #define NAVIGATION_ATHENABARCODEBASE_H
 
 
-#include "Navigation/IAthenaBarCode.h"
+#include "AthenaKernel/IAthenaBarCode.h"
 #include "Navigation/AthenaBarCodeImpl.h"
 
 

File Navigation/AthenaBarCodeImpl.h

 
 #include <iosfwd>
 
-#include <Navigation/IAthenaBarCode.h> //for static const data memebers
+#include <AthenaKernel/IAthenaBarCode.h> //for static const data memebers
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Universal Object Identifier for all INav4Mom Objects

File Navigation/IAthenaBarCode.h

-///////////////////////// -*- C++ -*- /////////////////////////////
-#ifndef NAVIGATION_IATHENABARCODE_H
-#define NAVIGATION_IATHENABARCODE_H
-///////////////////////////////////////////////////////////////////////////////
-///
-///              IAthenaBarCode interface class
-///
-/// \author  Yushu Yao
-///
-/// \brief barcode for all INav4Mom classes
-///
-//                                                                           //
-///////////////////////////////////////////////////////////////////////////////
-
-
-#include <GaudiKernel/StatusCode.h>
-//#include <iostream>
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Universal Object Identifier for all Navigable4Momentum Objects
-//
-// Class Structure:
-// IAthenaBarCode   INavigable  I4Momentum
-//        |           /           /
-//        V        /           /
-//      INav4M
-//        |
-//        V
-//    IParticle
-//        |
-//        V
-//    ParticleImpl
-//
-///////////////////////////////////////////////////////////////////////////////
-
-//Work Around dependency issue of Navigation
-//If don't see IUserDataSvc.h yet, do the definitions here.
-#ifndef IUSERDATASVC_H
-#include <inttypes.h>
-typedef uint64_t AthenaBarCode_t;
-#endif
-
-typedef AthenaBarCode_t AthenaBarCodeVersion_t;
-
-class IAthenaBarCode {
-
-public:
-
-  static const AthenaBarCode_t UNDEFINEDBARCODE = (AthenaBarCode_t)(-1);
-  static const AthenaBarCode_t UNDEFINEDVERSION = UNDEFINEDBARCODE;
-
-public:
-
-  //Constructors
-
-  IAthenaBarCode() {  }
-  virtual ~IAthenaBarCode();
-
-  //All the default implementations are for the classes that derives from
-  //INav4M but not ParticleImpl
-
-public:
-  //Public setter and getters
-  virtual AthenaBarCode_t getAthenaBarCode() const {
-    return UNDEFINEDBARCODE;
-  }
-
-  virtual void setAthenaBarCode(AthenaBarCode_t /*id*/) {
-    //    throw std::runtime_error("IAthenaBarCode::setAthenaBarCode():: can't set AthenaBarCode in the dummy implementation");
-  }
-
-public:
-  //Comparing & Versioning Control
-  virtual bool hasSameAthenaBarCode(const IAthenaBarCode &/*obj*/) const {
-    return false;
-  }
-
-  virtual bool hasSameAthenaBarCodeExceptVersion(const IAthenaBarCode &/*obj*/) const {
-    return false;
-  }
-
-  virtual AthenaBarCodeVersion_t getVersion() const {
-    return UNDEFINEDVERSION;
-  }
-
-  virtual void newVersion() {
-    //    throw std::runtime_error("IAthenaBarCode::newVersion():: can't newVersion() in the dummy implementation");
-  }
-
-  virtual void setVersion(AthenaBarCodeVersion_t /*newversion*/) {
-    //    throw std::runtime_error("IAthenaBarCode::setVersion():: can't setVersion() in the dummy implementation");
-  }
-
-};
-
-#endif //  NAVIGATION_ATHENABARCODE_H
+#include "AthenaKernel/IAthenaBarCode.h"

File cmt/requirements

 use CxxUtils            CxxUtils-*              Control
 use DataModel		DataModel-*		Control
 
-use GaudiInterface GaudiInterface-*	External
-
+use AthenaKernel          AthenaKernel-*           Control
 
 
 branches Navigation
 #apply_pattern dual_use_library *.cxx
 
 private
-use AthenaKernel          AthenaKernel-*           Control
+use GaudiInterface GaudiInterface-*	External
 use SGTools		  SGTools-*		   Control
 use uuid            *                  LCG_Interfaces
 use AtlasReflex   AtlasReflex-*   External -no_auto_imports

File src/AthenaBarCodeImpl.cxx

 
 #include "AthenaKernel/IJobIDSvc.h"
 
-#include "Navigation/IAthenaBarCode.h"
 #include "Navigation/AthenaBarCodeImpl.h"
 
 #include "GaudiKernel/IMessageSvc.h"

File src/IAthenaBarCode.cxx

-///////////////////////// -*- C++ -*- /////////////////////////////
-// IAthenaBarCode.cxx 
-// Implementation file for class INavigation
-// Author: S.Binet<binet@cern.ch>
-/////////////////////////////////////////////////////////////////// 
-
-// pkg includes
-#include "Navigation/IAthenaBarCode.h"
-
-/////////////////////////////////////////////////////////////////// 
-// Public methods: 
-/////////////////////////////////////////////////////////////////// 
-
-// Constructors
-////////////////
-
-// Destructor
-///////////////
-
-IAthenaBarCode::~IAthenaBarCode()
-{}
-