*** empty log message ***

This commit is contained in:
David Rose 2001-04-26 02:22:59 +00:00
parent 46289f6612
commit 6be49f004e
8 changed files with 15 additions and 11 deletions

View File

@ -314,7 +314,7 @@
#defer get_igatescan \ #defer get_igatescan \
$[if $[and $[run_interrogate],$[IGATESCAN]], \ $[if $[and $[run_interrogate],$[IGATESCAN]], \
$[if $[eq $[IGATESCAN], all], \ $[if $[eq $[IGATESCAN], all], \
$[filter-out %.I %.lxx %.yxx %.N,$[get_sources]], \ $[filter-out %.I %.T %.lxx %.yxx %.N,$[get_sources]], \
$[IGATESCAN]]] $[IGATESCAN]]]
// This variable returns the name of the interrogate database file // This variable returns the name of the interrogate database file

View File

@ -119,7 +119,7 @@ endif
// Check for interrogate. // Check for interrogate.
#if $[eq $[IGATESCAN], all] #if $[eq $[IGATESCAN], all]
#define IGATESCAN $[filter-out %.I %.lxx %.yxx %.N,$[SOURCES]] #define IGATESCAN $[filter-out %.I %.T %.lxx %.yxx %.N,$[SOURCES]]
#endif #endif
#if $[ne $[IGATESCAN],] #if $[ne $[IGATESCAN],]
#define IGATEFILE $[TARGET].in.cxx #define IGATEFILE $[TARGET].in.cxx

View File

@ -101,7 +101,7 @@
// These are the source files that our dependency cache file will // These are the source files that our dependency cache file will
// depend on. If it's an empty list, we won't bother writing rules to // depend on. If it's an empty list, we won't bother writing rules to
// freshen the cache file. // freshen the cache file.
#define dep_sources $[sort $[filter %.c %.cxx %.yxx %.lxx %.h %.I,$[so_sources] $[st_sources]]] #define dep_sources $[sort $[filter %.c %.cxx %.yxx %.lxx %.h %.I %.T,$[so_sources] $[st_sources]]]
#if $[eq $[so_dir],$[st_dir]] #if $[eq $[so_dir],$[st_dir]]
// If the static and shared directories are the same, we have to use the // If the static and shared directories are the same, we have to use the
@ -432,7 +432,7 @@ $[install_igatedb_dir]/$[igatedb] : $[so_dir]/$[igatedb] $[so_dir]/stamp
$[so_dir]/$[igatedb] : $[so_dir]/$[igateoutput] $[so_dir]/$[igatedb] : $[so_dir]/$[igateoutput]
lib$[TARGET]_igatescan = $[igatescan] lib$[TARGET]_igatescan = $[igatescan]
$[so_dir]/$[igateoutput] : $[sort $[patsubst %.h,%.h,%.I,%.I,%,,$[dependencies $[igatescan]] $[igatescan:%=./%]]] $[so_dir]/stamp $[so_dir]/$[igateoutput] : $[sort $[patsubst %.h,%.h,%.I,%.I,%.T,%.T,%,,$[dependencies $[igatescan]] $[igatescan:%=./%]]] $[so_dir]/stamp
interrogate -od $[so_dir]/$[igatedb] -oc $[so_dir]/$[igateoutput] $[interrogate_options] -module "$[igatemod]" -library "$[igatelib]" $(lib$[TARGET]_igatescan) interrogate -od $[so_dir]/$[igatedb] -oc $[so_dir]/$[igateoutput] $[interrogate_options] -module "$[igatemod]" -library "$[igatelib]" $(lib$[TARGET]_igatescan)
#define target $[igateoutput:%.cxx=$[so_dir]/%.obj] #define target $[igateoutput:%.cxx=$[so_dir]/%.obj]

View File

