Commit d89bb28f authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Fixed broken build process 

Moved tnlObject_impl.h back to tnlObject.cpp since function definitions
in header files cause duplicates when building libtnl. The constructor
of tnlObject is __cuda_callable__ so it's empty definition was moved
directly to tnlObject.h to make it visible to nvcc.
parent 2995e4e9

src/config/tnlParameterContainer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ 
#include <ctype.h>

#include <cstring>

#include <stdio.h>



#include "tnlParameterContainer.h"

#include <core/tnlObject.h>



bool matob( const char* value, bool& ret_val )

{

src/core/tnlCurve.h

+3 −1
Original line number Diff line number Diff line
@@ -82,7 +82,9 @@ template< class T > class tnlCurve : public tnlObject, public tnlList< tnlCurveE 
   public:

   //! Basic contructor

   tnlCurve( const char* name )

   : tnlObject( name )

   : tnlObject()

// FIXME: name property has been removed from tnlObject

//   : tnlObject( name )

   {

   };

src/core/tnlObject_impl.h→src/core/tnlObject.cpp

+0 −9
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 
 *                                                                         *

 ***************************************************************************/



#ifndef tnlObject_H_IMPLEMENTATION

#define tnlObject_H_IMPLEMENTATION



#include <core/tnlObject.h>

#include <debug/tnlDebug.h>

#include <core/tnlAssert.h>
@@ -30,11 +27,6 @@ 


const char magic_number[] = "TNLMN";



__cuda_callable__

tnlObject :: tnlObject()

{

}



tnlString tnlObject :: getType()

{

   return tnlString( "tnlObject" );
@@ -206,4 +198,3 @@ bool parseObjectType( const tnlString& objectType, 
   return true;

}

#endif /* tnlObject_H_IMPLEMENTATION */

src/core/tnlObject.h

+1 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ class tnlObject 


   //! Basic constructor

   __cuda_callable__

   tnlObject();

   tnlObject() {};



   /****

    * Type getter. This returns the type in C++ style - for example the returned value
@@ -85,6 +85,4 @@ bool getObjectType( const tnlString& file_name, tnlString& type ); 
bool parseObjectType( const tnlString& objectType,

                      tnlList< tnlString >& parsedObjectType );



#include <core/tnlObject_impl.h>



#endif

src/core/CMakeLists.txt

+3 −3

File changed.

Contains only whitespace changes.