[Jsoncpp-cvs] jsoncpp/include/json json_autolink.h,1.1.1.1,1.2 json_config.h,1.1.1.1,1.2 json_forwards.h,1.4,1.5 json_reader.h,1.3,1.4 json_value.h,1.4,1.5

[Baptiste L. <bl...@us...>]

Update of /cvsroot/jsoncpp/jsoncpp/include/json
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18775/include/json

Modified Files:
	json_autolink.h json_config.h json_forwards.h json_reader.h 
	json_value.h 
Log Message:
* added configuration option JSON_IN_CPPTL to allow linking cpptl & json as a single library
* json_forwardS.h now includes json_config.h


Index: json_value.h
===================================================================
RCS file: /cvsroot/jsoncpp/jsoncpp/include/json/json_value.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** json_value.h	30 Jul 2005 17:40:58 -0000	1.4
--- json_value.h	29 Sep 2005 21:11:49 -0000	1.5
***************
*** 3,7 ****
  
  # include "json_forwards.h"
- # include "json_config.h"
  # include <string>
  # include <map>
--- 3,6 ----

Index: json_forwards.h
===================================================================
RCS file: /cvsroot/jsoncpp/jsoncpp/include/json/json_forwards.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** json_forwards.h	30 Jul 2005 17:40:58 -0000	1.4
--- json_forwards.h	29 Sep 2005 21:11:49 -0000	1.5
***************
*** 2,5 ****
--- 2,7 ----
  # define JSON_FORWARDS_H_INCLUDED
  
+ # include "json_config.h"
+ 
  namespace Json {
  

Index: json_config.h
===================================================================
RCS file: /cvsroot/jsoncpp/jsoncpp/include/json/json_config.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** json_config.h	27 Jul 2005 07:09:23 -0000	1.1.1.1
--- json_config.h	29 Sep 2005 21:11:49 -0000	1.2
***************
*** 2,13 ****
  # define JSON_CONFIG_H_INCLUDED
  
! #ifdef JSON_DLL_BUILD
! # define JSON_API __declspec(dllexport)
! #elif defined(JSON_DLL)
! # define JSON_API __declspec(dllimport)
! #else
! # define JSON_API
! #endif
  
  
  #endif // JSON_CONFIG_H_INCLUDED
--- 2,26 ----
  # define JSON_CONFIG_H_INCLUDED
  
! /// If defined, indicates that json library is embedded in CppTL library.
! //# define JSON_IN_CPPTL 1
  
+ # ifdef JSON_IN_CPPTL
+ #  include <cpptl/config.h>
+ # endif
+ 
+ # ifdef JSON_IN_CPPTL
+ #  define JSON_API CPPTL_API
+ # elif defined(JSON_DLL_BUILD)
+ #  define JSON_API __declspec(dllexport)
+ # elif defined(JSON_DLL)
+ #  define JSON_API __declspec(dllimport)
+ # else
+ #  define JSON_API
+ # endif
+ 
+ # ifdef JSON_IN_CPPTL
+ /// If defined, indicates that json may leverage CppTL library
+ #  define JSON_USE_CPPTL 1
+ # endif
  
  #endif // JSON_CONFIG_H_INCLUDED

Index: json_reader.h
===================================================================
RCS file: /cvsroot/jsoncpp/jsoncpp/include/json/json_reader.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** json_reader.h	30 Jul 2005 17:40:58 -0000	1.3
--- json_reader.h	29 Sep 2005 21:11:49 -0000	1.4
***************
*** 3,7 ****
  
  # include "json_forwards.h"
- # include "json_config.h"
  # include "json_value.h"
  # include <deque>
--- 3,6 ----

Index: json_autolink.h
===================================================================
RCS file: /cvsroot/jsoncpp/jsoncpp/include/json/json_autolink.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** json_autolink.h	27 Jul 2005 07:09:23 -0000	1.1.1.1
--- json_autolink.h	29 Sep 2005 21:11:49 -0000	1.2
***************
*** 2,6 ****
  # define JSON_AUTOLINK_H_INCLUDED
  
! # if !defined(JSON_NO_AUTOLINK)  &&  !defined(JSON_DLL_BUILD)
  #  define CPPTL_AUTOLINK_NAME "json"
  #  undef CPPTL_AUTOLINK_DLL
--- 2,12 ----
  # define JSON_AUTOLINK_H_INCLUDED
  
! # include "json_config.h"
! 
! # ifdef JSON_IN_CPPTL
! #  include <cpptl/cpptl_autolink.h>
! # endif
! 
! # if !defined(JSON_NO_AUTOLINK)  &&  !defined(JSON_DLL_BUILD)  &&  !defined(JSON_IN_CPPTL)
  #  define CPPTL_AUTOLINK_NAME "json"
  #  undef CPPTL_AUTOLINK_DLL