Browse Source

general: Fix several miscategorized EXPCL_PANDA_* macros

Sam Edwards 7 years ago
parent
commit
32e1ca2252

+ 1 - 1
panda/src/android/pnmFileTypeAndroid.h

@@ -28,7 +28,7 @@
  * Wrapper class around the Android Bitmap mechanism to allow loading images
  * Wrapper class around the Android Bitmap mechanism to allow loading images
  * on Android without needing libpng or libjpeg.
  * on Android without needing libpng or libjpeg.
  */
  */
-class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeAndroid : public PNMFileType {
+class PNMFileTypeAndroid : public PNMFileType {
 public:
 public:
   enum CompressFormat : jint {
   enum CompressFormat : jint {
     CF_jpeg = 0,
     CF_jpeg = 0,

+ 1 - 1
panda/src/chan/bindAnimRequest.h

@@ -25,7 +25,7 @@ class AnimControl;
  * This class object manages an asynchronous load-and-bind animation request,
  * This class object manages an asynchronous load-and-bind animation request,
  * as issued through PartBundle::load_bind_anim().
  * as issued through PartBundle::load_bind_anim().
  */
  */
-class EXPCL_PANDA_PGRAPH BindAnimRequest : public ModelLoadRequest {
+class EXPCL_PANDA_CHAN BindAnimRequest : public ModelLoadRequest {
 public:
 public:
   ALLOC_DELETED_CHAIN(BindAnimRequest);
   ALLOC_DELETED_CHAIN(BindAnimRequest);
 
 

+ 1 - 1
panda/src/display/displayRegionCullCallbackData.h

@@ -24,7 +24,7 @@ class SceneSetup;
  * This specialization on CallbackData is passed when the callback is
  * This specialization on CallbackData is passed when the callback is
  * initiated from the cull traversal, for a DisplayRegion.
  * initiated from the cull traversal, for a DisplayRegion.
  */
  */
-class EXPCL_PANDA_PGRAPH DisplayRegionCullCallbackData : public CallbackData {
+class EXPCL_PANDA_DISPLAY DisplayRegionCullCallbackData : public CallbackData {
 public:
 public:
   DisplayRegionCullCallbackData(CullHandler *cull_handler, SceneSetup *scene_setup);
   DisplayRegionCullCallbackData(CullHandler *cull_handler, SceneSetup *scene_setup);
 
 

+ 1 - 1
panda/src/display/displayRegionDrawCallbackData.h

@@ -24,7 +24,7 @@ class SceneSetup;
  * This specialization on CallbackData is passed when the callback is
  * This specialization on CallbackData is passed when the callback is
  * initiated from the draw traversal, for a DisplayRegion.
  * initiated from the draw traversal, for a DisplayRegion.
  */
  */
-class EXPCL_PANDA_PGRAPH DisplayRegionDrawCallbackData : public CallbackData {
+class EXPCL_PANDA_DISPLAY DisplayRegionDrawCallbackData : public CallbackData {
 public:
 public:
   DisplayRegionDrawCallbackData(CullResult *cull_result, SceneSetup *scene_setup);
   DisplayRegionDrawCallbackData(CullResult *cull_result, SceneSetup *scene_setup);
 
 

+ 1 - 1
panda/src/event/asyncTaskCollection.h

@@ -24,7 +24,7 @@
  *
  *
  * TODO: None of this is thread-safe yet.
  * TODO: None of this is thread-safe yet.
  */
  */
-class EXPCL_PANDA_PGRAPH AsyncTaskCollection {
+class EXPCL_PANDA_EVENT AsyncTaskCollection {
 PUBLISHED:
 PUBLISHED:
   AsyncTaskCollection();
   AsyncTaskCollection();
   AsyncTaskCollection(const AsyncTaskCollection &copy);
   AsyncTaskCollection(const AsyncTaskCollection &copy);

+ 1 - 1
panda/src/event/genericAsyncTask.h

@@ -23,7 +23,7 @@
  * You can use this when you want to create an AsyncTask without having to
  * You can use this when you want to create an AsyncTask without having to
  * subclass.
  * subclass.
  */
  */
-class EXPCL_PANDA_PIPELINE GenericAsyncTask : public AsyncTask {
+class EXPCL_PANDA_EVENT GenericAsyncTask : public AsyncTask {
 public:
 public:
   typedef DoneStatus TaskFunc(GenericAsyncTask *task, void *user_data);
   typedef DoneStatus TaskFunc(GenericAsyncTask *task, void *user_data);
   typedef void BirthFunc(GenericAsyncTask *task, void *user_data);
   typedef void BirthFunc(GenericAsyncTask *task, void *user_data);

+ 1 - 1
panda/src/gobj/animateVerticesRequest.h

@@ -30,7 +30,7 @@
  * requests are being run (presumably on multiple CPUs/cores), to ensure that
  * requests are being run (presumably on multiple CPUs/cores), to ensure that
  * the data has been computed by the time it's needed.
  * the data has been computed by the time it's needed.
  */
  */
-class EXPCL_PANDA_PGRAPH AnimateVerticesRequest : public AsyncTask {
+class EXPCL_PANDA_GOBJ AnimateVerticesRequest : public AsyncTask {
 public:
 public:
   ALLOC_DELETED_CHAIN(AnimateVerticesRequest);
   ALLOC_DELETED_CHAIN(AnimateVerticesRequest);
 
 

+ 1 - 1
panda/src/parametrics/curveFitter.h

@@ -30,7 +30,7 @@ class NurbsCurve;
 /**
 /**
  *
  *
  */
  */
-class EXPCL_PANDA_GOBJ CurveFitter {
+class EXPCL_PANDA_PARAMETRICS CurveFitter {
 PUBLISHED:
 PUBLISHED:
   CurveFitter();
   CurveFitter();
   ~CurveFitter();
   ~CurveFitter();

+ 1 - 1
panda/src/pgraph/paramNodePath.h

@@ -21,7 +21,7 @@
 /**
 /**
  * A class object for storing a NodePath as a parameter.
  * A class object for storing a NodePath as a parameter.
  */
  */
-class EXPCL_PANDA_GOBJ ParamNodePath : public ParamValueBase {
+class EXPCL_PANDA_PGRAPH ParamNodePath : public ParamValueBase {
 protected:
 protected:
   INLINE ParamNodePath() {};
   INLINE ParamNodePath() {};
 
 

+ 1 - 1
panda/src/putil/bamReader.h

@@ -58,7 +58,7 @@
  * object's read pass.  To use this, subclass BamReaderAuxData and add
  * object's read pass.  To use this, subclass BamReaderAuxData and add
  * whatever additional data you require.
  * whatever additional data you require.
  */
  */
-class EXPCL_PANDA_PGRAPH BamReaderAuxData : public TypedReferenceCount {
+class EXPCL_PANDA_PUTIL BamReaderAuxData : public TypedReferenceCount {
 public:
 public:
   INLINE BamReaderAuxData();
   INLINE BamReaderAuxData();