Attachment #714114 for bug #727912




++ rstudio-1.3.1093/src/cpp/r/session/RStdCallbacks.cpp


#include <boost/function.hpp>
#include <boost/regex.hpp>
#include <boost/bind/bind.hpp>

#include <r/RExec.hpp>
#include <r/ROptions.hpp>

}

using namespace rstudio::core;
using namespace boost::placeholders;

namespace rstudio {
namespace r {
++ rstudio-1.3.1093/src/cpp/core/HtmlUtils.cpp


#include <boost/format.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/bind/bind.hpp>

#include <core/Base64.hpp>
#include <core/FileSerializer.hpp>
#include <core/RegexUtils.hpp>

#include <core/http/Util.hpp>

using namespace boost::placeholders;

namespace rstudio {
namespace core {
++ rstudio-1.3.1093/src/cpp/core/file_lock/FileLock.cpp

#include <core/system/Environment.hpp>

#include <boost/algorithm/string.hpp>
#include <boost/bind/bind.hpp>

// borrowed from SessionConstants.hpp
#define kRStudioSessionRoute "RSTUDIO_SESSION_ROUTE"

using namespace boost::placeholders;

namespace rstudio {
namespace core {


Return to bug 727912

Line Link Here

(-)file_not_specified_in_diff (-6 / +11 lines)
0	-- rstudio-1.3.1093-orig/src/cpp/r/session/RStdCallbacks.cpp	0	++ rstudio-1.3.1093/src/cpp/r/session/RStdCallbacks.cpp
Lines 19-25 Link Here
19		19
20	#include <boost/function.hpp>	20	#include <boost/function.hpp>
21	#include <boost/regex.hpp>	21	#include <boost/regex.hpp>
22	#include <boost/bind.hpp>	22	#include <boost/bind/bind.hpp>
23		23
24	#include <r/RExec.hpp>	24	#include <r/RExec.hpp>
25	#include <r/ROptions.hpp>	25	#include <r/ROptions.hpp>
Lines 58-63 __declspec(dllimport) SA_TYPE SaveAction Link Here
58	}	58	}
59		59
60	using namespace rstudio::core;	60	using namespace rstudio::core;
		61	using namespace boost::placeholders;
61		62
62	namespace rstudio {	63	namespace rstudio {
63	namespace r {	64	namespace r {
64	-- rstudio-1.3.1093-orig/src/cpp/core/HtmlUtils.cpp.orig	65	++ rstudio-1.3.1093/src/cpp/core/HtmlUtils.cpp
Lines 19-31 Link Here
19		19
20	#include <boost/format.hpp>	20	#include <boost/format.hpp>
21	#include <boost/algorithm/string/predicate.hpp>	21	#include <boost/algorithm/string/predicate.hpp>
22	#include <boost/bind.hpp>	22	#include <boost/bind/bind.hpp>
23		23
24	#include <core/Base64.hpp>	24	#include <core/Base64.hpp>
25	#include <core/FileSerializer.hpp>	25	#include <core/FileSerializer.hpp>
26	#include <core/RegexUtils.hpp>	26	#include <core/RegexUtils.hpp>
27		27
28	#include <core/http/Util.hpp>	28	#include <core/http/Util.hpp>
		29
		30	using namespace boost::placeholders;
29		31
30	namespace rstudio {	32	namespace rstudio {
31	namespace core {	33	namespace core {
32	-- rstudio-1.3.1093-orig/src/cpp/core/file_lock/FileLock.cpp.orig	34	++ rstudio-1.3.1093/src/cpp/core/file_lock/FileLock.cpp
Lines 26-35 Link Here
26	#include <core/system/Environment.hpp>	26	#include <core/system/Environment.hpp>
27		27
28	#include <boost/algorithm/string.hpp>	28	#include <boost/algorithm/string.hpp>
29	#include <boost/bind.hpp>	29	#include <boost/bind/bind.hpp>
30		30
31	// borrowed from SessionConstants.hpp	31	// borrowed from SessionConstants.hpp
32	#define kRStudioSessionRoute "RSTUDIO_SESSION_ROUTE"	32	#define kRStudioSessionRoute "RSTUDIO_SESSION_ROUTE"
		33
		34	using namespace boost::placeholders;
33		35
34	namespace rstudio {	36	namespace rstudio {
35	namespace core {	37	namespace core {
36		38