@ -106,7 +106,7 @@
// These are the source files that our dependency cache file will // These are the source files that our dependency cache file will
// depend on. If it's an empty list, we won't bother writing rules to // depend on. If it's an empty list, we won't bother writing rules to
// freshen the cache file. // freshen the cache file.
#define dep_sources $[sort $[filter %.c %.cxx %.yxx %.lxx %.h %.I,$[so_sources] $[st_sources]]] #define dep_sources $[sort $[filter %.c %.cxx %.yxx %.lxx %.h %.I %.I,$[so_sources] $[st_sources]]]
#if $[eq $[so_dir],$[st_dir]] #if $[eq $[so_dir],$[st_dir]]
// If the static and shared directories are the same, we have to use the // If the static and shared directories are the same, we have to use the
@ -407,7 +407,7 @@ $[install_igatedb_dir]\$[igatedb] : $[so_dir]\$[igatedb]
$[NT_COPYCMD] $[so_dir]\$[local] $[dest] $[NT_COPYCMD] $[so_dir]\$[local] $[dest]
lib$[TARGET]_igatescan = $[osfilename $[igatescan]] lib$[TARGET]_igatescan = $[osfilename $[igatescan]]
$[so_dir]\$[igatedb] $[so_dir]\$[igateoutput] : $[sort $[patsubst %.h,%.h,%.I,%.I,%,,$[dependencies $[igatescan]] $[igatescan:%=./%]]] $[so_dir]\$[igatedb] $[so_dir]\$[igateoutput] : $[sort $[patsubst %.h,%.h,%.I,%.I,%.T,%.T,%,,$[dependencies $[igatescan]] $[igatescan:%=./%]]]
// We use forward slash for interrogate because it prefers those. // We use forward slash for interrogate because it prefers those.
interrogate -od $[so_dir]/$[igatedb] -oc $[so_dir]/$[igateoutput] $[interrogate_options] -module "$[igatemod]" -library "$[igatelib]" $(lib$[TARGET]_igatescan) interrogate -od $[so_dir]/$[igatedb] -oc $[so_dir]/$[igateoutput] $[interrogate_options] -module "$[igatemod]" -library "$[igatelib]" $(lib$[TARGET]_igatescan)

View File

@ -66,7 +66,7 @@
// These are the source files that our dependency cache file will // These are the source files that our dependency cache file will
// depend on. If it's an empty list, we won't bother writing rules to // depend on. If it's an empty list, we won't bother writing rules to
// freshen the cache file. // freshen the cache file.
#define dep_sources $[sort $[filter %.c %.cxx %.yxx %.lxx %.h %.I,$[so_sources] $[st_sources]]] #define dep_sources $[sort $[filter %.c %.cxx %.yxx %.lxx %.h %.I %.T,$[so_sources] $[st_sources]]]
#if $[eq $[so_dir],$[st_dir]] #if $[eq $[so_dir],$[st_dir]]
// If the static and shared directories are the same, we have to use the // If the static and shared directories are the same, we have to use the
@ -323,7 +323,7 @@ $[install_igatedb_dir]/$[igatedb] : $[so_dir]/$[igatedb]
$[so_dir]/$[igatedb] : $[so_dir]/$[igateoutput] $[so_dir]/$[igatedb] : $[so_dir]/$[igateoutput]
lib$[TARGET]_igatescan = $[igatescan] lib$[TARGET]_igatescan = $[igatescan]
$[so_dir]/$[igateoutput] : $[sort $[patsubst %.h,%.h,%.I,%.I,%,,$[dependencies $[igatescan]] $[igatescan:%=./%]]] $[so_dir]/$[igateoutput] : $[sort $[patsubst %.h,%.h,%.I,%.I,%.T,%.T,%,,$[dependencies $[igatescan]] $[igatescan:%=./%]]]
interrogate -od $[so_dir]/$[igatedb] -oc $[so_dir]/$[igateoutput] $[interrogate_options] -module "$[igatemod]" -library "$[igatelib]" $(lib$[TARGET]_igatescan) interrogate -od $[so_dir]/$[igatedb] -oc $[so_dir]/$[igateoutput] $[interrogate_options] -module "$[igatemod]" -library "$[igatelib]" $(lib$[TARGET]_igatescan)
#define target $[igateoutput:%.cxx=$[so_dir]/%.o] #define target $[igateoutput:%.cxx=$[so_dir]/%.o]

View File

@ -8,6 +8,7 @@
'(("\\.hh$" . c++-mode) '(("\\.hh$" . c++-mode)
("\\.h$" . c++-mode) ("\\.h$" . c++-mode)
("\\.I$" . c++-mode) ("\\.I$" . c++-mode)
("\\.T$" . c++-mode)
("\\.y$" . c++-mode) ; yacc source files ("\\.y$" . c++-mode) ; yacc source files
("\\.l$" . c++-mode) ; lex source files ("\\.l$" . c++-mode) ; lex source files
("\\.stk$" . scheme-mode) ("\\.stk$" . scheme-mode)

View File

@ -8,8 +8,9 @@
#include <pandabase.h> #include <pandabase.h>
#include <node.h> #include "node.h"
#include <nodeRelation.h> #include "nodeRelation.h"
#include <typeHandle.h> #include <typeHandle.h>
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////

View File

@ -210,7 +210,9 @@ private:
static TypeHandle _type_handle; static TypeHandle _type_handle;
static TypeHandle _stashed_type_handle; static TypeHandle _stashed_type_handle;
friend extern EXPCL_PANDA INLINE_GRAPH void remove_arc(NodeRelation *arc); // Should not include storage class specifiers in friend declaration.
friend void remove_arc(NodeRelation *arc);
friend class Node; friend class Node;
friend class NodeTransitionWrapper; friend class NodeTransitionWrapper;
friend class AllTransitionsWrapper; friend class AllTransitionsWrapper;