[Stdair-svn] SF.net SVN: stdair:[111] trunk/stdair/stdair

[<qua...@us...>]

Revision: 111
          http://stdair.svn.sourceforge.net/stdair/?rev=111&view=rev
Author:   quannaus
Date:     2010-01-29 16:03:38 +0000 (Fri, 29 Jan 2010)

Log Message:
-----------
[Dev] Moved the STDAIR_ServicePtr_T into STDAIR_Types.hpp

Modified Paths:
--------------
    trunk/stdair/stdair/STDAIR_Types.hpp
    trunk/stdair/stdair/core/sources.mk

Removed Paths:
-------------
    trunk/stdair/stdair/STDAIR_ServicePtr.hpp

Deleted: trunk/stdair/stdair/STDAIR_ServicePtr.hpp
===================================================================
--- trunk/stdair/stdair/STDAIR_ServicePtr.hpp	2010-01-28 23:35:01 UTC (rev 110)
+++ trunk/stdair/stdair/STDAIR_ServicePtr.hpp	2010-01-29 16:03:38 UTC (rev 111)
@@ -1,19 +0,0 @@
-#ifndef __STDAIR_SVC_STDAIR_SERVICEPTR_HPP
-#define __STDAIR_SVC_STDAIR_SERVICEPTR_HPP
-
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// Boost
-#include <boost/shared_ptr.hpp>
-
-namespace stdair {
-
-  // Forward declarations
-  class STDAIR_Service;
-  
-  /** Pointer on the STDAIR Service handler. */
-  typedef boost::shared_ptr<STDAIR_Service> STDAIR_ServicePtr_T;
-  
-}
-#endif // __STDAIR_SVC_STDAIR_SERVICEPTR_HPP

Modified: trunk/stdair/stdair/STDAIR_Types.hpp
===================================================================
--- trunk/stdair/stdair/STDAIR_Types.hpp	2010-01-28 23:35:01 UTC (rev 110)
+++ trunk/stdair/stdair/STDAIR_Types.hpp	2010-01-29 16:03:38 UTC (rev 111)
@@ -12,9 +12,13 @@
 #include <boost/date_time/gregorian/gregorian.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/tuple/tuple.hpp>
+#include <boost/shared_ptr.hpp>
 
 namespace stdair {
 
+  // Forward declarations
+  class STDAIR_Service;
+
   // ///////// Exceptions ///////////
   class RootException : public std::exception {
   };
@@ -361,5 +365,8 @@
       or C:\foo\bar). */
   typedef std::string Filename_T;
   
+  /** Pointer on the STDAIR Service handler. */
+  typedef boost::shared_ptr<STDAIR_Service> STDAIR_ServicePtr_T;
+  
 }
 #endif // __STDAIR_STDAIR_TYPES_HPP

Modified: trunk/stdair/stdair/core/sources.mk
===================================================================
--- trunk/stdair/stdair/core/sources.mk	2010-01-28 23:35:01 UTC (rev 110)
+++ trunk/stdair/stdair/core/sources.mk	2010-01-29 16:03:38 UTC (rev 111)
@@ -1,4 +1,3 @@
 service_h_sources = $(top_srcdir)/stdair/STDAIR_Types.hpp \
-					$(top_srcdir)/stdair/STDAIR_Service.hpp \
-					$(top_srcdir)/stdair/STDAIR_ServicePtr.hpp
+					$(top_srcdir)/stdair/STDAIR_Service.hpp
 service_cc_sources =


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.